diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2014-11-04 13:38:12 +0100 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2014-11-24 14:43:09 +0100 |
| commit | f70d859b3958a895f08f87eb753ef55eb00931c7 (patch) | |
| tree | 94e19c13624a781010d4d58a28e6ca4601906a8d /ipatests | |
| parent | 230df95ed9e043069da0008d046b6b0135b0a8d1 (diff) | |
| download | freeipa-f70d859b3958a895f08f87eb753ef55eb00931c7.tar.gz freeipa-f70d859b3958a895f08f87eb753ef55eb00931c7.tar.xz freeipa-f70d859b3958a895f08f87eb753ef55eb00931c7.zip | |
webui: use domain name instead of domain SID in idrange adder dialog
It's more user friendly. Almost nobody remembers SIDs.
https://fedorahosted.org/freeipa/ticket/4661
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests')
| -rw-r--r-- | ipatests/test_webui/task_range.py | 20 | ||||
| -rw-r--r-- | ipatests/test_webui/test_range.py | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ipatests/test_webui/task_range.py b/ipatests/test_webui/task_range.py index d46d345f0..b71285d1e 100644 --- a/ipatests/test_webui/task_range.py +++ b/ipatests/test_webui/task_range.py @@ -59,13 +59,13 @@ class range_tasks(UI_driver): self.max_id = max_id self.max_rid = max_rid - def get_sid(self): + def get_domain(self): result = self.execute_api_from_ui('trust_find', [], {}) trusts = result['result']['result'] - sid = None + domain = None if trusts: - sid = trusts[0]['ipanttrusteddomainsid'] - return sid + domain = trusts[0]['cn'] + return domain def get_data(self, pkey, size=50, add_data=None): @@ -81,7 +81,7 @@ class range_tasks(UI_driver): } return data - def get_add_data(self, pkey, range_type='ipa-local', size=50, shift=100, sid=None): + def get_add_data(self, pkey, range_type='ipa-local', size=50, shift=100, domain=None): base_id = self.max_id + shift self.max_id = base_id + size @@ -98,19 +98,19 @@ class range_tasks(UI_driver): ('callback', self.check_range_type_mod, range_type) ] - if not sid: + if not domain: base_rid = self.max_rid + shift self.max_rid = base_rid + size add.append(('textbox', 'ipasecondarybaserid', str(base_rid))) - if sid: - add.append(('textbox', 'ipanttrusteddomainsid', sid)) + if domain: + add.append(('textbox', 'ipanttrusteddomainname', domain)) return add def check_range_type_mod(self, range_type): if range_type == 'ipa-local': - self.assert_disabled("[name=ipanttrusteddomainsid]") + self.assert_disabled("[name=ipanttrusteddomainname]") self.assert_disabled("[name=ipasecondarybaserid]", negative=True) elif range_type == 'ipa-ad-trust': - self.assert_disabled("[name=ipanttrusteddomainsid]", negative=True) + self.assert_disabled("[name=ipanttrusteddomainname]", negative=True) self.assert_disabled("[name=ipasecondarybaserid]") diff --git a/ipatests/test_webui/test_range.py b/ipatests/test_webui/test_range.py index 5c2e33b90..e1c46e50a 100644 --- a/ipatests/test_webui/test_range.py +++ b/ipatests/test_webui/test_range.py @@ -74,11 +74,11 @@ class test_range(range_tasks): self.add_record(trust_mod.ENTITY, trust_data) - sid = self.get_sid() + domain = self.get_domain() self.navigate_to_entity(ENTITY) - add = self.get_add_data(pkey_ad, range_type='ipa-ad-trust', sid=sid) + add = self.get_add_data(pkey_ad, range_type='ipa-ad-trust', domain=domain) data = self.get_data(pkey_ad, add_data=add) self.add_record(ENTITY, data, navigate=False) self.assert_record_value('Active Directory domain range', pkey_ad, column) |