diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-11 19:35:28 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-16 20:48:57 +0200 |
commit | f19e3cc9053e8e64606b43d759b7ff019dbcd07a (patch) | |
tree | 81acc900ceb62b45800f07c3ab3445e6f6d5023e /functest/opnfv_tests/openstack/refstack/refstack.py | |
parent | 90389efe0257f730418181291b82dda9c390b953 (diff) |
Add all RefStack lists
It adds platform and object targets.
refstack_defcore is renamed to refstack_compute.
Change-Id: Iad5bfb27be614aada98eef5b3148965e65210725
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit ce75381bdce754d40f632894f81a31ba6771a39f)
Diffstat (limited to 'functest/opnfv_tests/openstack/refstack/refstack.py')
-rw-r--r-- | functest/opnfv_tests/openstack/refstack/refstack.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/functest/opnfv_tests/openstack/refstack/refstack.py b/functest/opnfv_tests/openstack/refstack/refstack.py index c709e5626..e80e5c202 100644 --- a/functest/opnfv_tests/openstack/refstack/refstack.py +++ b/functest/opnfv_tests/openstack/refstack/refstack.py @@ -24,12 +24,9 @@ class Refstack(tempest.TempestCommon): __logger = logging.getLogger(__name__) - defcorelist = os.path.join( - getattr(config.CONF, 'dir_refstack_data'), 'defcore.txt') - - def _extract_refstack_data(self): + def _extract_refstack_data(self, refstack_list): yaml_data = "" - with open(self.defcorelist) as def_file: + with open(refstack_list) as def_file: for line in def_file: try: grp = re.search(r'^([^\[]*)(\[.*\])\n*$', line) @@ -63,8 +60,11 @@ class Refstack(tempest.TempestCommon): return yaml.load(yaml_data2) def generate_test_list(self, **kwargs): + refstack_list = os.path.join( + getattr(config.CONF, 'dir_refstack_data'), + "{}.txt".format(kwargs.get('target', 'compute'))) self.backup_tempest_config(self.conf_file, '/etc') - refstack_data = self._extract_refstack_data() + refstack_data = self._extract_refstack_data(refstack_list) tempest_data = self._extract_tempest_data() with open(self.list, 'w') as ref_file: for key in refstack_data.keys(): |