From 246df561b466d1202a40ece1c133a4bf70ab958f Mon Sep 17 00:00:00 2001 From: dengyh Date: Wed, 29 Jul 2020 17:03:15 +0800 Subject: Unity MSB address Change-Id: Ie1ded953213ed156ff7a1f4d884851ddd93c18e5 Issue-ID: MODELING-405 Signed-off-by: dengyh --- catalog/packages/tests/test_vnfpackage.py | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'catalog/packages/tests/test_vnfpackage.py') 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, -- cgit