from rest_framework import status
from rest_framework.test import APIClient
-from genericparser.packages.biz.vnf_package import VnfPackage, VnfPkgUploadThread
-from genericparser.packages.const import PKG_STATUS
-from genericparser.packages.tests.const import vnfd_data
-from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH
-from genericparser.pub.database.models import VnfPackageModel
-from genericparser.pub.utils import toscaparsers
+from catalog.packages.biz.vnf_package import VnfPackage, VnfPkgUploadThread
+from catalog.packages.const import PKG_STATUS
+from catalog.packages.tests.const import vnfd_data
+from catalog.pub.config.config import CATALOG_ROOT_PATH
+from catalog.pub.database.models import VnfPackageModel
+from catalog.pub.utils import toscaparser
class MockReq():
self.client = APIClient()
def tearDown(self):
- file_path = os.path.join(GENERICPARSER_ROOT_PATH, "222")
+ file_path = os.path.join(CATALOG_ROOT_PATH, "222")
if os.path.exists(file_path):
shutil.rmtree(file_path)
- @mock.patch.object(toscaparsers, 'parse_vnfd')
+ @mock.patch.object(toscaparser, 'parse_vnfd')
def test_upload_vnf_pkg(self, mock_parse_vnfd):
- data = {'file': open(os.path.join(GENERICPARSER_ROOT_PATH, "empty.txt"), "rt")}
+ data = {'file': open(os.path.join(CATALOG_ROOT_PATH, "empty.txt"), "rt")}
VnfPackageModel.objects.create(
vnfPackageId="222",
onboardingState="CREATED"
self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED)
def test_upload_vnf_pkg_failed(self):
- data = {'file': open(os.path.join(GENERICPARSER_ROOT_PATH, "empty.txt"), "rb")}
+ data = {'file': open(os.path.join(CATALOG_ROOT_PATH, "empty.txt"), "rb")}
VnfPackageModel.objects.create(
vnfPackageId="222",
)
response = self.client.put("/api/vnfpkgm/v1/vnf_packages/222/package_content", data=data)
self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
- @mock.patch.object(toscaparsers, 'parse_vnfd')
+ @mock.patch.object(toscaparser, 'parse_vnfd')
@mock.patch.object(urllib.request, 'urlopen')
def test_upload_nf_pkg_from_uri(self, mock_urlopen, mock_parse_vnfd):
vnf_pkg = VnfPackageModel.objects.create(
"userDefinedData": {"a": "A"},
"_links": None # TODO
}
- # self.assertEqual(expect_resp_data, resp_data)
- for key, value in expect_resp_data.items():
- self.assertEqual(resp_data[key], value)
+ self.assertEqual(expect_resp_data, resp_data)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
def test_query_single_vnf(self):
"userDefinedData": {"a": "A"},
"_links": None
}
- for key, value in expect_data.items():
- self.assertEqual(response.data[key], value)
- # self.assertEqual(response.data, expect_data)
+ self.assertEqual(response.data, expect_data)
self.assertEqual(response.status_code, status.HTTP_200_OK)
def test_query_single_vnf_failed(self):
"_links": None
}
]
- # self.assertEqual(response.data, expect_data)
- self.assertEqual(len(response.data), len(expect_data))
- for i in range(0, len(expect_data)):
- for key, value in expect_data[i].items():
- self.assertEqual(response.data[i][key], value)
-
+ self.assertEqual(response.data, expect_data)
self.assertEqual(response.status_code, status.HTTP_200_OK)
def test_delete_single_vnf_pkg(self):
response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/package_content", HTTP_RANGE="4-7")
partial_file_content = ''
for data in response.streaming_content:
- partial_file_content = partial_file_content.encode() + data
+ partial_file_content = partial_file_content + data.decode()
self.assertEqual(response.status_code, status.HTTP_200_OK)
- self.assertEqual(b'BBB', partial_file_content)
+ self.assertEqual('BBB', partial_file_content)
os.remove("vnfPackage.csar")
def test_fetch_last_partical_vnf_pkg(self):
response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/package_content", HTTP_RANGE=" 4-")
partial_file_content = ''
for data in response.streaming_content:
- partial_file_content = partial_file_content.encode() + data
+ partial_file_content = partial_file_content + data.decode()
self.assertEqual(response.status_code, status.HTTP_200_OK)
- self.assertEqual(b'BBBBCCCCDDDD', partial_file_content)
+ self.assertEqual('BBBBCCCCDDDD', partial_file_content)
os.remove("vnfPackage.csar")
def test_fetch_vnf_pkg_when_pkg_not_exist(self):
response = self.client.get("/api/vnfpkgm/v1/vnf_packages")
self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
- @mock.patch.object(toscaparsers, 'parse_vnfd')
+ @mock.patch.object(toscaparser, 'parse_vnfd')
def test_upload_when_catch_exception(self, mock_parse_vnfd):
- data = {'file': open(os.path.join(GENERICPARSER_ROOT_PATH, "empty.txt"), "rb")}
+ data = {'file': open(os.path.join(CATALOG_ROOT_PATH, "empty.txt"), "rb")}
VnfPackageModel.objects.create(
vnfPackageId="222",
onboardingState="CREATED"
response = self.client.get("/api/vnfpkgm/v1/vnf_packages/222/package_content")
self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
- @mock.patch.object(toscaparsers, 'parse_vnfd')
+ @mock.patch.object(toscaparser, 'parse_vnfd')
def test_fetch_vnf_artifact(self, mock_parse_vnfd):
- data = {'file': open(os.path.join(GENERICPARSER_ROOT_PATH, "resource_test.csar"), "rb")}
+ data = {'file': open(os.path.join(CATALOG_ROOT_PATH, "resource_test.csar"), "rb")}
VnfPackageModel.objects.create(
vnfPackageId="222",
onboardingState="CREATED"
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.getvalue(), b"ubuntu_16.04\n")
- @mock.patch.object(toscaparsers, 'parse_vnfd')
+ @mock.patch.object(toscaparser, 'parse_vnfd')
def test_fetch_vnf_artifact_not_exists(self, mock_parse_vnfd):
- data = {'file': open(os.path.join(GENERICPARSER_ROOT_PATH, "resource_test.csar"), "rb")}
+ data = {'file': open(os.path.join(CATALOG_ROOT_PATH, "resource_test.csar"), "rb")}
VnfPackageModel.objects.create(
vnfPackageId="222",
onboardingState="CREATED"
response = self.client.get("/api/vnfpkgm/v1/vnf_packages/1451/artifacts/image")
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
- @mock.patch.object(toscaparsers, 'parse_vnfd')
+ @mock.patch.object(toscaparser, 'parse_vnfd')
def test_fetch_vnf_artifact_vnf_not_exists(self, mock_parse_vnfd):
- data = {'file': open(os.path.join(GENERICPARSER_ROOT_PATH, "resource_test.csar"), "rb")}
+ data = {'file': open(os.path.join(CATALOG_ROOT_PATH, "resource_test.csar"), "rb")}
VnfPackageModel.objects.create(
vnfPackageId="222",
onboardingState="CREATED"