test_integration.config: Load/store from/to dicts

Part of the work for: https://fedorahosted.org/freeipa/ticket/3938

Reviewed-By: Tomas Babej <tbabej@redhat.com>

ipatests/test_integration/config.py

@@ -27,9 +27,8 @@ import random
 from ipapython import ipautil
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import log_mgr
-from ipatests.test_integration.host import BaseHost, Host
-
-TESTHOST_PREFIX = 'TESTHOST_'
+from ipatests.test_integration.util import check_config_dict_empty
+from ipatests.test_integration.util import TESTHOST_PREFIX
 
 
 _SettingInfo = collections.namedtuple('Setting', 'name var_name default')
@@ -93,6 +92,27 @@ class Config(object):
     def ad_domains(self):
         return filter(lambda d: d.type == 'AD', self.domains)
 
+    @classmethod
+    def from_dict(cls, dct):
+        kwargs = {s.name: dct.pop(s.name, s.default) for s in _setting_infos}
+        self = cls(**kwargs)
+
+        for domain_dict in dct.pop('domains'):
+            self.domains.append(Domain.from_dict(domain_dict, self))
+
+        check_config_dict_empty(dct, 'config')
+
+        return self
+
+    def to_dict(self):
+        dct = {'domains': [d.to_dict() for d in self.domains]}
+        for setting in _setting_infos:
+            value = getattr(self, setting.name)
+            if isinstance(value, DN):
+                value = str(value)
+            dct[setting.name] = value
+        return dct
+
     @classmethod
     def from_env(cls, env):
         """Create a test config from environment variables
@@ -315,8 +335,33 @@ class Domain(object):
         for role in sorted(roles):
             yield role
 
+    @classmethod
+    def from_dict(cls, dct, config):
+        from ipatests.test_integration.host import BaseHost
+
+        domain_type = dct.pop('type')
+        assert domain_type in ('IPA', 'AD')
+        domain_name = dct.pop('name')
+        self = cls(config, domain_name, domain_type)
+
+        for host_dict in dct.pop('hosts'):
+            host = BaseHost.from_dict(host_dict, self)
+            self.hosts.append(host)
+
+        check_config_dict_empty(dct, 'domain %s' % domain_name)
+
+        return self
+
+    def to_dict(self):
+        return {
+            'type': self.type,
+            'name': self.name,
+            'hosts': [h.to_dict() for h in self.hosts],
+        }
+
     @classmethod
     def from_env(cls, env, config, index, domain_type):
+        from ipatests.test_integration.host import BaseHost
 
         # Roles available in the domain depend on the type of the domain
         # Unix machines are added only to the IPA domains, Windows machines

ipatests/test_integration/host.py

@@ -26,6 +26,8 @@ from ipapython.ipaldap import IPAdmin
 from ipapython import ipautil
 from ipapython.ipa_log_manager import log_mgr
 from ipatests.test_integration import transport
+from ipatests.test_integration.util import check_config_dict_empty
+from ipatests.test_integration.util import TESTHOST_PREFIX
 
 
 class BaseHost(object):
@@ -99,6 +101,10 @@ class BaseHost(object):
         external_hostname = env.get(
             'BEAKER%s%s_env%s' % (role.upper(), index, domain_index), None)
 
+        return cls._make_host(domain, hostname, role, ip, external_hostname)
+
+    @staticmethod
+    def _make_host(domain, hostname, role, ip, external_hostname):
         # We need to determine the type of the host, this depends on the domain
         # type, as we assume all Unix machines are in the Unix domain and
         # all Windows machine in a AD domain
@@ -108,8 +114,35 @@ class BaseHost(object):
         else:
             cls = Host
 
-        self = cls(domain, hostname, role, ip, external_hostname)
-        return self
+        return cls(domain, hostname, role, ip, external_hostname)
+
+    @classmethod
+    def from_dict(cls, dct, domain):
+        if isinstance(dct, basestring):
+            dct = {'name': dct}
+        try:
+            role = dct.pop('role').lower()
+        except KeyError:
+            role = domain.static_roles[0]
+
+        hostname = dct.pop('name')
+        if '.' not in hostname:
+            hostname = '.'.join((hostname, domain.name))
+
+        ip = dct.pop('ip', None)
+        external_hostname = dct.pop('external_hostname', None)
+
+        check_config_dict_empty(dct, 'host %s' % hostname)
+
+        return cls._make_host(domain, hostname, role, ip, external_hostname)
+
+    def to_dict(self):
+        return {
+            'name': self.hostname,
+            'ip': self.ip,
+            'role': self.role,
+            'external_hostname': self.external_hostname,
+        }
 
     @property
     def config(self):

ipatests/test_integration/util.py

@@ -20,6 +20,16 @@
 import time
 
 
+TESTHOST_PREFIX = 'TESTHOST_'
+
+
+def check_config_dict_empty(dct, name):
+    """Ensure that no keys are left in a configuration dict"""
+    if dct:
+        raise ValueError('Extra keys in confuguration for %s: %s' %
+                         (name, ', '.join(dct)))
+
+
 def run_repeatedly(host, command, assert_zero_rc=True, test=None,
                 timeout=30, **kwargs):
     """