aboutsummaryrefslogtreecommitdiffstats
path: root/catalog/packages/tests
diff options
context:
space:
mode:
Diffstat (limited to 'catalog/packages/tests')
-rw-r--r--catalog/packages/tests/test_nspackage.py11
-rw-r--r--catalog/packages/tests/test_pnf_descriptor.py6
-rw-r--r--catalog/packages/tests/test_servicepackage.py14
-rw-r--r--catalog/packages/tests/test_vnfpackage.py8
4 files changed, 21 insertions, 18 deletions
diff --git a/catalog/packages/tests/test_nspackage.py b/catalog/packages/tests/test_nspackage.py
index 91f3503..0ca34a2 100644
--- a/catalog/packages/tests/test_nspackage.py
+++ b/catalog/packages/tests/test_nspackage.py
@@ -13,14 +13,15 @@
# limitations under the License.
import json
+
import mock
-from rest_framework import status
-from django.test import TestCase
from django.test import Client
+from django.test import TestCase
+from rest_framework import status
-from catalog.pub.utils import restcall, toscaparser
from catalog.pub.database.models import NSPackageModel, VnfPackageModel, PnfPackageModel
from catalog.pub.msapi import sdc
+from catalog.pub.utils import restcall, toscaparser
from .const import nsd_data
@@ -228,7 +229,7 @@ class TestNsPackage(TestCase):
mock_parse_nsd.return_value = json.JSONEncoder().encode({"a": "b"})
req_data = {"csarId": "18", "inputs": []}
resp = self.client.post(
- "/api/catalog/v1/parsernsd",
+ "/api/parser/v1/parsernsd",
req_data,
format='json')
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
@@ -237,7 +238,7 @@ class TestNsPackage(TestCase):
def test_nsd_parse_when_csar_not_exist(self):
req_data = {"csarId": "1", "inputs": []}
resp = self.client.post(
- "/api/catalog/v1/parsernsd",
+ "/api/parser/v1/parsernsd",
req_data,
format='json')
self.assertEqual(
diff --git a/catalog/packages/tests/test_pnf_descriptor.py b/catalog/packages/tests/test_pnf_descriptor.py
index 8af8614..7abd46c 100644
--- a/catalog/packages/tests/test_pnf_descriptor.py
+++ b/catalog/packages/tests/test_pnf_descriptor.py
@@ -15,14 +15,14 @@
import copy
import json
-import mock
import os
import shutil
-
+import mock
from django.test import TestCase
from rest_framework import status
from rest_framework.test import APIClient
+
from catalog.packages.biz.pnf_descriptor import PnfDescriptor
from catalog.packages.const import PKG_STATUS
from catalog.packages.tests.const import pnfd_data
@@ -281,6 +281,6 @@ class TestPnfDescriptor(TestCase):
PnfPackageModel(pnfPackageId="8", pnfdId="10").save()
mock_parse_pnfd.return_value = json.JSONEncoder().encode({"c": "d"})
req_data = {"csarId": "8", "inputs": []}
- resp = self.client.post("/api/catalog/v1/parserpnfd", req_data, format='json')
+ resp = self.client.post("/api/parser/v1/parserpnfd", req_data, format='json')
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual({"model": '{"c": "d"}'}, resp.data)
diff --git a/catalog/packages/tests/test_servicepackage.py b/catalog/packages/tests/test_servicepackage.py
index 241d80d..babfa4d 100644
--- a/catalog/packages/tests/test_servicepackage.py
+++ b/catalog/packages/tests/test_servicepackage.py
@@ -24,7 +24,7 @@ from catalog.pub.exceptions import PackageNotFoundException, PackageHasExistsExc
from catalog.pub.msapi import sdc
from catalog.pub.utils import toscaparser
-PARSER_BASE_URL = "/api/parser/v1"
+CATALOG_BASE_URL = "/api/catalog/v1"
class TestServicePackage(TestCase):
@@ -352,7 +352,7 @@ class TestServicePackage(TestCase):
def test_api_service_pkg_distribute_when_pkg_exists(self):
ServicePackageModel(servicePackageId="1", servicedId="2").save()
resp = self.client.post(
- PARSER_BASE_URL + "/service_packages", {"csarId": "1"}, format='json')
+ CATALOG_BASE_URL + "/service_packages", {"csarId": "1"}, format='json')
self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual("Service CSAR(1) already exists.", resp.data["errorMessage"])
@@ -391,7 +391,7 @@ class TestServicePackage(TestCase):
servicedVersion="3",
servicePackageUri="14.csar",
servicedModel="").save()
- resp = self.client.get(PARSER_BASE_URL + "/service_packages")
+ resp = self.client.get(CATALOG_BASE_URL + "/service_packages")
self.assertEqual(resp.status_code, status.HTTP_200_OK)
###############################################################
@@ -421,11 +421,11 @@ class TestServicePackage(TestCase):
servicedVersion="4",
servicePackageUri="14.csar",
servicedModel="").save()
- resp = self.client.get(PARSER_BASE_URL + "/service_packages/14")
+ resp = self.client.get(CATALOG_BASE_URL + "/service_packages/14")
self.assertEqual(resp.status_code, status.HTTP_200_OK)
def test_api_service_pkg_get_one_not_found(self):
- resp = self.client.get(PARSER_BASE_URL + "/service_packages/22")
+ resp = self.client.get(CATALOG_BASE_URL + "/service_packages/22")
self.assertEqual(resp.status_code, status.HTTP_404_NOT_FOUND)
self.assertEqual(
{"errorMessage": "Service package[22] not Found.", 'error': 404},
@@ -449,7 +449,7 @@ class TestServicePackage(TestCase):
def test_api_service_pkg_normal_delete(self):
ServicePackageModel(servicePackageId="8", servicedId="2").save()
- resp = self.client.delete(PARSER_BASE_URL + "/service_packages/8")
+ resp = self.client.delete(CATALOG_BASE_URL + "/service_packages/8")
self.assertEqual(resp.status_code, status.HTTP_204_NO_CONTENT)
###############################################################
@@ -477,5 +477,5 @@ class TestServicePackage(TestCase):
"packageType": "Service",
"inputs": "string"
}
- resp = self.client.post(PARSER_BASE_URL + "/parser", query_data, format='json')
+ resp = self.client.post(CATALOG_BASE_URL + "/parser", query_data, format='json')
self.assertEqual(resp.status_code, status.HTTP_404_NOT_FOUND)
diff --git a/catalog/packages/tests/test_vnfpackage.py b/catalog/packages/tests/test_vnfpackage.py
index 0d8cbad..f016d01 100644
--- a/catalog/packages/tests/test_vnfpackage.py
+++ b/catalog/packages/tests/test_vnfpackage.py
@@ -13,10 +13,12 @@
# limitations under the License.
import json
+
import mock
-from rest_framework.test import APIClient
from django.test import TestCase
from rest_framework import status
+from rest_framework.test import APIClient
+
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
@@ -240,7 +242,7 @@ class TestNfPackage(TestCase):
"inputs": []
}
resp = self.client.post(
- "/api/catalog/v1/parservnfd",
+ "/api/parser/v1/parservnfd",
req_data,
format='json'
)
@@ -250,7 +252,7 @@ class TestNfPackage(TestCase):
def test_vnfd_parse_when_csar_not_exist(self):
req_data = {"csarId": "1", "inputs": []}
resp = self.client.post(
- "/api/catalog/v1/parservnfd",
+ "/api/parser/v1/parservnfd",
req_data,
format='json'
)