X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fcore%2Fvnf_base.py;h=4d019858a3bc160d3cba93f2958a9e722606ad7b;hb=61322cab353e2553e0af2bdb35b482c33683312f;hp=995204940e50564bb1c349ec70ebb95a490a60b9;hpb=3e921f50fb71ef93b441054c0444da5a4fa64b44;p=functest.git

diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py
index 995204940..4d019858a 100644
--- 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/")