Revert "Allow to configure undercloud via ssh_config file"

This reverts commit 58373a74bd.

Change-Id: I84cdacdf6afe75e7e70189f6861c4219d1695575

.gitignore

@@ -40,4 +40,3 @@ Pipfile.lock
 tobiko.conf
 clouds.yaml
 ssh_config
-ssh_id*

tobiko/openstack/keystone/_credentials.py

@@ -272,8 +272,8 @@ class DefaultKeystoneCredentialsFixture(KeystoneCredentialsFixture):
         for fixture in self.fixtures:
             try:
                 credentials = tobiko.setup_fixture(fixture).credentials
-            except Exception as ex:
+            except Exception:
-                LOG.debug("Error getting cretentials from %r: %s", fixture, ex)
+                LOG.debug("Error getting cretentials from %r", fixture)
                 errors.append(tobiko.exc_info())
                 continue
 

tobiko/shell/ssh/_client.py

@@ -75,10 +75,7 @@ def positive_int(value):
 def get_key_filename(value):
     if isinstance(value, six.string_types):
         value = [value]
-    key_filename = [tobiko.tobiko_config_path(v) for v in value]
+    return [os.path.realpath(os.path.expanduser(v)) for v in value]
-    return [f
-            for f in key_filename
-            if os.path.isfile(f)]
 
 
 SSH_CONNECT_PARAMETERS = {

tobiko/shell/ssh/_config.py

@@ -27,43 +27,38 @@ import tobiko
 LOG = log.getLogger(__name__)
 
 
-def ssh_config(config_files=None, **defaults):
+def ssh_config(config_files=None):
-    if config_files or defaults:
+    if config_files:
-        fixture = SSHConfigFixture(config_files=config_files, **defaults)
+        fixture = SSHConfigFixture(config_files=config_files)
     else:
         fixture = SSHConfigFixture
     return tobiko.setup_fixture(fixture)
 
 
-def ssh_host_config(host=None, config_files=None, **defaults):
+def ssh_host_config(host=None, config_files=None):
-    return ssh_config(config_files=config_files, **defaults).lookup(host)
+    return ssh_config(config_files=config_files).lookup(host)
 
 
 class SSHDefaultConfigFixture(tobiko.SharedFixture):
 
-    def __init__(self, **defaults):
+    conf = None
-        super(SSHDefaultConfigFixture, self).__init__()
+
-        self.__dict__.update((key, value)
+    def setup_fixture(self):
-                             for key, value in defaults.items()
+        self.conf = tobiko.tobiko_config().ssh
-                             if value is not None)
 
     def __getattr__(self, name):
-        config = tobiko.tobiko_config().ssh
+        return getattr(self.conf, name)
-        value = getattr(config, name)
-        self.__dict__[name] = value
-        return value
 
 
 class SSHConfigFixture(tobiko.SharedFixture):
 
-    default = None
+    default = tobiko.required_setup_fixture(SSHDefaultConfigFixture)
+
     config_files = None
     config = None
 
-    def __init__(self, config_files=None, **defaults):
+    def __init__(self, config_files=None):
         super(SSHConfigFixture, self).__init__()
-        self.default = tobiko.setup_fixture(
-            SSHDefaultConfigFixture(**defaults))
         if config_files:
             self.config_files = tuple(config_files)
         else:
@@ -92,8 +87,7 @@ class SSHConfigFixture(tobiko.SharedFixture):
         return SSHHostConfig(host=host,
                              ssh_config=self,
                              host_config=host_config,
-                             config_files=self.config_files,
+                             config_files=self.config_files)
-                             default=self.default)
 
     def __repr__(self):
         return "{class_name!s}(config_files={config_files!r})".format(
@@ -103,8 +97,9 @@ class SSHConfigFixture(tobiko.SharedFixture):
 class SSHHostConfig(collections.namedtuple('SSHHostConfig', ['host',
                                                              'ssh_config',
                                                              'host_config',
-                                                             'config_files',
+                                                             'config_files'])):
-                                                             'default'])):
+
+    default = tobiko.required_setup_fixture(SSHDefaultConfigFixture)
 
     @property
     def hostname(self):

tobiko/shell/ssh/config.py

@@ -37,9 +37,9 @@ OPTIONS = [
                 default=['/etc/ssh/ssh_config', '~/.ssh/config',
                          './ssh_config'],
                 help="Default user SSH configuration files"),
-    cfg.ListOpt('key_file',
+    cfg.StrOpt('key_file',
-                default=['ssh_identity', '~/.ssh/id_rsa', '~/.ssh/id_dsa'],
+               default='~/.ssh/id_rsa',
-                help="Default SSH private key file"),
+               help="Default SSH private key file"),
     cfg.BoolOpt('allow_agent',
                 default=False,
                 help=("Set to False to disable connecting to the "

tobiko/tests/unit/tripleo/test_config.py

@@ -23,13 +23,14 @@ CONF = config.CONF
 TIPLEO_CONF = CONF.tobiko.tripleo
 
 
-class UndercloudConfigTest(unit.TobikoUnitTest):
+class TripleoConfigTest(unit.TobikoUnitTest):
 
-    def test_undercloud_ssh_key_filename(self):
+    def test_ssh_key_filename(self):
-        value = TIPLEO_CONF.undercloud_ssh_key_filename
+        self.assertIsInstance(TIPLEO_CONF.undercloud_ssh_key_filename,
-        if value is not None:
+                              six.string_types)
-            self.assertIsInstance(value,
+
-                                  six.string_types)
+
+class UndercloudConfigTest(unit.TobikoUnitTest):
 
     def test_undercloud_ssh_hostname(self):
         value = TIPLEO_CONF.undercloud_ssh_hostname

tobiko/tripleo/config.py

@@ -21,7 +21,7 @@ GROUP_NAME = 'tripleo'
 OPTIONS = [
     # Undercloud options
     cfg.StrOpt('undercloud_ssh_hostname',
-               default='undercloud-0',
+               default=None,
                help="hostname or IP address to be used to connect to "
                     "undercloud host"),
     cfg.IntOpt('undercloud_ssh_port',
@@ -30,9 +30,9 @@ OPTIONS = [
     cfg.StrOpt('undercloud_ssh_username',
                default='stack',
                help="Username with access to stackrc and overcloudrc files"),
-    cfg.ListOpt('undercloud_ssh_key_filename',
+    cfg.StrOpt('undercloud_ssh_key_filename',
-                default=None,
+               default='~/.ssh/id_rsa',
-                help="SSH key filename used to login to Undercloud node"),
+               help="SSH key filename used to login to Undercloud node"),
     cfg.StrOpt('undercloud_rcfile',
                default='~/stackrc',
                help="Undercloud RC filename"),

tobiko/tripleo/undercloud.py

@@ -13,10 +13,6 @@
 #    under the License.
 from __future__ import absolute_import
 
-import socket
-
-import netaddr
-
 import tobiko
 from tobiko import config
 from tobiko.openstack import keystone
@@ -32,12 +28,7 @@ def undercloud_ssh_client():
 
 
 def undercloud_host_config():
-    tripleo_config = tobiko.tobiko_config().tripleo
+    return tobiko.setup_fixture(UndecloudHostConfig)
-    return ssh.ssh_host_config(
-        host=tripleo_config.undercloud_ssh_hostname,
-        username=tripleo_config.undercloud_ssh_username,
-        port=tripleo_config.undercloud_ssh_port,
-        key_file=tripleo_config.undercloud_ssh_key_filename)
 
 
 def fetch_os_env(rcfile):
@@ -60,28 +51,40 @@ class UndercloudKeystoneCredentialsFixture(
         return load_undercloud_rcfile()
 
 
-def gethost_by_name(hostname):
-    try:
-        return netaddr.IPAddress(hostname)
-    except Exception:
-        ip_address = socket.gethostbyname(hostname)
-        return netaddr.IPAddress(ip_address)
-
-
 def has_undercloud():
     host_config = undercloud_host_config()
-    try:
+    return bool(host_config.hostname)
-        gethost_by_name(host_config.hostname)
-    except Exception:
-        return False
-    else:
-        return True
 
 
 skip_if_missing_undercloud = tobiko.skip_unless(
     'TripleO undercloud hostname not configured', has_undercloud)
 
 
+class UndecloudHostConfig(tobiko.SharedFixture):
+
+    host = 'undercloud-0'
+    hostname = None
+    port = None
+    username = None
+    key_filename = None
+
+    def __init__(self, **kwargs):
+        super(UndecloudHostConfig, self).__init__()
+        self._connect_parameters = ssh.gather_ssh_connect_parameters(**kwargs)
+
+    def setup_fixture(self):
+        self.hostname = CONF.tobiko.tripleo.undercloud_ssh_hostname
+        self.port = CONF.tobiko.tripleo.undercloud_ssh_port
+        self.username = CONF.tobiko.tripleo.undercloud_ssh_username
+        self.key_filename = CONF.tobiko.tripleo.undercloud_ssh_key_filename
+
+    @property
+    def connect_parameters(self):
+        parameters = ssh.gather_ssh_connect_parameters(self)
+        parameters.update(self._connect_parameters)
+        return parameters
+
+
 def undercloud_keystone_client():
     session = undercloud_keystone_session()
     return keystone.get_keystone_client(session=session)