X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpub%2Futils%2Ftoscaparser%2Ftests.py;fp=catalog%2Fpub%2Futils%2Ftoscaparser%2Ftests.py;h=9da72f05e6a046f3bbb7aa200148d6461d8d562c;hb=5d5d8f38910c9e776a3d38bbeea26e85a08ed177;hp=285d9706c216193061982d7da86d593008c1af00;hpb=5fd2ae6a4517980ce0f89247bb354220748ae67b;p=modeling%2Fetsicatalog.git

diff --git a/catalog/pub/utils/toscaparser/tests.py b/catalog/pub/utils/toscaparser/tests.py
index 285d970..9da72f0 100644
--- a/catalog/pub/utils/toscaparser/tests.py
+++ b/catalog/pub/utils/toscaparser/tests.py
@@ -35,30 +35,32 @@ class TestToscaparser(TestCase):
     def test_vnfd_parse(self):
         self.remove_temp_dir()
         input_parameters = [{"value": "222222", "key": "sdncontroller"}]
-        # vcpe = ["vgw", "infra", "vbng", "vbrgemu", "vgmux"]
-        vcpe_part = 'vgw'
-        sriov_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/vnf/vcpesriov"
-        csar_file = ("%s/%s.csar" % (sriov_path, vcpe_part))
-        logger.debug("csar_file:%s", csar_file)
-        vnfd_json = parse_vnfd(csar_file, input_parameters)
-        metadata = json.loads(vnfd_json).get("metadata")
-        logger.debug("sriov metadata:%s", metadata)
-        self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))
-        if vcpe_part == "infra":
-            self.assertEqual("b1bb0ce7-1111-4fa7-95ed-4840d70a1177", json.loads(vnfd_json)["vnf"]["properties"]["descriptor_id"])
+        vcpe = ["vgw", "infra", "vbng", "vbrgemu", "vgmux"]
+        main_template = 'Definitions/MainServiceTemplate.yaml'
+        for vcpe_part in vcpe:
+            sriov_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/vnf/vcpesriov"
+            main_template_path = ("%s/%s/%s" % (sriov_path, vcpe_part, main_template))
+            logger.debug("main_template:%s", main_template_path)
+            vnfd_json = parse_vnfd(main_template_path, input_parameters)
+            metadata = json.loads(vnfd_json).get("metadata")
+            logger.debug("sriov metadata:%s", metadata)
+            self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))
+            if vcpe_part == "infra":
+                self.assertEqual("b1bb0ce7-1111-4fa7-95ed-4840d70a1177", json.loads(vnfd_json)["vnf"]["properties"]["descriptor_id"])
 
         dpdk_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/vnf/vcpedpdk"
-        csar_file = ("%s/%s.csar" % (dpdk_path, vcpe_part))
-        logger.debug("csar_file:%s", csar_file)
-        vnfd_json = parse_vnfd(csar_file, input_parameters)
-        metadata = json.loads(vnfd_json).get("metadata")
-        logger.debug("dpdk metadata:%s", metadata)
-        self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))
+        for vcpe_part in vcpe:
+            main_template_path = ("%s/%s/%s" % (dpdk_path, vcpe_part, main_template))
+            logger.debug("main_template_path:%s", main_template_path)
+            vnfd_json = parse_vnfd(main_template_path, input_parameters)
+            metadata = json.loads(vnfd_json).get("metadata")
+            logger.debug("dpdk metadata:%s", metadata)
+            self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))
 
     def test_pnfd_parse(self):
         self.remove_temp_dir()
-        csar_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/pnf/ran-du.csar"
-        pnfd_json = parse_pnfd(csar_path)
+        main_template_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/pnf/ran-du/ran-du.yaml"
+        pnfd_json = parse_pnfd(main_template_path)
         pnfd_dict = json.loads(pnfd_json)
         metadata = pnfd_dict.get("metadata")
         self.assertEqual("RAN_DU", metadata.get("template_name", ""))
@@ -67,15 +69,15 @@ class TestToscaparser(TestCase):
 
     def test_nsd_parse(self):
         self.remove_temp_dir()
-        # ran_csar = os.path.dirname(os.path.abspath(__file__)) + "/testdata/ns/ran.csar"
-        # nsd_json = parse_nsd(ran_csar, [])
-        # logger.debug("NS ran json: %s" % nsd_json)
-        # metadata = json.loads(nsd_json).get("metadata")
-        # self.assertEqual("RAN-NS", metadata.get("nsd_name", ""))
+        ran_csar = os.path.dirname(os.path.abspath(__file__)) + "/testdata/ns/ran/ran-ns.yaml"
+        nsd_json = parse_nsd(ran_csar, [])
+        logger.debug("NS ran json: %s" % nsd_json)
+        metadata = json.loads(nsd_json).get("metadata")
+        self.assertEqual("RAN-NS", metadata.get("nsd_name", ""))
 
     def test_service_descriptor_parse(self):
         self.remove_temp_dir()
-        service_test_csar = os.path.dirname(os.path.abspath(__file__)) + "/testdata/ns/service-vIMS.csar"
+        service_test_csar = os.path.dirname(os.path.abspath(__file__)) + "/testdata/ns/service-vims/Definitions/service-VimsV2-template.yml"
         test_json = parse_nsd(service_test_csar, [])
         logger.debug("service-vIMS json: %s" % test_json)
         metadata = json.loads(test_json).get("metadata")