Merge "Fix source_credentials in openstack_utils"

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

diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py
index 9952049..4d01985 100644 (file)
--- a/functest/core/vnf_base.py
+++ b/functest/core/vnf_base.py
@@ -35,6 +35,7 @@ class VnfOnBoardingBase(base.TestcaseBase):
         self.details['orchestrator'] = {}
         self.details['vnf'] = {}
         self.details['test_vnf'] = {}
+        self.images = {}
         try:
             self.tenant_name = CONST.__getattribute__(
                 'vnf_{}_tenant_name'.format(self.case_name))
@@ -44,7 +45,7 @@ class VnfOnBoardingBase(base.TestcaseBase):
             raise Exception("Unknown VNF case=" + self.case_name)
 
         try:
-            self.tenant_images = CONST.__getattribute__(
+            self.images = CONST.__getattribute__(
                 'vnf_{}_tenant_images'.format(self.case_name))
         except:
             self.logger.warn("No tenant image defined for this VNF")
@@ -152,14 +153,15 @@ class VnfOnBoardingBase(base.TestcaseBase):
 
         self.logger.info("Update OpenStack creds informations")
         self.creds.update({
-            "username": self.tenant_name,
-            "password": self.tenant_name,
             "tenant": self.tenant_name,
         })
-        self.glance_client = os_utils.get_glance_client(self.creds)
         self.neutron_client = os_utils.get_neutron_client(self.creds)
         self.nova_client = os_utils.get_nova_client(self.creds)
-
+        self.creds.update({
+            "username": self.tenant_name,
+            "password": self.tenant_name,
+        })
+        self.glance_client = os_utils.get_glance_client(self.creds)
         self.logger.info("Upload some OS images if it doesn't exist")
 
         temp_dir = os.path.join(self.data_dir, "tmp/")