X-Git-Url: https://gerrit.onap.org/r/gitweb?p=modeling%2Fetsicatalog.git;a=blobdiff_plain;f=genericparser%2Fpub%2Futils%2Ftoscaparsers%2Ftests.py;h=e28f712be4ff24c08bb5cfd08b9f38defdab9689;hp=c4617904e952ab4d241f4c4ffbd07952d0c410fd;hb=52a969dcc2a935930a559b1780d7c95e1cc45d73;hpb=63c392e9cca3c6654e8383f49e5136fa86d1c72a

diff --git a/genericparser/pub/utils/toscaparsers/tests.py b/genericparser/pub/utils/toscaparsers/tests.py
index c461790..e28f712 100644
--- a/genericparser/pub/utils/toscaparsers/tests.py
+++ b/genericparser/pub/utils/toscaparsers/tests.py
@@ -35,26 +35,26 @@ 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 = ["vgw", "infra", "vbng", "vbrgemu", "vgmux"]
+        vcpe_part = 'vgw'
         sriov_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/vnf/vcpesriov"
-        for vcpe_part in vcpe:
-            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"])
+        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"])
 
         dpdk_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/vnf/vcpedpdk"
-        for vcpe_part in vcpe:
-            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", ""))
+        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", ""))
 
     def test_pnfd_parse(self):
         self.remove_temp_dir()