From 48282905d148bd2570219368105e3e5e2629866a Mon Sep 17 00:00:00 2001 From: Alex Katz Date: Mon, 1 Feb 2021 12:44:10 +0200 Subject: [PATCH] Remove duplicated get_osp_version method Change-Id: Ib648f47b44f6cc58a8993ccf69758807f06bdb74 --- tobiko/openstack/tests/_neutron.py | 12 ++---------- tobiko/openstack/topology/__init__.py | 1 + 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tobiko/openstack/tests/_neutron.py b/tobiko/openstack/tests/_neutron.py index 7300a73cb..2264ac293 100644 --- a/tobiko/openstack/tests/_neutron.py +++ b/tobiko/openstack/tests/_neutron.py @@ -10,24 +10,16 @@ from tobiko.openstack import neutron from tobiko.openstack import topology from tobiko.shell import sh from tobiko.tripleo import containers -from tobiko.tripleo import has_undercloud from tobiko.tripleo import pacemaker LOG = log.getLogger(__name__) def get_osp_version(): - if not has_undercloud(): - return None - from tobiko.tripleo import undercloud_ssh_client try: - result = sh.execute("awk '{print $6}' /etc/rhosp-release", - ssh_client=undercloud_ssh_client()) - except (sh.ShellCommandFailed, sh.ShellTimeoutExpired): - LOG.debug("File /etc/rhosp-release not found") + return topology.get_openstack_version() + except Exception: return None - else: - return result.stdout.splitlines()[0] def is_ovn_configured(): diff --git a/tobiko/openstack/topology/__init__.py b/tobiko/openstack/topology/__init__.py index 0c896c1e3..fbe8e8089 100644 --- a/tobiko/openstack/topology/__init__.py +++ b/tobiko/openstack/topology/__init__.py @@ -27,6 +27,7 @@ get_agent_container_name = _topology.get_agent_container_name get_log_file_digger = _topology.get_log_file_digger get_openstack_topology = _topology.get_openstack_topology get_openstack_node = _topology.get_openstack_node +get_openstack_version = _topology.get_openstack_version skip_unless_osp_version = _topology.skip_unless_osp_version check_systemd_monitors_agent = _topology.check_systemd_monitors_agent find_openstack_node = _topology.find_openstack_node