update for change to etsicatalog

[modeling/etsicatalog.git] / catalog / packages / tests / test_nspackage.py

diff --git a/genericparser/packages/tests/test_nspackage.py b/catalog/packages/tests/test_nspackage.py
similarity index 86%
rename from genericparser/packages/tests/test_nspackage.py
rename to catalog/packages/tests/test_nspackage.py
index 393e0f7..91f3503 100644 (file)
--- a/genericparser/packages/tests/test_nspackage.py
+++ b/catalog/packages/tests/test_nspackage.py
@@ -18,9 +18,9 @@ from rest_framework import status
 from django.test import TestCase
 from django.test import Client
 
-from genericparser.pub.utils import restcall, toscaparsers
-from genericparser.pub.database.models import NSPackageModel, VnfPackageModel, PnfPackageModel
-from genericparser.pub.msapi import sdc
+from catalog.pub.utils import restcall, toscaparser
+from catalog.pub.database.models import NSPackageModel, VnfPackageModel, PnfPackageModel
+from catalog.pub.msapi import sdc
 from .const import nsd_data
 
 
@@ -37,7 +37,7 @@ class TestNsPackage(TestCase):
     def test_ns_pkg_distribute_when_ns_exists(self):
         NSPackageModel(nsPackageId="1", nsdId="2").save()
         resp = self.client.post(
-            "/api/parser/v1/nspackages", {"csarId": "1"}, format='json')
+            "/api/catalog/v1/nspackages", {"csarId": "1"}, format='json')
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertEqual("failed", resp.data["status"])
         self.assertEqual(
@@ -48,7 +48,7 @@ class TestNsPackage(TestCase):
     def test_ns_pkg_distribute_when_csar_not_exist(self, mock_call_req):
         mock_call_req.return_value = [0, "[]", '200']
         resp = self.client.post(
-            "/api/parser/v1/nspackages", {"csarId": "1"}, format='json')
+            "/api/catalog/v1/nspackages", {"csarId": "1"}, format='json')
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertEqual("failed", resp.data["status"])
         self.assertEqual(
@@ -57,7 +57,7 @@ class TestNsPackage(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(sdc, 'download_artifacts')
-    @mock.patch.object(toscaparsers, 'parse_nsd')
+    @mock.patch.object(toscaparser, 'parse_nsd')
     def test_ns_pkg_distribute_when_nsd_already_exists(
             self, mock_parse_nsd, mock_download_artifacts, mock_call_req):
         mock_parse_nsd.return_value = json.JSONEncoder().encode(self.nsd_data)
@@ -69,7 +69,7 @@ class TestNsPackage(TestCase):
         }]), '200']
         NSPackageModel(nsPackageId="2", nsdId="VCPE_NS").save()
         resp = self.client.post(
-            "/api/parser/v1/nspackages", {"csarId": "1"}, format='json')
+            "/api/catalog/v1/nspackages", {"csarId": "1"}, format='json')
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertEqual("failed", resp.data["status"])
         self.assertEqual(
@@ -78,7 +78,7 @@ class TestNsPackage(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(sdc, 'download_artifacts')
-    @mock.patch.object(toscaparsers, 'parse_nsd')
+    @mock.patch.object(toscaparser, 'parse_nsd')
     def test_ns_pkg_distribute_when_nf_not_distributed(
             self, mock_parse_nsd, mock_download_artifacts, mock_call_req):
         mock_parse_nsd.return_value = json.JSONEncoder().encode(self.nsd_data)
@@ -89,7 +89,7 @@ class TestNsPackage(TestCase):
             "distributionStatus": "DISTRIBUTED",
         }]), '200']
         resp = self.client.post(
-            "/api/parser/v1/nspackages", {"csarId": "1"}, format='json')
+            "/api/catalog/v1/nspackages", {"csarId": "1"}, format='json')
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertEqual("failed", resp.data["status"])
         self.assertEqual(
@@ -98,7 +98,7 @@ class TestNsPackage(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(sdc, 'download_artifacts')
-    @mock.patch.object(toscaparsers, 'parse_nsd')
+    @mock.patch.object(toscaparser, 'parse_nsd')
     def test_ns_pkg_distribute_when_successfully(
             self, mock_parse_nsd, mock_download_artifacts, mock_call_req):
         mock_parse_nsd.return_value = json.JSONEncoder().encode(self.nsd_data)
@@ -111,7 +111,7 @@ class TestNsPackage(TestCase):
         VnfPackageModel(vnfPackageId="1", vnfdId="vcpe_vfw_zte_1_0").save()
         PnfPackageModel(pnfPackageId="1", pnfdId="m6000_s").save()
         resp = self.client.post(
-            "/api/parser/v1/nspackages", {"csarId": "1"}, format='json')
+            "/api/catalog/v1/nspackages", {"csarId": "1"}, format='json')
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertEqual("success", resp.data["status"])
         self.assertEqual(
@@ -125,7 +125,7 @@ class TestNsPackage(TestCase):
             "invariantUUID": "63eaec39-ffbe-411c-a838-448f2c73f7eb",
             "name": "underlayvpn",
             "version": "2.0",
-            "toscaModelURL": "/sdc/v1/genericparser/resources/c94490a0-f7ef-48be-b3f8-8d8662a37236/toscaModel",
+            "toscaModelURL": "/sdc/v1/catalog/resources/c94490a0-f7ef-48be-b3f8-8d8662a37236/toscaModel",
             "category": "Volte",
             "subCategory": "VolteVNF",
             "resourceType": "VF",
@@ -134,7 +134,7 @@ class TestNsPackage(TestCase):
             "lastUpdaterUserId": "jh0003"
         }]
         resp = self.client.post(
-            "/api/parser/v1/nspackages", {"csarId": "1"}, format='json')
+            "/api/catalog/v1/nspackages", {"csarId": "1"}, format='json')
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertEqual("failed", resp.data["status"])
         self.assertEqual(
@@ -145,7 +145,7 @@ class TestNsPackage(TestCase):
 
     def test_ns_pkg_normal_delete(self):
         NSPackageModel(nsPackageId="8", nsdId="2").save()
-        resp = self.client.delete("/api/parser/v1/nspackages/8")
+        resp = self.client.delete("/api/catalog/v1/nspackages/8")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         self.assertEqual("success", resp.data["status"])
         self.assertEqual(
@@ -167,14 +167,14 @@ class TestNsPackage(TestCase):
             nsdVersion="3",
             nsPackageUri="14.csar",
             nsdModel="").save()
-        resp = self.client.get("/api/parser/v1/nspackages")
+        resp = self.client.get("/api/catalog/v1/nspackages")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         expect_data = [{"csarId": "13",
                         "packageInfo": {"csarName": "13.csar",
                                         "nsdProvider": "2",
                                         "nsdId": "2",
                                         "nsPackageId": "13",
-                                        "downloadUrl": "http://127.0.0.1:8806/static/genericparser/13/13.csar",
+                                        "downloadUrl": "http://127.0.0.1:8806/static/catalog/13/13.csar",
                                         "nsdModel": "",
                                         "nsdVersion": "2",
                                         "nsdInvariantId": None
@@ -184,7 +184,7 @@ class TestNsPackage(TestCase):
                                         "nsdProvider": "3",
                                         "nsdId": "3",
                                         "nsPackageId": "14",
-                                        "downloadUrl": "http://127.0.0.1:8806/static/genericparser/14/14.csar",
+                                        "downloadUrl": "http://127.0.0.1:8806/static/catalog/14/14.csar",
                                         "nsdModel": "",
                                         "nsdVersion": "3",
                                         "nsdInvariantId": None}}]
@@ -198,7 +198,7 @@ class TestNsPackage(TestCase):
             nsdVersion="4",
             nsPackageUri="14.csar",
             nsdModel="").save()
-        resp = self.client.get("/api/parser/v1/nspackages/14")
+        resp = self.client.get("/api/catalog/v1/nspackages/14")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         expect_data = {
             "csarId": "14",
@@ -209,12 +209,12 @@ class TestNsPackage(TestCase):
                 "nsdVersion": "4",
                 "csarName": "14.csar",
                 "nsdModel": "",
-                "downloadUrl": "http://127.0.0.1:8806/static/genericparser/14/14.csar",
+                "downloadUrl": "http://127.0.0.1:8806/static/catalog/14/14.csar",
                 "nsdInvariantId": None}}
         self.assertEqual(expect_data, resp.data)
 
     def test_ns_pkg_get_one_not_found(self):
-        resp = self.client.get("/api/parser/v1/nspackages/22")
+        resp = self.client.get("/api/catalog/v1/nspackages/22")
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertEqual(
             {"error": "Ns package[22] not Found."},
@@ -222,13 +222,13 @@ class TestNsPackage(TestCase):
 
     ##########################################################################
 
-    @mock.patch.object(toscaparsers, 'parse_nsd')
+    @mock.patch.object(toscaparser, 'parse_nsd')
     def test_nsd_parse_normal(self, mock_parse_nsd):
         NSPackageModel(nsPackageId="18", nsdId="12").save()
         mock_parse_nsd.return_value = json.JSONEncoder().encode({"a": "b"})
         req_data = {"csarId": "18", "inputs": []}
         resp = self.client.post(
-            "/api/parser/v1/parsernsd",
+            "/api/catalog/v1/parsernsd",
             req_data,
             format='json')
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
@@ -237,7 +237,7 @@ class TestNsPackage(TestCase):
     def test_nsd_parse_when_csar_not_exist(self):
         req_data = {"csarId": "1", "inputs": []}
         resp = self.client.post(
-            "/api/parser/v1/parsernsd",
+            "/api/catalog/v1/parsernsd",
             req_data,
             format='json')
         self.assertEqual(