From 06d945a04607dc36e25af78688b4295420489fb9 Mon Sep 17 00:00:00 2001 From: Martin Babinsky Date: Fri, 2 Oct 2015 18:05:03 +0200 Subject: account for added krbcanonicalname attribute during xmlrpc tests https://fedorahosted.org/freeipa/ticket/3864 Reviewed-By: David Kupka Reviewed-By: Simo Sorce --- ipatests/test_xmlrpc/objectclasses.py | 1 - ipatests/test_xmlrpc/test_host_plugin.py | 1 + ipatests/test_xmlrpc/test_service_plugin.py | 9 +++++++-- ipatests/test_xmlrpc/test_user_plugin.py | 1 + ipatests/test_xmlrpc/tracker/host_plugin.py | 4 +++- ipatests/test_xmlrpc/tracker/stageuser_plugin.py | 5 ++++- ipatests/test_xmlrpc/tracker/user_plugin.py | 5 +++-- 7 files changed, 19 insertions(+), 7 deletions(-) (limited to 'ipatests') diff --git a/ipatests/test_xmlrpc/objectclasses.py b/ipatests/test_xmlrpc/objectclasses.py index 134a08803..7050de289 100644 --- a/ipatests/test_xmlrpc/objectclasses.py +++ b/ipatests/test_xmlrpc/objectclasses.py @@ -100,7 +100,6 @@ service = [ u'ipaobject', u'ipaservice', u'pkiuser', - u'ipakrbprincipal', u'top', ] diff --git a/ipatests/test_xmlrpc/test_host_plugin.py b/ipatests/test_xmlrpc/test_host_plugin.py index e6fc68a15..4ddabefff 100644 --- a/ipatests/test_xmlrpc/test_host_plugin.py +++ b/ipatests/test_xmlrpc/test_host_plugin.py @@ -357,6 +357,7 @@ class TestHostWithService(XMLRPC_test): result=dict( dn=service1dn, krbprincipalname=[service1], + krbcanonicalname=[service1], objectclass=objectclasses.service, managedby_host=[host.fqdn], ipauniqueid=[fuzzy_uuid], diff --git a/ipatests/test_xmlrpc/test_service_plugin.py b/ipatests/test_xmlrpc/test_service_plugin.py index 0a38e3d65..3009521c3 100644 --- a/ipatests/test_xmlrpc/test_service_plugin.py +++ b/ipatests/test_xmlrpc/test_service_plugin.py @@ -193,6 +193,7 @@ class test_service(Declarative): result=dict( dn=service1dn, krbprincipalname=[service1], + krbcanonicalname=[service1], objectclass=objectclasses.service, ipauniqueid=[fuzzy_uuid], managedby_host=[fqdn1], @@ -238,7 +239,7 @@ class test_service(Declarative): result=dict( dn=service1dn, krbprincipalname=[service1], - ipakrbprincipalalias=[service1], + krbcanonicalname=[service1], objectclass=objectclasses.service, ipauniqueid=[fuzzy_uuid], managedby_host=[fqdn1], @@ -261,6 +262,7 @@ class test_service(Declarative): dict( dn=service1dn, krbprincipalname=[service1], + krbcanonicalname=service1, managedby_host=[fqdn1], has_keytab=False, ), @@ -280,6 +282,7 @@ class test_service(Declarative): dict( dn=service1dn, krbprincipalname=[service1], + krbcanonicalname=service1, has_keytab=False, ), ], @@ -298,7 +301,7 @@ class test_service(Declarative): dict( dn=service1dn, krbprincipalname=[service1], - ipakrbprincipalalias=[service1], + krbcanonicalname=service1, objectclass=objectclasses.service, ipauniqueid=[fuzzy_uuid], has_keytab=False, @@ -713,6 +716,7 @@ class test_service_in_role(Declarative): result=dict( dn=service1dn, krbprincipalname=[service1], + krbcanonicalname=[service1], objectclass=objectclasses.service, ipauniqueid=[fuzzy_uuid], managedby_host=[fqdn1], @@ -917,6 +921,7 @@ class test_service_allowed_to(Declarative): result=dict( dn=service1dn, krbprincipalname=[service1], + krbcanonicalname=[service1], objectclass=objectclasses.service, ipauniqueid=[fuzzy_uuid], managedby_host=[fqdn1], diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py index dbfdb4c08..6d58c53aa 100644 --- a/ipatests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -976,6 +976,7 @@ def get_user_result(uid, givenname, sn, operation='show', omit=[], mepmanagedentry=[get_group_dn(uid)], objectclass=add_oc(objectclasses.user, u'ipantuserattrs'), krbprincipalname=[u'%s@%s' % (uid, api.env.realm)], + krbcanonicalname=[u'%s@%s' % (uid, api.env.realm)] ) if operation in ('show', 'show-all', 'find', 'mod'): result.update( diff --git a/ipatests/test_xmlrpc/tracker/host_plugin.py b/ipatests/test_xmlrpc/tracker/host_plugin.py index d54901fa5..21088f22c 100644 --- a/ipatests/test_xmlrpc/tracker/host_plugin.py +++ b/ipatests/test_xmlrpc/tracker/host_plugin.py @@ -37,7 +37,8 @@ class HostTracker(Tracker): 'ipaallowedtoperform_write_keys_hostgroup'} retrieve_all_keys = retrieve_keys | { u'cn', u'ipakrbokasdelegate', u'ipakrbrequirespreauth', u'ipauniqueid', - u'managing_host', u'objectclass', u'serverhostname'} + u'krbcanonicalname', u'managing_host', u'objectclass', + u'serverhostname'} create_keys = retrieve_keys | {'objectclass', 'ipauniqueid', 'randompassword'} update_keys = retrieve_keys - {'dn'} @@ -98,6 +99,7 @@ class HostTracker(Tracker): description=[self.description], l=[self.location], krbprincipalname=[u'host/%s@%s' % (self.fqdn, self.api.env.realm)], + krbcanonicalname=[u'host/%s@%s' % (self.fqdn, self.api.env.realm)], objectclass=objectclasses.host, ipauniqueid=[fuzzy_uuid], managedby_host=[self.fqdn], diff --git a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py index 73b33c626..c741e3eb4 100644 --- a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py +++ b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py @@ -47,7 +47,8 @@ class StageUserTracker(Tracker): u'st', u'mobile', u'pager', } retrieve_all_keys = retrieve_keys | { u'cn', u'ipauniqueid', u'objectclass', u'description', - u'displayname', u'gecos', u'initials', u'krbprincipalname', u'manager'} + u'displayname', u'gecos', u'initials', u'krbcanonicalname', + u'krbprincipalname', u'manager'} create_keys = retrieve_all_keys | { u'objectclass', u'ipauniqueid', u'randompassword', @@ -117,6 +118,7 @@ class StageUserTracker(Tracker): uidnumber=[u'-1'], gidnumber=[u'-1'], krbprincipalname=[u'%s@%s' % (self.uid, self.api.env.realm)], + krbcanonicalname=[u'%s@%s' % (self.uid, self.api.env.realm)], mail=[u'%s@%s' % (self.uid, self.api.env.domain)], gecos=[u'%s %s' % (self.givenname, self.sn)], loginshell=[u'/bin/sh'], @@ -130,6 +132,7 @@ class StageUserTracker(Tracker): self.attrs[key] = [u'%s@%s' % ( (self.kwargs[key].split('@'))[0].lower(), (self.kwargs[key].split('@'))[1])] + self.attrs[u'krbcanonicalname'] = self.attrs[key] elif key == u'manager': self.attrs[key] = [self.kwargs[key]] elif key == u'ipasshpubkey': diff --git a/ipatests/test_xmlrpc/tracker/user_plugin.py b/ipatests/test_xmlrpc/tracker/user_plugin.py index 261ea69e1..3585e7585 100644 --- a/ipatests/test_xmlrpc/tracker/user_plugin.py +++ b/ipatests/test_xmlrpc/tracker/user_plugin.py @@ -36,8 +36,8 @@ class UserTracker(Tracker): u'l', u'mobile', u'krbextradata', u'krblastpwdchange', u'krbpasswordexpiration', u'pager', u'st', u'manager', u'cn', u'ipauniqueid', u'objectclass', u'mepmanagedentry', - u'displayname', u'gecos', u'initials', u'krbprincipalname', - u'preserved'} + u'displayname', u'gecos', u'initials', u'krbcanonicalname', + 'krbprincipalname', u'preserved'} retrieve_preserved_keys = (retrieve_keys - {u'memberof_group'}) | { u'preserved'} @@ -146,6 +146,7 @@ class UserTracker(Tracker): uidnumber=[fuzzy_digits], gidnumber=[fuzzy_digits], krbprincipalname=[u'%s@%s' % (self.uid, self.api.env.realm)], + krbcanonicalname=[u'%s@%s' % (self.uid, self.api.env.realm)], mail=[u'%s@%s' % (self.uid, self.api.env.domain)], gecos=[u'%s %s' % (self.givenname, self.sn)], loginshell=[u'/bin/sh'], -- cgit