aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Pauls <michael.pauls@fokus.fraunhofer.de>2017-03-20 16:08:13 +0100
committerMichael Pauls <michael.pauls@fokus.fraunhofer.de>2017-03-20 16:08:13 +0100
commit340cf9330af728dac334de7b391c3ea3971fd125 (patch)
tree0123b6e5af7918a2a4d9cd19c603dd8fdec980d9
parent3575dcb2a262c623dd4ded0823bc78adf3a1012e (diff)
Fix usage of v3 APIs of OpenStack
Using OS_PROJECT_ID instead of OS_TENANT_NAME as tenant when onboarding a new VIM/PoP with Open Baton Change-Id: I873badc73e7b33179fa487505d18ce89840d6599 Signed-off-by: Michael Pauls <michael.pauls@fokus.fraunhofer.de>
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_ims.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
index df57800af..d13fe8fe8 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -308,12 +308,15 @@ class ImsVnf(vnf_base.VnfOnBoardingBase):
if self.ob_projectid == "":
self.step_failure("Default project id was not found!")
+ creds = os_utils.get_credentials()
+ self.logger.info("PoP creds: %s" % creds)
+
vim_json = {
"name": "vim-instance",
- "authUrl": os_utils.get_credentials().get("auth_url"),
- "tenant": os_utils.get_credentials().get("tenant_name"),
- "username": os_utils.get_credentials().get("username"),
- "password": os_utils.get_credentials().get("password"),
+ "authUrl": creds.get("auth_url"),
+ "tenant": os.environ.get("OS_PROJECT_ID"),
+ "username": creds.get("username"),
+ "password": creds.get("password"),
"securityGroups": [
"default",
"orchestra-sec-group"