From 4f8235de0071502415da260ea967a65b9327476c Mon Sep 17 00:00:00 2001 From: spisarski Date: Wed, 22 Mar 2017 16:04:25 -0600 Subject: Updated method calls to SNAPS tests. Due to the refactoring performed in gerrit patch 31435, the calls to the SNAPS tests needed to be updated. JIRA: SNAPS-23 Change-Id: I9069ea61b1d15b52a081501b03ae8bf73da10f29 Signed-off-by: spisarski --- functest/opnfv_tests/openstack/snaps/snaps_test_runner.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'functest/opnfv_tests/openstack/snaps/snaps_test_runner.py') diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py index 2068852e..b17aab0c 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py @@ -5,12 +5,13 @@ # # http://www.apache.org/licenses/LICENSE-2.0 -from functest.utils import functest_logger as ft_logger from functest.core.pytest_suite_runner import PyTestSuiteRunner from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils import functest_utils +from functest.utils.constants import CONST from snaps.openstack import create_flavor +from snaps.openstack.tests import openstack_tests class SnapsTestRunner(PyTestSuiteRunner): @@ -22,8 +23,13 @@ class SnapsTestRunner(PyTestSuiteRunner): def __init__(self, **kwargs): super(SnapsTestRunner, self).__init__(**kwargs) - self.ext_net_name = snaps_utils.get_ext_net_name() - self.logger = ft_logger.Logger(self.project_name).getLogger() + self.os_creds = openstack_tests.get_credentials( + os_env_file=CONST.openstack_creds, proxy_settings_str=None, + ssh_proxy_cmd=None) + + self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds) + self.use_fip = CONST.snaps_use_floating_ips + self.use_keystone = CONST.snaps_use_keystone scenario = functest_utils.get_scenario() self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_ANY -- cgit 1.2.3-korg