X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Ftests%2Ftest_vnfpackage.py;h=37697b05ceff06217b8d93c7ea5f04b8f318970c;hb=2ae44b787c0795e60276c35aeb13e104ca17bfa7;hp=0d8cbadb1042f5e954c9f67a404deb5dd234d805;hpb=a32c2b20207885d895bd96204cc166fca14db97b;p=modeling%2Fetsicatalog.git diff --git a/catalog/packages/tests/test_vnfpackage.py b/catalog/packages/tests/test_vnfpackage.py index 0d8cbad..37697b0 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 @@ -81,14 +83,14 @@ 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() + VnfPackageModel(vnfPackageId="2", vnfdId="00342b18-a5c7-11e8-998c-bf1755941f12").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.") + self.assert_job_result("2", 255, "VNF package(00342b18-a5c7-11e8-998c-bf1755941f12) already exists.") @mock.patch.object(restcall, 'call_req') @mock.patch.object(sdc, 'download_artifacts') @@ -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' )