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
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(
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(
@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)
}]), '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(
@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)
"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(
@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)
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(
"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",
"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(
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(
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
"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}}]
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",
"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."},
##########################################################################
- @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)
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(