diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-03-13 01:36:40 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2018-03-15 03:50:30 +0000 |
| commit | c9fd7ceab29ff755aa8a9ee1bcb6ab958e5e0420 (patch) | |
| tree | 86910e6c608ab886264e1ff2fa388761b2078116 /functest/opnfv_tests/openstack/snaps/snaps_test_runner.py | |
| parent | 370eee3b9b1b20057191aa614ddfda31f8656e8e (diff) | |
Create 2 images and flavors for tempest tests
Also
1. remove the obsolete function: generate_test_accounts_file
2. Use patch mechanism to get config
Change-Id: I455ac37de71519bcaf9a51e5f1de1b9bc83b9ba6
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/snaps/snaps_test_runner.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/snaps_test_runner.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py index c7329f30d..7b111ed1b 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py @@ -12,12 +12,10 @@ import logging -from snaps.openstack import create_flavor from xtesting.core import unit from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils import config -from functest.utils import env class SnapsTestRunner(unit.Suite): @@ -45,12 +43,8 @@ class SnapsTestRunner(unit.Suite): getattr(config.CONF, 'snaps_use_floating_ips') == 'True') self.use_keystone = ( getattr(config.CONF, 'snaps_use_keystone') == 'True') - scenario = env.get('DEPLOY_SCENARIO') - - self.flavor_metadata = None - if 'ovs' in scenario or 'fdio' in scenario: - self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE + self.flavor_metadata = getattr(config.CONF, 'flavor_extra_specs', None) self.logger.info("Using flavor metadata '%s'", self.flavor_metadata) self.image_metadata = None |