aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/vping
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-08-24 14:23:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-24 14:23:39 +0000
commit1da439765b20bbc9a1f63d736f4c6284b654d50d (patch)
tree0a21706812bd6ca0161c4dc2fc2d8ecc76383029 /functest/opnfv_tests/openstack/vping
parent671b3356e8fc7c6219919f978a3dee6b69e8c663 (diff)
parentb58e9f7b713e53b70b45ca3d13c0fcf0ed93e801 (diff)
Merge "Added means to override the RC file credentials."
Diffstat (limited to 'functest/opnfv_tests/openstack/vping')
-rw-r--r--functest/opnfv_tests/openstack/vping/vping_base.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index f3e0cfe32..40fcb07f0 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -43,8 +43,14 @@ class VPingBase(testcase.TestCase):
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'))
+ os_env_file=CONST.__getattribute__('openstack_creds'),
+ overrides=creds_override)
self.creators = list()
self.image_creator = None