aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalentin boucher <valentin.boucher@orange.com>2017-02-16 10:13:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-16 10:13:23 +0000
commit0a801fcb40d0be95a307a803ea1c32fcf08fa6f7 (patch)
treeaa6cc474ada547c98af5f0dadfe3f40477867fb0
parent6c8b09ca1184139a784a7d6c42e0ca09fa57dca9 (diff)
parent2dd59e860a74f7ad9f6883ba598fc2bae4e8eb79 (diff)
Merge "Fix auth error"
-rw-r--r--functest/core/vnf_base.py10
-rw-r--r--functest/opnfv_tests/vnf/ims/cloudify_ims.py8
2 files changed, 10 insertions, 8 deletions
diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py
index 8e98d8ed..07b64fd0 100644
--- a/functest/core/vnf_base.py
+++ b/functest/core/vnf_base.py
@@ -150,12 +150,14 @@ class VnfOnBoardingBase(base.TestcaseBase):
self.step_failure("Failed to create user ")
self.logger.info("Update OpenStack creds informations")
- self.creds.update({
- "tenant": self.tenant_name,
+ self.admin_creds = self.creds.copy()
+ self.admin_creds.update({
+ "tenant": self.tenant_name
})
- self.neutron_client = os_utils.get_neutron_client(self.creds)
- self.nova_client = os_utils.get_nova_client(self.creds)
+ self.neutron_client = os_utils.get_neutron_client(self.admin_creds)
+ self.nova_client = os_utils.get_nova_client(self.admin_creds)
self.creds.update({
+ "tenant": self.tenant_name,
"username": self.tenant_name,
"password": self.tenant_name,
})
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index efde44a0..e354563e 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -68,10 +68,10 @@ class ImsVnf(vnf_base.VnfOnBoardingBase):
def deploy_orchestrator(self, **kwargs):
self.logger.info("Additional pre-configuration steps")
- self.neutron_client = os_utils.get_neutron_client(self.creds)
- self.glance_client = os_utils.get_glance_client(self.creds)
- self.keystone_client = os_utils.get_keystone_client(self.creds)
- self.nova_client = os_utils.get_nova_client(self.creds)
+ self.neutron_client = os_utils.get_neutron_client(self.admin_creds)
+ self.glance_client = os_utils.get_glance_client(self.admin_creds)
+ self.keystone_client = os_utils.get_keystone_client(self.admin_creds)
+ self.nova_client = os_utils.get_nova_client(self.admin_creds)
# needs some images
self.logger.info("Upload some OS images if it doesn't exist")