update for change to etsicatalog

[modeling/etsicatalog.git] / catalog / pub / utils / toscaparser / tests.py

diff --git a/genericparser/pub/utils/toscaparsers/tests.py b/catalog/pub/utils/toscaparser/tests.py
similarity index 94%
rename from genericparser/pub/utils/toscaparsers/tests.py
rename to catalog/pub/utils/toscaparser/tests.py
index e28f712..285d970 100644 (file)
--- a/genericparser/pub/utils/toscaparsers/tests.py
+++ b/catalog/pub/utils/toscaparser/tests.py
@@ -19,8 +19,8 @@ import shutil
 
 from django.test import TestCase
 
-from genericparser.pub.utils.toscaparsers import parse_vnfd, parse_pnfd, parse_nsd
-from genericparser.pub.utils.toscaparsers.graph import Graph
+from catalog.pub.utils.toscaparser import parse_vnfd, parse_pnfd, parse_nsd
+from catalog.pub.utils.toscaparser.graph import Graph
 
 logger = logging.getLogger(__name__)
 
@@ -45,8 +45,7 @@ class TestToscaparser(TestCase):
         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"])
+            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))