Code Review / modeling / etsicatalog.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
update for change to etsicatalog
[modeling/etsicatalog.git] / catalog / packages / tests / test_vnfpackage.py
diff --git a/genericparser/packages/tests/test_vnfpackage.py b/catalog/packages/tests/test_vnfpackage.py
similarity index 75%
rename from genericparser/packages/tests/test_vnfpackage.py
rename to catalog/packages/tests/test_vnfpackage.py
index 70f7021..0d8cbad 100644 (file)
--- a/genericparser/packages/tests/test_vnfpackage.py
+++ b/catalog/packages/tests/test_vnfpackage.py
@@ -17,11 +17,11 @@ import mock
 from rest_framework.test import APIClient
 from django.test import TestCase
 from rest_framework import status
-from genericparser.packages.biz.sdc_vnf_package import NfDistributeThread, NfPkgDeleteThread
-from genericparser.pub.database.models import JobStatusModel, JobModel
-from genericparser.pub.database.models import VnfPackageModel
-from genericparser.pub.msapi import sdc
-from genericparser.pub.utils import restcall, toscaparsers
+from catalog.packages.biz.sdc_vnf_package import NfDistributeThread, NfPkgDeleteThread
+from catalog.pub.database.models import JobStatusModel, JobModel
+from catalog.pub.database.models import VnfPackageModel
+from catalog.pub.msapi import sdc
+from catalog.pub.utils import restcall, toscaparser
 from .const import vnfd_data
 
 
@@ -46,7 +46,7 @@ class TestNfPackage(TestCase):
     @mock.patch.object(NfDistributeThread, 'run')
     def test_nf_pkg_distribute_normal(self, mock_run):
         resp = self.client.post(
-            "/api/parser/v1/vnfpackages",
+            "/api/catalog/v1/vnfpackages",
             {
                 "csarId": "1",
                 "vimIds": ["1"]
@@ -70,7 +70,7 @@ class TestNfPackage(TestCase):
 
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(sdc, 'download_artifacts')
-    @mock.patch.object(toscaparsers, 'parse_vnfd')
+    @mock.patch.object(toscaparser, 'parse_vnfd')
     def test_nf_pkg_distribute_when_vnfd_already_exist(self,
                                                        mock_parse_vnfd,
                                                        mock_download_artifacts,
@@ -81,41 +81,52 @@ class TestNfPackage(TestCase):
             "uuid": "1",
             "toscaModelURL": "https://127.0.0.1:1234/sdc/v1/hss.csar"
         }]), '200']
-        VnfPackageModel(vnfPackageId="2",
-                        vnfdId="zte-hss-1.0").save()
-        NfDistributeThread(csar_id="1",
-                           vim_ids=["1"],
-                           lab_vim_id="",
-                           job_id="2").run()
+        VnfPackageModel(vnfPackageId="2", vnfdId="zte-hss-1.0").save()
+        NfDistributeThread(
+            csar_id="1",
+            vim_ids=["1"],
+            lab_vim_id="",
+            job_id="2"
+        ).run()
         self.assert_job_result("2", 255, "VNF package(zte-hss-1.0) already exists.")
 
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(sdc, 'download_artifacts')
-    @mock.patch.object(toscaparsers, 'parse_vnfd')
+    @mock.patch.object(toscaparser, 'parse_vnfd')
     def test_nf_pkg_distribute_successfully(self,
-                                            mock_parse_vnfd, mock_download_artifacts, mock_call_req):
+                                            mock_parse_vnfd,
+                                            mock_download_artifacts,
+                                            mock_call_req):
         mock_parse_vnfd.return_value = json.JSONEncoder().encode(self.vnfd_data)
         mock_download_artifacts.return_value = "/home/hss.csar"
         mock_call_req.return_value = [0, json.JSONEncoder().encode([{
             "uuid": "1",
             "toscaModelURL": "https://127.0.0.1:1234/sdc/v1/hss.csar"
         }]), '200']
-        NfDistributeThread(csar_id="1",
-                           vim_ids=["1"],
-                           lab_vim_id="",
-                           job_id="4").run()
+        NfDistributeThread(
+            csar_id="1",
+            vim_ids=["1"],
+            lab_vim_id="",
+            job_id="4"
+        ).run()
         self.assert_job_result("4", 100, "CSAR(1) distribute successfully.")
 
     ###############################################################################################################
 
     @mock.patch.object(NfPkgDeleteThread, 'run')
     def test_nf_pkg_delete_normal(self, mock_run):
-        resp = self.client.delete("/api/parser/v1/vnfpackages/1")
+        resp = self.client.delete("/api/catalog/v1/vnfpackages/1")
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
 
     def test_nf_pkg_normal_delete(self):
-        VnfPackageModel(vnfPackageId="2", vnfdId="vcpe_vfw_zte_1_0").save()
-        NfPkgDeleteThread(csar_id="2", job_id="2").run()
+        VnfPackageModel(
+            vnfPackageId="2",
+            vnfdId="vcpe_vfw_zte_1_0"
+        ).save()
+        NfPkgDeleteThread(
+            csar_id="2",
+            job_id="2"
+        ).run()
         self.assert_job_result("2", 100, "Delete CSAR(2) successfully.")
 
     def test_nf_pkg_get_all(self):
@@ -137,7 +148,7 @@ class TestNfPackage(TestCase):
             vnfPackageUri='',
             vnfdModel=''
         ).save()
-        resp = self.client.get("/api/parser/v1/vnfpackages")
+        resp = self.client.get("/api/catalog/v1/vnfpackages")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         expect_data = [
             {
@@ -148,7 +159,7 @@ class TestNfPackage(TestCase):
                     "vnfdModel": "",
                     "vnfdProvider": "3",
                     "vnfdId": "3",
-                    "downloadUrl": "http://127.0.0.1:8806/static/genericparser/3/",
+                    "downloadUrl": "http://127.0.0.1:8806/static/catalog/3/",
                     "vnfVersion": "",
                     "vnfdVersion": "3",
                     "vnfPackageId": "3"
@@ -162,7 +173,7 @@ class TestNfPackage(TestCase):
                     "vnfdModel": "",
                     "vnfdProvider": "4",
                     "vnfdId": "4",
-                    "downloadUrl": "http://127.0.0.1:8806/static/genericparser/4/",
+                    "downloadUrl": "http://127.0.0.1:8806/static/catalog/4/",
                     "vnfVersion": "",
                     "vnfdVersion": "4",
                     "vnfPackageId": "4"
@@ -182,7 +193,7 @@ class TestNfPackage(TestCase):
             vnfdModel=''
         ).save()
 
-        resp = self.client.get("/api/parser/v1/vnfpackages/4")
+        resp = self.client.get("/api/catalog/v1/vnfpackages/4")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         expect_data = {
             "imageInfo": [],
@@ -192,7 +203,7 @@ class TestNfPackage(TestCase):
                 "vnfdModel": "",
                 "vnfdProvider": "4",
                 "vnfdId": "4",
-                "downloadUrl": "http://127.0.0.1:8806/static/genericparser/4/",
+                "downloadUrl": "http://127.0.0.1:8806/static/catalog/4/",
                 "vnfVersion": "",
                 "vnfdVersion": "4",
                 "vnfPackageId": "4"
@@ -201,31 +212,47 @@ class TestNfPackage(TestCase):
         self.assertEqual(expect_data, resp.data)
 
     def test_nf_pkg_get_one_failed(self):
-        VnfPackageModel(vnfPackageId="4",
-                        vnfdId="4",
-                        vnfVendor='4',
-                        vnfdVersion='4',
-                        vnfSoftwareVersion='',
-                        vnfPackageUri='',
-                        vnfdModel='').save()
-
-        resp = self.client.get("/api/parser/v1/vnfpackages/2")
+        VnfPackageModel(
+            vnfPackageId="4",
+            vnfdId="4",
+            vnfVendor='4',
+            vnfdVersion='4',
+            vnfSoftwareVersion='',
+            vnfPackageUri='',
+            vnfdModel=''
+        ).save()
+
+        resp = self.client.get("/api/catalog/v1/vnfpackages/2")
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertEqual({'error': 'Vnf package[2] not Found.'}, resp.data)
 
     ###############################################################################################################
 
-    @mock.patch.object(toscaparsers, 'parse_vnfd')
+    @mock.patch.object(toscaparser, 'parse_vnfd')
     def test_vnfd_parse_normal(self, mock_parse_vnfd):
-        VnfPackageModel(vnfPackageId="8", vnfdId="10").save()
+        VnfPackageModel(
+            vnfPackageId="8",
+            vnfdId="10"
+        ).save()
         mock_parse_vnfd.return_value = json.JSONEncoder().encode({"c": "d"})
-        req_data = {"csarId": "8", "inputs": []}
-        resp = self.client.post("/api/parser/v1/parservnfd", req_data, format='json')
+        req_data = {
+            "csarId": "8",
+            "inputs": []
+        }
+        resp = self.client.post(
+            "/api/catalog/v1/parservnfd",
+            req_data,
+            format='json'
+        )
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertEqual({"model": '{"c": "d"}'}, resp.data)
 
     def test_vnfd_parse_when_csar_not_exist(self):
         req_data = {"csarId": "1", "inputs": []}
-        resp = self.client.post("/api/parser/v1/parservnfd", req_data, format='json')
+        resp = self.client.post(
+            "/api/catalog/v1/parservnfd",
+            req_data,
+            format='json'
+        )
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertEqual(resp.data, {"error": "VNF CSAR(1) does not exist."})
Read-only as per IT-26097