From 98f4c22267491bb8adceddcbd7ac4865b737e70f Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 24 Oct 2013 12:14:58 +0200 Subject: test_integration: Support external names for hosts The framework had a concept of external hostnames, which the controller uses to contact the test machines, but they were not loaded from configuration. Load external names from configuration. This makes tests pass in setups where internal and external hostnames are different, and the internal hostnames are not initially resolvable from the controller. --- ipatests/test_integration/host.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'ipatests/test_integration/host.py') diff --git a/ipatests/test_integration/host.py b/ipatests/test_integration/host.py index 02c82b37..be45a033 100644 --- a/ipatests/test_integration/host.py +++ b/ipatests/test_integration/host.py @@ -32,7 +32,8 @@ class BaseHost(object): """Representation of a remote IPA host""" transport_class = None - def __init__(self, domain, hostname, role, index, ip=None): + def __init__(self, domain, hostname, role, index, ip=None, + external_hostname=None): self.domain = domain self.role = role self.index = index @@ -40,7 +41,7 @@ class BaseHost(object): shortname, dot, ext_domain = hostname.partition('.') self.shortname = shortname self.hostname = shortname + '.' + self.domain.name - self.external_hostname = hostname + self.external_hostname = external_hostname or hostname self.netbios = self.domain.name.split('.')[0].upper() @@ -96,6 +97,8 @@ class BaseHost(object): def from_env(cls, env, domain, hostname, role, index): ip = env.get('BEAKER%s%s_IP_env%s' % (role.upper(), index, domain.index), None) + external_hostname = env.get( + 'BEAKER%s%s_env%s' % (role.upper(), index, domain.index), None) # 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 @@ -106,7 +109,7 @@ class BaseHost(object): else: cls = Host - self = cls(domain, hostname, role, index, ip) + self = cls(domain, hostname, role, index, ip, external_hostname) return self @property -- cgit