diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-08-28 19:47:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-28 19:47:15 +0000 |
| commit | ba459114a5dfd1efe5e817fdc8a172bfb4dc0a3e (patch) | |
| tree | 8a8fc33d077f97143e9a9f378280a15c38a63c7e /functest/opnfv_tests/openstack/tempest | |
| parent | 71e287712d1f59e442603af244ff3230a6333e44 (diff) | |
| parent | 9cd065bd3ce2544ced1ace605da0d77c1b59cb3b (diff) | |
Merge "Obtain scenario by CONST instead of get function"
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 6523dfca..b8a4e9ad 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -445,7 +445,7 @@ class TempestResourcesManager(object): if (CONST.__getattribute__('tempest_use_custom_flavors') or use_custom_flavors): logger.info("Creating flavor for Tempest suite") - scenario = ft_utils.get_scenario() + scenario = CONST.__getattribute__('DEPLOY_SCENARIO') flavor_metadata = None if 'ovs' in scenario or 'fdio' in scenario: flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE @@ -464,7 +464,7 @@ class TempestResourcesManager(object): if use_custom_flavors: logger.info("Creating 2nd flavor for Tempest suite") - scenario = ft_utils.get_scenario() + scenario = CONST.__getattribute__('DEPLOY_SCENARIO') flavor_metadata_alt = None if 'ovs' in scenario or 'fdio' in scenario: flavor_metadata_alt = create_flavor.MEM_PAGE_SIZE_LARGE |