X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Ftests%2Ftest_vnf_package.py;h=b2675a855e72f57e690554977ca6f6846a5176e8;hb=46bd3041d522ddce28ae3450e98c9c49b44b02cc;hp=289b600d42783c5bc49f96390a9c90a346810bf5;hpb=824413f6f354330f868b38a2ec8cb93b3c8d2808;p=modeling%2Fetsicatalog.git diff --git a/catalog/packages/tests/test_vnf_package.py b/catalog/packages/tests/test_vnf_package.py index 289b600..b2675a8 100644 --- a/catalog/packages/tests/test_vnf_package.py +++ b/catalog/packages/tests/test_vnf_package.py @@ -26,7 +26,6 @@ from rest_framework.test import APIClient 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 import config from catalog.pub.config.config import CATALOG_ROOT_PATH from catalog.pub.database.models import VnfPackageModel from catalog.pub.utils import toscaparser @@ -151,11 +150,11 @@ class TestVnfPackage(TestCase): "operationalState": "DISABLED", "usageState": "NOT_IN_USE", "userDefinedData": {"a": "A"}, - "_links": {'self': {'href': config.MSB_BASE_URL + '/api/vnfpkgm/v1/vnf_packages/222'}, + "_links": {'self': {'href': '/api/vnfpkgm/v1/vnf_packages/222'}, 'vnfd': { - 'href': config.MSB_BASE_URL + '/api/vnfpkgm/v1/vnf_packages/222/vnfd'}, + 'href': '/api/vnfpkgm/v1/vnf_packages/222/vnfd'}, 'packageContent': { - 'href': config.MSB_BASE_URL + '/api/vnfpkgm/v1/vnf_packages/222/package_content'} + 'href': '/api/vnfpkgm/v1/vnf_packages/222/package_content'} } } self.assertEqual(response.data, expect_data) @@ -209,13 +208,13 @@ class TestVnfPackage(TestCase): "userDefinedData": {"a": "A"}, "_links": { "self": { - "href": config.MSB_BASE_URL + "/api/vnfpkgm/v1/vnf_packages/111" + "href": "/api/vnfpkgm/v1/vnf_packages/111" }, "vnfd": { - "href": config.MSB_BASE_URL + "/api/vnfpkgm/v1/vnf_packages/111/vnfd" + "href": "/api/vnfpkgm/v1/vnf_packages/111/vnfd" }, "packageContent": { - "href": config.MSB_BASE_URL + "/api/vnfpkgm/v1/vnf_packages/111/package_content" + "href": "/api/vnfpkgm/v1/vnf_packages/111/package_content" } } }, @@ -232,10 +231,10 @@ class TestVnfPackage(TestCase): "operationalState": "DISABLED", "usageState": "NOT_IN_USE", "userDefinedData": {"a": "A"}, - "_links": {'self': {'href': config.MSB_BASE_URL + '/api/vnfpkgm/v1/vnf_packages/222'}, - 'vnfd': {'href': config.MSB_BASE_URL + '/api/vnfpkgm/v1/vnf_packages/222/vnfd'}, + "_links": {'self': {'href': '/api/vnfpkgm/v1/vnf_packages/222'}, + 'vnfd': {'href': '/api/vnfpkgm/v1/vnf_packages/222/vnfd'}, 'packageContent': { - 'href': config.MSB_BASE_URL + '/api/vnfpkgm/v1/vnf_packages/222/package_content'}} + 'href': '/api/vnfpkgm/v1/vnf_packages/222/package_content'}} } ] self.assertEqual(response.data, expect_data) @@ -477,13 +476,13 @@ class TestVnfPackage(TestCase): "usageState": "NOT_IN_USE", "_links": { "self": { - "href": config.MSB_BASE_URL + "/api/vnfpkgm/v1/vnf_packages/222" + "href": "/api/vnfpkgm/v1/vnf_packages/222" }, "vnfd": { - "href": config.MSB_BASE_URL + "/api/vnfpkgm/v1/vnf_packages/222/vnfd" + "href": "/api/vnfpkgm/v1/vnf_packages/222/vnfd" }, "packageContent": { - "href": config.MSB_BASE_URL + "/api/vnfpkgm/v1/vnf_packages/222/package_content" + "href": "/api/vnfpkgm/v1/vnf_packages/222/package_content" } } }