From acf2234ebc8609a35a8f45598d5d817cbdbff121 Mon Sep 17 00:00:00 2001 From: Martin Babinsky Date: Wed, 29 Jun 2016 14:54:54 +0200 Subject: Unify display of principal names/aliases across entities Since now users, hosts, and service all support assigning multiple principal aliases to them, the display of kerberos principal names should be consistent across all these objects. Principal aliases and canonical names will now be displayed in all add, mod, show, and find operations. https://fedorahosted.org/freeipa/ticket/3864 Reviewed-By: David Kupka Reviewed-By: Jan Cholasta --- ipatests/test_xmlrpc/tracker/host_plugin.py | 3 ++- ipatests/test_xmlrpc/tracker/stageuser_plugin.py | 5 ++--- ipatests/test_xmlrpc/tracker/user_plugin.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ipatests/test_xmlrpc/tracker') diff --git a/ipatests/test_xmlrpc/tracker/host_plugin.py b/ipatests/test_xmlrpc/tracker/host_plugin.py index 21088f22c..03113b8fe 100644 --- a/ipatests/test_xmlrpc/tracker/host_plugin.py +++ b/ipatests/test_xmlrpc/tracker/host_plugin.py @@ -22,7 +22,8 @@ class HostTracker(Tracker): ``fqdn`` and ``dn``. """ retrieve_keys = { - 'dn', 'fqdn', 'description', 'l', 'krbprincipalname', 'managedby_host', + 'dn', 'fqdn', 'description', 'l', 'krbcanonicalname', + 'krbprincipalname', 'managedby_host', 'has_keytab', 'has_password', 'issuer', 'md5_fingerprint', 'serial_number', 'serial_number_hex', 'sha1_fingerprint', 'subject', 'usercertificate', 'valid_not_after', 'valid_not_before', diff --git a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py index c741e3eb4..9bcb1069f 100644 --- a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py +++ b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py @@ -44,11 +44,10 @@ class StageUserTracker(Tracker): u'usercertificate', u'dn', u'has_keytab', u'has_password', u'street', u'postalcode', u'facsimiletelephonenumber', u'carlicense', u'ipasshpubkey', u'sshpubkeyfp', u'l', - u'st', u'mobile', u'pager', } + u'st', u'mobile', u'pager', u'krbcanonicalname', u'krbprincipalname'} retrieve_all_keys = retrieve_keys | { u'cn', u'ipauniqueid', u'objectclass', u'description', - u'displayname', u'gecos', u'initials', u'krbcanonicalname', - u'krbprincipalname', u'manager'} + u'displayname', u'gecos', u'initials', u'manager'} create_keys = retrieve_all_keys | { u'objectclass', u'ipauniqueid', u'randompassword', diff --git a/ipatests/test_xmlrpc/tracker/user_plugin.py b/ipatests/test_xmlrpc/tracker/user_plugin.py index 3585e7585..1a85e9332 100644 --- a/ipatests/test_xmlrpc/tracker/user_plugin.py +++ b/ipatests/test_xmlrpc/tracker/user_plugin.py @@ -28,6 +28,7 @@ class UserTracker(Tracker): u'ipatokenradiusconfiglink', u'ipatokenradiususername', u'krbprincipalexpiration', u'usercertificate;binary', u'has_keytab', u'has_password', u'memberof_group', u'sshpubkeyfp', + u'krbcanonicalname', 'krbprincipalname' } retrieve_all_keys = retrieve_keys | { @@ -36,8 +37,7 @@ 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'krbcanonicalname', - 'krbprincipalname', u'preserved'} + u'displayname', u'gecos', u'initials', u'preserved'} retrieve_preserved_keys = (retrieve_keys - {u'memberof_group'}) | { u'preserved'} -- cgit