diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-05-31 12:46:36 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-06-27 13:29:01 -0600 |
| commit | 0d22e5c1e1d6b49a99f0ca5be722fdc50ed105a4 (patch) | |
| tree | eaad678f31c5d135ca34ba6232e906cbe4f84b30 /functest/opnfv_tests/openstack/snaps/smoke.py | |
| parent | 4ef95523104ea0efc20869b7522e12c6d1b89613 (diff) | |
SNAPS tests now support offline testing.
Images by type (cirros, centos, ubuntu) can now have the download URL be
overridden, told to leverage a local file, or have custom configuration
when using the snaps.openstack.tests.openstack_tests.py image settings
helper functions.
JIRA: FUNCTEST-809
Change-Id: I790094a7a26eb5a55f53d6e875c658dc5e7ac2f9
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/snaps/smoke.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/smoke.py | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/smoke.py b/functest/opnfv_tests/openstack/snaps/smoke.py index c3c55c7c..7a3eb2f8 100644 --- a/functest/opnfv_tests/openstack/snaps/smoke.py +++ b/functest/opnfv_tests/openstack/snaps/smoke.py @@ -6,14 +6,12 @@ # # http://www.apache.org/licenses/LICENSE-2.0 -import os import unittest from snaps import test_suite_builder -from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \ - SnapsTestRunner -from functest.utils.constants import CONST +from functest.opnfv_tests.openstack.snaps.snaps_test_runner import ( + SnapsTestRunner) class SnapsSmoke(SnapsTestRunner): @@ -35,23 +33,12 @@ class SnapsSmoke(SnapsTestRunner): :param kwargs: the arguments to pass on :return: """ - image_config = None - if hasattr(CONST, 'snaps_images_cirros'): - image_config = CONST.__getattribute__('snaps_images_cirros') - - # Tests requiring floating IPs leverage files contained within the - # SNAPS repository and are found relative to that path - if self.use_fip: - snaps_dir = os.path.join(CONST.__getattribute__('dir_repo_snaps'), - 'snaps') - os.chdir(snaps_dir) - test_suite_builder.add_openstack_integration_tests( suite=self.suite, os_creds=self.os_creds, ext_net_name=self.ext_net_name, use_keystone=self.use_keystone, flavor_metadata=self.flavor_metadata, - image_metadata=image_config, + image_metadata=self.image_metadata, use_floating_ips=self.use_fip) return super(self.__class__, self).run() |