aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-09-04 14:29:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-04 14:29:05 +0000
commitac2de4356604f81cff9c303f0af36601e8a330ea (patch)
treefee6958bae0aad369f837b12206b0cfddd2882b6 /functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
parent506ef8bdcb772637be4dc01c5afc0e583f7ae3d3 (diff)
parent578f831fe90f08028c6e88e103175b9bb698b6c5 (diff)
Merge "More support of snaps for VNF"
Diffstat (limited to 'functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py')
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
index 216632ee..c924a347 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
@@ -31,7 +31,6 @@ from snaps.openstack.create_network import (
SubnetSettings,
PortSettings)
from snaps.openstack.create_router import OpenStackRouter, RouterSettings
-from snaps.openstack.os_credentials import OSCreds
from snaps.openstack.create_instance import (
VmInstanceSettings,
OpenStackVmInstance)
@@ -208,15 +207,13 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding):
super(ClearwaterImsVnf, self).prepare()
self.logger.info("Additional pre-configuration steps")
- self.logger.info("creds %s", (self.creds))
-
- self.snaps_creds = OSCreds(
- username=self.creds['username'],
- password=self.creds['password'],
- auth_url=self.creds['auth_url'],
- project_name=self.creds['tenant'],
- identity_api_version=int(os_utils.get_keystone_client_version()))
+ self.creds = {
+ "tenant": self.tenant_name,
+ "username": self.tenant_name,
+ "password": self.tenant_name,
+ "auth_url": os_utils.get_credentials()['auth_url']
+ }
self.prepare_images()
self.prepare_flavor()
self.prepare_security_groups()