bug fix case name for VNFonboarding

the case paramter was not provided to the anstraction class

Change-Id: I42ba63a3b4fd20f6d076f20369fed56715237640
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py
index 9d8b6dc..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")

diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index 8898b9f..f1c265f 100644 (file)
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
@@ -21,8 +21,7 @@ class AaaVnf(vnf_base.VnfOnBoardingBase):
     logger = ft_logger.Logger("VNF AAA").getLogger()
 
     def __init__(self):
-        super(AaaVnf, self).__init__()
-        self.case_name = "aaa"
+        super(AaaVnf, self).__init__(case="aaa")
 
     def deploy_orchestrator(self):
         self.logger.info("No VNFM needed to deploy a free radius here")

diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index e584519..13a5af4 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -25,7 +25,8 @@ from orchestrator_cloudify import Orchestrator
 
 class ImsVnf(vnf_base.VnfOnBoardingBase):
 
-    def __init__(self, project='functest', case='', repo='', cmd=''):
+    def __init__(self, project='functest', case='cloudify_ims',
+                 repo='', cmd=''):
         super(ImsVnf, self).__init__(project, case, repo, cmd)
         self.logger = ft_logger.Logger("vIMS").getLogger()
         self.case_dir = os.path.join(CONST.functest_test, 'vnf/ims/')

diff --git a/functest/opnfv_tests/vnf/ims/opera_ims.py b/functest/opnfv_tests/vnf/ims/opera_ims.py
index fa8f9ec..073a56c 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/opera_ims.py
+++ b/functest/opnfv_tests/vnf/ims/opera_ims.py
@@ -21,7 +21,8 @@ from functest.utils.constants import CONST
 
 class ImsVnf(vnf_base.VnfOnBoardingBase):
 
-    def __init__(self, project='functest', case='', repo='', cmd=''):
+    def __init__(self, project='functest', case='opera_ims',
+                 repo='', cmd=''):
         super(ImsVnf, self).__init__(project, case, repo, cmd)
         self.logger = ft_logger.Logger("vIMS").getLogger()
         self.case_dir = os.path.join(CONST.functest_test, 'vnf/ims/')

diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
index ebd6c9b..28f37f0 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -21,7 +21,8 @@ from functest.utils.constants import CONST
 
 class ImsVnf(vnf_base.VnfOnBoardingBase):
 
-    def __init__(self, project='functest', case='', repo='', cmd=''):
+    def __init__(self, project='functest', case='orchestra_ims',
+                 repo='', cmd=''):
         super(ImsVnf, self).__init__(project, case, repo, cmd)
         self.logger = ft_logger.Logger("vIMS").getLogger()
         self.case_dir = os.path.join(CONST.functest_test, 'vnf/ims/')