x/tobiko
Code Issues Proposed changes

Directly use _overcloud and _undercloud private names from topology.py

Browse Source 
Change-Id: I6831cdda8d9d2c645337c4f5eb184ec3578d675e
This commit is contained in:
Federico Ressi 2020-08-03 12:47:14 +02:00
parent 0b6c975fe5
commit d4b26b98cf
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tobiko/tests/functional/tripleo/test_topology.py
View File

@ -17,32 +17,30 @@ from __future__ import absolute_import
import tobiko import tobiko
from tobiko.shell import sh from tobiko.shell import sh
from tobiko.tripleo import overcloud from tobiko import tripleo
from tobiko.tripleo import topology
from tobiko.tripleo import undercloud
from tobiko.tests.functional.openstack import test_topology from tobiko.tests.functional.openstack import test_topology
class TripleoTopologyTest(test_topology.OpenStackTopologyTest): class TripleoTopologyTest(test_topology.OpenStackTopologyTest):
topology = tobiko.required_setup_fixture(topology.TripleoTopology) topology = tobiko.required_setup_fixture(tripleo.TripleoTopology)
@undercloud.skip_if_missing_undercloud @tripleo.skip_if_missing_undercloud
def test_undercloud_group(self): def test_undercloud_group(self):
ssh_client = undercloud.undercloud_ssh_client() ssh_client = tripleo.undercloud_ssh_client()
name = sh.get_hostname(ssh_client=ssh_client).split('.')[0] name = sh.get_hostname(ssh_client=ssh_client).split('.')[0]
node = self.topology.get_node(name) node = self.topology.get_node(name)
self.assertIs(node.ssh_client, ssh_client) self.assertIs(node.ssh_client, ssh_client)
self.assertEqual(name, node.name) self.assertEqual(name, node.name)
nodes = self.topology.get_group('undercloud') nodes = self.topology.get_group('undercloud')
self.assertEqual([node], nodes) self.assertEqual([node], nodes)
host_config = undercloud.undercloud_host_config() host_config = tripleo.undercloud_host_config()
self.assertEqual(host_config.hostname, str(node.public_ip)) self.assertEqual(host_config.hostname, str(node.public_ip))
@overcloud.skip_if_missing_overcloud @tripleo.skip_if_missing_overcloud
def test_overcloud_group(self): def test_overcloud_group(self):
for server in overcloud.list_overcloud_nodes(): for server in tripleo.list_overcloud_nodes():
ssh_client = overcloud.overcloud_ssh_client(server.name) ssh_client = tripleo.overcloud_ssh_client(server.name)
name = sh.get_hostname(ssh_client=ssh_client).split('.')[0] name = sh.get_hostname(ssh_client=ssh_client).split('.')[0]
node = self.topology.get_node(name) node = self.topology.get_node(name)
self.assertIs(node.ssh_client, ssh_client) self.assertIs(node.ssh_client, ssh_client)
@ -55,6 +53,6 @@ class TripleoTopologyTest(test_topology.OpenStackTopologyTest):
nodes = self.topology.get_group(group) nodes = self.topology.get_group(group)
self.assertIn(node, nodes) self.assertIn(node, nodes)
self.assertIn(group, node.groups) self.assertIn(group, node.groups)
host_config = overcloud.overcloud_host_config(name) host_config = tripleo.overcloud_host_config(name)
self.assertEqual(host_config.hostname, self.assertEqual(host_config.hostname,
str(node.public_ip)) str(node.public_ip))

4
tobiko/tripleo/__init__.py
View File

@ -15,6 +15,7 @@ from __future__ import absolute_import
from tobiko.tripleo import _ansible from tobiko.tripleo import _ansible
from tobiko.tripleo import _overcloud as overcloud from tobiko.tripleo import _overcloud as overcloud
from tobiko.tripleo import _topology as topology
from tobiko.tripleo import _undercloud as undercloud from tobiko.tripleo import _undercloud as undercloud
@ -34,8 +35,11 @@ overcloud_node_ip_address = overcloud.overcloud_node_ip_address
overcloud_ssh_client = overcloud.overcloud_ssh_client overcloud_ssh_client = overcloud.overcloud_ssh_client
skip_if_missing_overcloud = overcloud.skip_if_missing_overcloud skip_if_missing_overcloud = overcloud.skip_if_missing_overcloud
TripleoTopology = topology.TripleoTopology
load_undercloud_rcfile = undercloud.load_undercloud_rcfile load_undercloud_rcfile = undercloud.load_undercloud_rcfile
skip_if_missing_undercloud = undercloud.skip_if_missing_undercloud skip_if_missing_undercloud = undercloud.skip_if_missing_undercloud
undercloud_host_config = undercloud.undercloud_host_config
undercloud_keystone_client = undercloud.undercloud_keystone_client undercloud_keystone_client = undercloud.undercloud_keystone_client
undercloud_keystone_credentials = undercloud.undercloud_keystone_credentials undercloud_keystone_credentials = undercloud.undercloud_keystone_credentials
undercloud_keystone_session = undercloud.undercloud_keystone_session undercloud_keystone_session = undercloud.undercloud_keystone_session

22
tobiko/tripleo/topology.py → tobiko/tripleo/_topology.py
View File

@ -14,13 +14,13 @@
from __future__ import absolute_import from __future__ import absolute_import
import re import re
import typing import typing # noqa
from oslo_log import log from oslo_log import log
from tobiko.openstack import topology from tobiko.openstack import topology
from tobiko.tripleo import overcloud from tobiko.tripleo import _overcloud
from tobiko.tripleo import undercloud from tobiko.tripleo import _undercloud
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -44,18 +44,18 @@ class TripleoTopology(topology.OpenStackTopology):
self.discover_overcloud_nodes() self.discover_overcloud_nodes()
def discover_undercloud_nodes(self): def discover_undercloud_nodes(self):
if undercloud.has_undercloud(): if _undercloud.has_undercloud():
config = undercloud.undercloud_host_config() config = _undercloud.undercloud_host_config()
ssh_client = undercloud.undercloud_ssh_client() ssh_client = _undercloud.undercloud_ssh_client()
self.add_node(address=config.hostname, self.add_node(address=config.hostname,
group='undercloud', group='undercloud',
ssh_client=ssh_client) ssh_client=ssh_client)
def discover_overcloud_nodes(self): def discover_overcloud_nodes(self):
if overcloud.has_overcloud(): if _overcloud.has_overcloud():
for server in overcloud.list_overcloud_nodes(): for server in _overcloud.list_overcloud_nodes():
config = overcloud.overcloud_host_config(server.name) config = _overcloud.overcloud_host_config(server.name)
ssh_client = overcloud.overcloud_ssh_client(server.name) ssh_client = _overcloud.overcloud_ssh_client(server.name)
node = self.add_node(address=config.hostname, node = self.add_node(address=config.hostname,
group='overcloud', group='overcloud',
ssh_client=ssh_client) ssh_client=ssh_client)
@ -111,7 +111,7 @@ def is_number(text: str):
def setup_tripleo_topology(): def setup_tripleo_topology():
if undercloud.has_undercloud() or overcloud.has_overcloud(): if _undercloud.has_undercloud() or _overcloud.has_overcloud():
topology.set_default_openstack_topology_class( topology.set_default_openstack_topology_class(
'tobiko.tripleo.topology.TripleoTopology') 'tobiko.tripleo.topology.TripleoTopology')