aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-01-30 19:11:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-30 19:11:27 +0000
commit8296b68bbb2e6da34676af2c1e81e264c626296c (patch)
tree328f928cedd788ae9ea86b698f1edd9a87586b1e /functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
parent03c3f4c2bd1635383cb64168b52e4d8540056942 (diff)
parent3b36c06f9223322e23e3885759355593b3c598a3 (diff)
Merge "Remove duplicated code related to snaps creds"
Diffstat (limited to 'functest/opnfv_tests/openstack/snaps/snaps_test_runner.py')
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_test_runner.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 94c8af85..a2dadb75 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -17,7 +17,6 @@ from functest.opnfv_tests.openstack.snaps import snaps_utils
from functest.utils.constants import CONST
from snaps.openstack import create_flavor
-from snaps.openstack.tests import openstack_tests
class SnapsTestRunner(unit.Suite):
@@ -29,17 +28,7 @@ class SnapsTestRunner(unit.Suite):
def __init__(self, **kwargs):
super(SnapsTestRunner, self).__init__(**kwargs)
self.logger = logging.getLogger(__name__)
- if 'os_creds' in kwargs:
- self.os_creds = kwargs['os_creds']
- else:
- creds_override = None
- if hasattr(CONST, 'snaps_os_creds_override'):
- creds_override = CONST.__getattribute__(
- 'snaps_os_creds_override')
- self.os_creds = openstack_tests.get_credentials(
- os_env_file=CONST.__getattribute__('openstack_creds'),
- proxy_settings_str=None, ssh_proxy_cmd=None,
- overrides=creds_override)
+ self.os_creds = kwargs.get('os_creds') or snaps_utils.get_credentials()
if 'ext_net_name' in kwargs:
self.ext_net_name = kwargs['ext_net_name']