diff options
Diffstat (limited to 'ipatests/test_xmlrpc/tracker')
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/base.py | 4 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/location_plugin.py | 42 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/server_plugin.py | 110 |
3 files changed, 151 insertions, 5 deletions
diff --git a/ipatests/test_xmlrpc/tracker/base.py b/ipatests/test_xmlrpc/tracker/base.py index acd382dd3..6a0af510f 100644 --- a/ipatests/test_xmlrpc/tracker/base.py +++ b/ipatests/test_xmlrpc/tracker/base.py @@ -281,6 +281,10 @@ class Tracker(object): result = command() self.attrs.update(updates) self.attrs.update(expected_updates) + for key, value in self.attrs.items(): + if value is None: + del self.attrs[key] + self.check_update(result, extra_keys=set(updates.keys()) | set(expected_updates.keys())) diff --git a/ipatests/test_xmlrpc/tracker/location_plugin.py b/ipatests/test_xmlrpc/tracker/location_plugin.py index c7af09768..8901b7e00 100644 --- a/ipatests/test_xmlrpc/tracker/location_plugin.py +++ b/ipatests/test_xmlrpc/tracker/location_plugin.py @@ -3,19 +3,25 @@ # from __future__ import absolute_import +import six + from ipapython.dn import DN from ipapython.dnsutil import DNSName from ipatests.util import assert_deepequal from ipatests.test_xmlrpc.tracker.base import Tracker +if six.PY3: + unicode = str + + class LocationTracker(Tracker): """Tracker for IPA Location tests""" - retrieve_keys = {'idnsname', 'description', 'dn'} + retrieve_keys = {'idnsname', 'description', 'dn', 'servers_server'} retrieve_all_keys = retrieve_keys | {'objectclass'} - create_keys = retrieve_keys | {'objectclass'} - find_keys = retrieve_keys - find_all_keys = retrieve_all_keys + create_keys = {'idnsname', 'description', 'dn', 'objectclass'} + find_keys = {'idnsname', 'description', 'dn',} + find_all_keys = find_keys | {'objectclass'} update_keys = {'idnsname', 'description'} def __init__(self, name, description=u"Location description"): @@ -34,13 +40,15 @@ class LocationTracker(Tracker): 'cn=etc', self.api.env.basedn ) + self.servers = {} + def make_create_command(self, force=None): """Make function that creates this location using location-add""" return self.make_command( 'location_add', self.idnsname, description=self.description, ) - def make_delete_command(self): + def make_delete_command(self, force=None): """Make function that removes this location using location-del""" return self.make_command('location_del', self.idnsname) @@ -95,6 +103,7 @@ class LocationTracker(Tracker): value=self.idnsname_obj, summary=None, result=expected, + servers=self.servers, ), result) def check_find(self, result, all=False, raw=False): @@ -117,3 +126,26 @@ class LocationTracker(Tracker): summary=u'Modified IPA location "{loc}"'.format(loc=self.idnsname), result=self.filter_attrs(self.update_keys | set(extra_keys)) ), result) + + def add_server_to_location( + self, server_name, weight=100, relative_weight=u"100.0%"): + self.attrs.setdefault('servers_server', []).append(server_name) + self.servers[server_name] = { + 'cn': [server_name], + 'ipalocationweight': [unicode(weight)], + 'location_relative_weight': [relative_weight] + } + + def remove_server_from_location(self, server_name): + if 'servers_server' in self.attrs: + try: + self.attrs['servers_server'].remove(server_name) + except ValueError: + pass + else: + if not self.attrs['servers_server']: + del self.attrs['servers_server'] + try: + del self.servers[server_name] + except KeyError: + pass diff --git a/ipatests/test_xmlrpc/tracker/server_plugin.py b/ipatests/test_xmlrpc/tracker/server_plugin.py new file mode 100644 index 000000000..42e63d78f --- /dev/null +++ b/ipatests/test_xmlrpc/tracker/server_plugin.py @@ -0,0 +1,110 @@ +# +# Copyright (C) 2016 FreeIPA Contributors see COPYING for license +# +from __future__ import absolute_import + +from ipapython.dn import DN +from ipatests.util import assert_deepequal +from ipatests.test_xmlrpc.tracker.base import Tracker + + +class ServerTracker(Tracker): + """Tracker for IPA Location tests""" + retrieve_keys = { + 'cn', 'dn', 'ipamaxdomainlevel', 'ipamindomainlevel', + 'iparepltopomanagedsuffix_topologysuffix', 'ipalocation_location', + 'ipalocationweight', + } + retrieve_all_keys = retrieve_keys | {'objectclass'} + create_keys = retrieve_keys | {'objectclass'} + find_keys = { + 'cn', 'dn', 'ipamaxdomainlevel', 'ipamindomainlevel', + 'ipalocationweight', + } + find_all_keys = retrieve_all_keys + update_keys = { + 'cn', 'ipamaxdomainlevel', 'ipamindomainlevel', + 'ipalocation_location', 'ipalocationweight', + } + + def __init__(self, name): + super(ServerTracker, self).__init__(default_version=None) + self.server_name = name + self.dn = DN( + ('cn', self.server_name), + 'cn=masters,cn=ipa,cn=etc', + self.api.env.basedn + ) + self.exists = True # we cannot add server manually using server-add + self.attrs = dict( + dn=self.dn, + cn=[self.server_name], + iparepltopomanagedsuffix_topologysuffix=[u'domain', u'ca'], + objectclass=[ + u"ipalocationmember", + u"ipaReplTopoManagedServer", + u"top", + u"ipaConfigObject", + u"nsContainer", + u"ipaSupportedDomainLevelConfig" + ], + ipamaxdomainlevel=[u"1"], + ipamindomainlevel=[u"0"], + ) + self.exists = True + + def make_retrieve_command(self, all=False, raw=False): + """Make function that retrieves this server using server-show""" + return self.make_command( + 'server_show', self.name, all=all, raw=raw + ) + + def make_find_command(self, *args, **kwargs): + """Make function that finds servers using server-find""" + return self.make_command('server_find', *args, **kwargs) + + def make_update_command(self, updates): + """Make function that modifies the server using server-mod""" + return self.make_command('server_mod', self.name, **updates) + + def check_retrieve(self, result, all=False, raw=False): + """Check `server-show` command result""" + if all: + expected = self.filter_attrs(self.retrieve_all_keys) + else: + expected = self.filter_attrs(self.retrieve_keys) + assert_deepequal(dict( + value=self.server_name, + summary=None, + result=expected, + ), result) + + def check_find(self, result, all=False, raw=False): + """Check `server-find` command result""" + if all: + expected = self.filter_attrs(self.find_all_keys) + else: + expected = self.filter_attrs(self.find_keys) + assert_deepequal(dict( + count=1, + truncated=False, + summary=u'1 IPA server matched', + result=[expected], + ), result) + + def check_find_nomatch(self, result): + """ Check 'server-find' command result when no match is expected """ + assert_deepequal(dict( + count=0, + truncated=False, + summary=u'0 IPA servers matched', + result=[], + ), result) + + def check_update(self, result, extra_keys=()): + """Check `server-update` command result""" + assert_deepequal(dict( + value=self.server_name, + summary=u'Modified IPA server "{server}"'.format(server=self.name), + result=self.filter_attrs(self.update_keys | set(extra_keys)) + ), result) |