From: boucherv <valentin.boucher@orange.com>
Date: Thu, 16 Feb 2017 08:59:18 +0000 (+0100)
Subject: Fix auth error
X-Git-Tag: 0.2~895^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2dd59e860a74f7ad9f6883ba598fc2bae4e8eb79;p=functest-xtesting.git

Fix auth error

JIRA: FUNCTEST-734

Change-Id: I9e13b9b9459b9051981766fbf32126583a761656
Signed-off-by: boucherv <valentin.boucher@orange.com>
---

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")