diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-06-18 16:46:29 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-06-19 11:33:56 +0200 |
| commit | 1f87cb72018513dbf2cb59a0d20a8803871dfa7c (patch) | |
| tree | 89b287241aaab7cb1eb982190f7ead875b455009 | |
| parent | 486e67398016321648f5ca0e891835d4fe5dbc0b (diff) | |
Allow listing hypervisors in VMTP
It allows listing the compute under tests via VMTP_HYPERVISORS.
They are no additional log in Functest and the note in VMTP is still
valid [1].
[1] https://opendev.org/x/vmtp/src/branch/master/vmtp/vmtp.py#L833
Change-Id: Ic9fbda3901d796c0ed94e42e2a14c468598f4311
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 3668a839dd9b869a3162c8aa2d98a152d22b7244)
| -rw-r--r-- | functest/opnfv_tests/openstack/vmtp/vmtp.py | 10 | ||||
| -rw-r--r-- | functest/utils/env.py | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py index 822c1b652..edff99cb2 100644 --- a/functest/opnfv_tests/openstack/vmtp/vmtp.py +++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py @@ -33,6 +33,7 @@ from xtesting.core import testcase from functest.core import singlevm from functest.utils import env +from functest.utils import functest_utils class Vmtp(singlevm.VmReady2): @@ -148,8 +149,15 @@ class Vmtp(singlevm.VmReady2): del new_env['OS_TENANT_ID'] except Exception: # pylint: disable=broad-except pass + extra_args = "" + if env.get("VMTP_HYPERVISORS"): + hypervisors = functest_utils.convert_ini_to_list( + env.get("VMTP_HYPERVISORS")) + for hypervisor in hypervisors: + extra_args = "{} --hypervisor {} ".format( + extra_args, hypervisor) cmd = ['vmtp', '-d', '--json', '{}/vmtp.json'.format(self.res_dir), - '-c', self.config] + '-c', self.config, extra_args] output = subprocess.check_output( cmd, stderr=subprocess.STDOUT, env=new_env).decode("utf-8") self.__logger.info("%s\n%s", " ".join(cmd), output) diff --git a/functest/utils/env.py b/functest/utils/env.py index 652613c87..672aee1d9 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -39,7 +39,8 @@ INPUTS = { 'CLEAN_ORPHAN_SECURITY_GROUPS': 'True', 'SKIP_DOWN_HYPERVISORS': 'False', 'PUBLIC_ENDPOINT_ONLY': 'False', - 'DASHBOARD_URL': '' + 'DASHBOARD_URL': '', + 'VMTP_HYPERVISORS': '' } |