X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Ftests%2Ftest_vnfpackage.py;h=e4f292c44ce0537df317eea0d33434f71da0e488;hb=246df561b466d1202a40ece1c133a4bf70ab958f;hp=df2721292a7369c3f267b88add0ef822bc506fea;hpb=7a0c2aa47bc5297a7977e7b7d1a362768efa1e17;p=modeling%2Fetsicatalog.git diff --git a/catalog/packages/tests/test_vnfpackage.py b/catalog/packages/tests/test_vnfpackage.py index df27212..e4f292c 100644 --- a/catalog/packages/tests/test_vnfpackage.py +++ b/catalog/packages/tests/test_vnfpackage.py @@ -326,15 +326,9 @@ class TestNfPackage(TestCase): 'vnfdId': "b1bb0ce7-2222-4fa7-95ed-4840d70a1177", '_links': { 'vnfPackage': { - 'href': 'http://%s:%s/%s/vnf_packages/%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.PKG_URL_PREFIX, - uuid_csarid)}, + 'href': '%s/%s/vnf_packages/%s' % (pub_config.MSB_BASE_URL, const.PKG_URL_PREFIX, uuid_csarid)}, 'subscription': { - 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.VNFPKG_SUBSCRIPTION_ROOT_URI, - uuid_subscriptid)} + 'href': '%s/%s%s' % (pub_config.MSB_BASE_URL, const.VNFPKG_SUBSCRIPTION_ROOT_URI, uuid_subscriptid)} }, "subscriptionId": uuid_subscriptid @@ -356,15 +350,11 @@ class TestNfPackage(TestCase): 'vnfdId': "b1bb0ce7-2222-4fa7-95ed-4840d70a1177", '_links': { 'vnfPackage': { - 'href': 'http://%s:%s/%s/vnf_packages/%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.PKG_URL_PREFIX, - uuid_csarid)}, + 'href': '%s/%s/vnf_packages/%s' % (pub_config.MSB_BASE_URL, const.PKG_URL_PREFIX, + uuid_csarid)}, 'subscription': { - 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.VNFPKG_SUBSCRIPTION_ROOT_URI, - uuid_subscriptid)} + 'href': '%s/%s%s' % (pub_config.MSB_BASE_URL, const.VNFPKG_SUBSCRIPTION_ROOT_URI, + uuid_subscriptid)} }, 'changeType': const.PKG_CHANGE_TYPE.PKG_DELETE,