Add 'test_run_cvp_ha_smoke'
- TEMPEST_TARGET_NODE is taken from environment-template
class features/runtest/runtest.yaml, so this class
is required on cfg01 node
- use self.master_minion to target salt master node,
instead of hostname
Change-Id: Ib66cab9ffe001048dc4f4c52af2fd67ea53638ce
Related-Task: #PROD-25353
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index 7325e2e..c6f3c5e 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -50,6 +50,8 @@
self.run_cmd = run_cmd or self.run_cmd
self.master_name = self.underlay.get_target_node_names(
self.master_host)[0]
+ self.master_minion = self.underlay.get_target_minion_ids(
+ self.master_host)[0]
self.__target_name = None
@property
@@ -60,7 +62,7 @@
def target_name(self):
if not self.__target_name:
target_host = self.__salt_api.get_single_pillar(
- tgt=self.master_name,
+ tgt=self.master_minion,
pillar="runtest:tempest:test_target")
if target_host[-1] == "*":
target_host = target_host[:-1]
diff --git a/tcp_tests/managers/underlay_ssh_manager.py b/tcp_tests/managers/underlay_ssh_manager.py
index cf1fb2b..6b5bebb 100644
--- a/tcp_tests/managers/underlay_ssh_manager.py
+++ b/tcp_tests/managers/underlay_ssh_manager.py
@@ -571,3 +571,9 @@
return [node_name for node_name
in self.node_names()
if node_name.startswith(target)]
+
+ def get_target_minion_ids(self, target='gtw01.'):
+ """Get all minion ids which names starts with <target>"""
+ return [minion_id for minion_id
+ in self.minion_ids()
+ if minion_id.startswith(target)]