diff options
| author | Martin Basti <mbasti@redhat.com> | 2016-06-16 19:13:45 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-06-17 18:05:03 +0200 |
| commit | 4155eb7b13b20605886ba79c02c232f83a7b439c (patch) | |
| tree | 310f70edd61952e24c4582b844c087a09ca65ce5 /ipatests | |
| parent | 3c50e42036427d7c5e36828f24bd3c180e18a677 (diff) | |
| download | freeipa-4155eb7b13b20605886ba79c02c232f83a7b439c.tar.gz freeipa-4155eb7b13b20605886ba79c02c232f83a7b439c.tar.xz freeipa-4155eb7b13b20605886ba79c02c232f83a7b439c.zip | |
DNS Locations: Rename ipalocationweight to ipaserviceweight
Service weight explains better meaning of attribute than location
weight, because location itself have no weight only services have.
https://fedorahosted.org/freeipa/ticket/2008
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Diffstat (limited to 'ipatests')
| -rw-r--r-- | ipatests/test_xmlrpc/test_location_plugin.py | 8 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/location_plugin.py | 4 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/server_plugin.py | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ipatests/test_xmlrpc/test_location_plugin.py b/ipatests/test_xmlrpc/test_location_plugin.py index 97e97a2bc..3f0edfbcf 100644 --- a/ipatests/test_xmlrpc/test_location_plugin.py +++ b/ipatests/test_xmlrpc/test_location_plugin.py @@ -177,11 +177,11 @@ class TestLocationsServer(XMLRPC_test): server.update( dict( ipalocation_location=location.idnsname_obj, - ipalocationweight=200, + ipaserviceweight=200, ), expected_updates=dict( ipalocation_location=[location.idnsname_obj], - ipalocationweight=[u'200'], + ipaserviceweight=[u'200'], ) ) # remove invalid data from the previous test @@ -195,6 +195,6 @@ class TestLocationsServer(XMLRPC_test): location.remove_server_from_location(server.server_name) location.retrieve() - def test_remove_location_weight_from_server(self, location, server): - server.update(dict(ipalocationweight=None)) + def test_remove_service_weight_from_server(self, location, server): + server.update(dict(ipaserviceweight=None)) location.retrieve() diff --git a/ipatests/test_xmlrpc/tracker/location_plugin.py b/ipatests/test_xmlrpc/tracker/location_plugin.py index 8901b7e00..3bce6669a 100644 --- a/ipatests/test_xmlrpc/tracker/location_plugin.py +++ b/ipatests/test_xmlrpc/tracker/location_plugin.py @@ -132,8 +132,8 @@ class LocationTracker(Tracker): self.attrs.setdefault('servers_server', []).append(server_name) self.servers[server_name] = { 'cn': [server_name], - 'ipalocationweight': [unicode(weight)], - 'location_relative_weight': [relative_weight] + 'ipaserviceweight': [unicode(weight)], + 'service_relative_weight': [relative_weight] } def remove_server_from_location(self, server_name): diff --git a/ipatests/test_xmlrpc/tracker/server_plugin.py b/ipatests/test_xmlrpc/tracker/server_plugin.py index 42e63d78f..7540f45bf 100644 --- a/ipatests/test_xmlrpc/tracker/server_plugin.py +++ b/ipatests/test_xmlrpc/tracker/server_plugin.py @@ -13,18 +13,18 @@ class ServerTracker(Tracker): retrieve_keys = { 'cn', 'dn', 'ipamaxdomainlevel', 'ipamindomainlevel', 'iparepltopomanagedsuffix_topologysuffix', 'ipalocation_location', - 'ipalocationweight', + 'ipaserviceweight', } retrieve_all_keys = retrieve_keys | {'objectclass'} create_keys = retrieve_keys | {'objectclass'} find_keys = { 'cn', 'dn', 'ipamaxdomainlevel', 'ipamindomainlevel', - 'ipalocationweight', + 'ipaserviceweight', } find_all_keys = retrieve_all_keys update_keys = { 'cn', 'ipamaxdomainlevel', 'ipamindomainlevel', - 'ipalocation_location', 'ipalocationweight', + 'ipalocation_location', 'ipaserviceweight', } def __init__(self, name): |