[odl-sfc] Add symmetric option for sfc_create

[functest.git] / functest / core / vnf_base.py

diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py
index 44b4ae0..07b64fd 100644 (file)
--- a/functest/core/vnf_base.py
+++ b/functest/core/vnf_base.py
@@ -67,8 +67,8 @@ class VnfOnBoardingBase(base.TestcaseBase):
                     res_orchestrator['result'])
                 self.details['orchestrator']['duration'] = round(
                     orchestrator_ready_time - self.start_time, 1)
-        except:
-            self.logger.warn("Problem with the Orchestrator")
+        except Exception:
+            self.logger.warn("Problem with the Orchestrator", exc_info=True)
 
         # Deploy VNF
         try:
@@ -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,
         })