diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2014-10-15 13:42:30 +0200 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2014-11-11 10:56:16 +0100 |
commit | 3d11de4849cc2d7b88da6f2522424842dde68889 (patch) | |
tree | 3be248df9ac35732f6de4d2bf716dced53b0d282 | |
parent | 61d98bdc5988b3b13d6cf21139bfef32ea1b0fc9 (diff) | |
download | freeipa-3d11de4849cc2d7b88da6f2522424842dde68889.tar.gz freeipa-3d11de4849cc2d7b88da6f2522424842dde68889.tar.xz freeipa-3d11de4849cc2d7b88da6f2522424842dde68889.zip |
idrange: include raw range type in output
iparangetype output is a localized human-readable value which is not suitable for machine-based API consumers
Solved by new iparangetyperaw output attribute which contains iparangetype's raw value
Reviewed-By: Tomas Babej <tbabej@redhat.com>
-rw-r--r-- | ipalib/plugins/idrange.py | 1 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_range_plugin.py | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ipalib/plugins/idrange.py b/ipalib/plugins/idrange.py index 6c3be6e69..fb198d79d 100644 --- a/ipalib/plugins/idrange.py +++ b/ipalib/plugins/idrange.py @@ -241,6 +241,7 @@ class idrange(LDAPObject): if not any((options.get('pkey_only', False), options.get('raw', False))): range_type = entry_attrs['iparangetype'][0] + entry_attrs['iparangetyperaw'] = [range_type] entry_attrs['iparangetype'] = [self.range_types.get(range_type, None)] # Remove the objectclass diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py index f77718401..ae8450f99 100644 --- a/ipatests/test_xmlrpc/test_range_plugin.py +++ b/ipatests/test_xmlrpc/test_range_plugin.py @@ -463,6 +463,7 @@ class test_range(Declarative): ipabaserid=[unicode(testrange1_base_rid)], ipasecondarybaserid=[unicode(testrange1_secondary_base_rid)], ipaidrangesize=[unicode(testrange1_size)], + iparangetyperaw=[u'ipa-local'], iparangetype=[u'local domain range'], ), value=testrange1, @@ -482,6 +483,7 @@ class test_range(Declarative): ipabaserid=[unicode(testrange1_base_rid)], ipasecondarybaserid=[unicode(testrange1_secondary_base_rid)], ipaidrangesize=[unicode(testrange1_size)], + iparangetyperaw=[u'ipa-local'], iparangetype=[u'local domain range'], ), value=testrange1, @@ -569,6 +571,7 @@ class test_range(Declarative): ipabaserid=[unicode(testrange1_base_rid)], ipasecondarybaserid=[unicode(testrange1_secondary_base_rid)], ipaidrangesize=[u'90000'], + iparangetyperaw=[u'ipa-local'], iparangetype=[u'local domain range'], ), value=testrange1, @@ -637,6 +640,7 @@ class test_range(Declarative): ipabaserid=[unicode(testrange2_base_rid)], ipasecondarybaserid=[unicode(testrange2_secondary_base_rid)], ipaidrangesize=[unicode(testrange2_size)], + iparangetyperaw=[u'ipa-local'], iparangetype=[u'local domain range'], ), value=testrange2, @@ -764,6 +768,7 @@ class test_range(Declarative): ipabaseid=[unicode(domain7range1_base_id)], ipaidrangesize=[unicode(domain7range1_size)], ipanttrusteddomainsid=[unicode(domain7_sid)], + iparangetyperaw=[u'ipa-ad-trust-posix'], iparangetype=[u'Active Directory trust range with POSIX attributes'], ), value=unicode(domain7range1), @@ -821,6 +826,7 @@ class test_range(Declarative): ipabaseid=[unicode(domain3range1_base_id)], ipaidrangesize=[unicode(domain3range2_size)], ipanttrusteddomainsid=[unicode(domain3_sid)], + iparangetyperaw=[u'ipa-ad-trust-posix'], iparangetype=[u'Active Directory trust range with POSIX ' 'attributes'], ), @@ -886,6 +892,7 @@ class test_range(Declarative): ipabaserid=[unicode(domain5range1_base_rid)], ipaidrangesize=[unicode(domain2range1_size)], ipanttrusteddomainsid=[unicode(domain2_sid)], + iparangetyperaw=[u'ipa-ad-trust'], iparangetype=[u'Active Directory domain range'], ), value=domain2range1, |