aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/snaps/smoke.py
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-06-29 17:17:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-29 17:17:33 +0000
commitfbc676b2bcf63382a39c5b54d47c608a20a8cfea (patch)
treeddc40706b9dd3ef75c008f46781e357dc699583e /functest/opnfv_tests/openstack/snaps/smoke.py
parent06fd297de11e9dd061fe001502f66f139f054098 (diff)
parent0d22e5c1e1d6b49a99f0ca5be722fdc50ed105a4 (diff)
Merge "SNAPS tests now support offline testing."
Diffstat (limited to 'functest/opnfv_tests/openstack/snaps/smoke.py')
-rw-r--r--functest/opnfv_tests/openstack/snaps/smoke.py19
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()