tests: Expect krbpwdpolicyreference in result of {host,service}-{find,show} --all

Result of {host,service}-{find,show} commands with option '--all' always contains
krbpwpolicyreference attributes.

https://fedorahosted.org/freeipa/ticket/6561

Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
This commit is contained in:
David Kupka 2016-11-25 00:10:41 +01:00
parent 6f1d927467
commit b1a20599c4
4 changed files with 58 additions and 2 deletions

View File

@ -1029,6 +1029,11 @@ class test_idviews(Declarative):
serverhostname=[host3],
ipaassignedidview=[idview1],
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Host Password Policy',
api.env.container_host,
api.env.basedn,
)],
),
),
),
@ -1059,6 +1064,11 @@ class test_idviews(Declarative):
memberof_hostgroup=[hostgroup2],
memberofindirect_hostgroup=[hostgroup1],
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Host Password Policy',
api.env.container_host,
api.env.basedn,
)],
),
),
),
@ -1113,6 +1123,11 @@ class test_idviews(Declarative):
memberofindirect_hostgroup=[hostgroup1],
ipaassignedidview=[idview1],
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Host Password Policy',
api.env.container_host,
api.env.basedn,
)],
),
),
),
@ -1143,6 +1158,11 @@ class test_idviews(Declarative):
memberof_hostgroup=[hostgroup1],
ipaassignedidview=[idview1],
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Host Password Policy',
api.env.container_host,
api.env.basedn,
)],
),
),
),
@ -1216,6 +1236,11 @@ class test_idviews(Declarative):
serverhostname=[host1],
memberof_hostgroup=[hostgroup1],
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Host Password Policy',
api.env.container_host,
api.env.basedn,
)],
),
),
),
@ -1244,6 +1269,11 @@ class test_idviews(Declarative):
objectclass=objectclasses.host,
serverhostname=[host3],
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Host Password Policy',
api.env.container_host,
api.env.basedn,
)],
),
),
),
@ -1499,6 +1529,11 @@ class test_idviews(Declarative):
objectclass=objectclasses.host,
serverhostname=[host4],
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Host Password Policy',
api.env.container_host,
api.env.basedn,
)],
),
),
),

View File

@ -270,6 +270,11 @@ class test_service(Declarative):
ipakrbrequirespreauth=True,
ipakrbokasdelegate=False,
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Service Password Policy',
api.env.container_service,
api.env.basedn,
)],
),
),
),
@ -334,6 +339,11 @@ class test_service(Declarative):
ipakrbrequirespreauth=True,
ipakrbokasdelegate=False,
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Service Password Policy',
api.env.container_service,
api.env.basedn,
)],
),
],
),

View File

@ -40,7 +40,8 @@ class HostTracker(KerberosAliasMixin, Tracker):
retrieve_all_keys = retrieve_keys | {
u'cn', u'ipakrbokasdelegate', u'ipakrbrequirespreauth', u'ipauniqueid',
u'krbcanonicalname', u'managing_host', u'objectclass',
u'serverhostname', u'ipakrboktoauthasdelegate'}
u'serverhostname', u'ipakrboktoauthasdelegate',
u'krbpwdpolicyreference'}
create_keys = retrieve_keys | {'objectclass', 'ipauniqueid',
'randompassword'}
update_keys = retrieve_keys - {'dn'}
@ -121,6 +122,11 @@ class HostTracker(KerberosAliasMixin, Tracker):
managing_host=[self.fqdn],
serverhostname=[self.shortname],
ipakrboktoauthasdelegate=False,
krbpwdpolicyreference=[DN(
u'cn=Default Host Password Policy',
self.api.env.container_host,
self.api.env.basedn,
)],
)
self.exists = True

View File

@ -43,7 +43,7 @@ class ServiceTracker(KerberosAliasMixin, Tracker):
retrieve_all_keys = retrieve_keys | {
u'ipaKrbPrincipalAlias', u'ipaUniqueID', u'krbExtraData',
u'krbLastPwdChange', u'krbLoginFailedCount', u'memberof',
u'objectClass', u'ipakrbrequirespreauth',
u'objectClass', u'ipakrbrequirespreauth', u'krbpwdpolicyreference',
u'ipakrbokasdelegate', u'ipakrboktoauthasdelegate'}
create_keys = (retrieve_keys | {u'objectclass', u'ipauniqueid'}) - {
@ -108,6 +108,11 @@ class ServiceTracker(KerberosAliasMixin, Tracker):
u'krbcanonicalname': [u'{0}'.format(self.name)],
u'has_keytab': False,
u'ipakrboktoauthasdelegate': False,
u'krbpwdpolicyreference': [DN(
u'cn=Default Service Password Policy',
self.api.env.container_service,
self.api.env.basedn,
)],
}
for key in self.options: