diff options
author | 2017-09-04 14:29:05 +0000 | |
---|---|---|
committer | 2017-09-04 14:29:05 +0000 | |
commit | ac2de4356604f81cff9c303f0af36601e8a330ea (patch) | |
tree | fee6958bae0aad369f837b12206b0cfddd2882b6 /functest/opnfv_tests/vnf/ims/orchestra_openims.py | |
parent | 506ef8bdcb772637be4dc01c5afc0e583f7ae3d3 (diff) | |
parent | 578f831fe90f08028c6e88e103175b9bb698b6c5 (diff) |
Merge "More support of snaps for VNF"
Diffstat (limited to 'functest/opnfv_tests/vnf/ims/orchestra_openims.py')
-rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_openims.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py index 6c9628f7..aae35146 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -32,7 +32,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) from functest.opnfv_tests.openstack.snaps import snaps_utils @@ -198,22 +197,18 @@ class OpenImsVnf(vnf.VnfOnBoarding): self.images = get_config("tenant_images.orchestrator", config_file) self.images.update(get_config("tenant_images.%s" % self.case_name, config_file)) - self.snaps_creds = None def prepare(self): """Prepare testscase (Additional pre-configuration steps).""" super(OpenImsVnf, 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() |