diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2015-10-02 18:05:03 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-06-23 09:48:06 +0200 |
| commit | 06d945a04607dc36e25af78688b4295420489fb9 (patch) | |
| tree | b8624191cbaee0adf837252f8e078e665ffc2b9b /ipatests/test_xmlrpc/tracker | |
| parent | 1bba2ed45df83684be1d50ef6e1ddb10f7a7d074 (diff) | |
| download | freeipa-06d945a04607dc36e25af78688b4295420489fb9.tar.gz freeipa-06d945a04607dc36e25af78688b4295420489fb9.tar.xz freeipa-06d945a04607dc36e25af78688b4295420489fb9.zip | |
account for added krbcanonicalname attribute during xmlrpc tests
https://fedorahosted.org/freeipa/ticket/3864
Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Simo Sorce <ssorce@redhat.com>
Diffstat (limited to 'ipatests/test_xmlrpc/tracker')
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/host_plugin.py | 4 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/stageuser_plugin.py | 5 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/user_plugin.py | 5 |
3 files changed, 10 insertions, 4 deletions
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'], |