diff options
| author |   Hui Deng <denghui12@huawei.com> | 2020-07-31 01:44:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-07-31 01:44:20 +0000 |
| commit | 824413f6f354330f868b38a2ec8cb93b3c8d2808 (patch) | |
| tree | 24bcf3739c37a10284cde8aecb2060c5414cbdf1 /catalog/packages/tests/test_vnfpackage.py | |
| parent | d4f87a40133722da489e4ae03825be544a7baca7 (diff) | |
| parent | 246df561b466d1202a40ece1c133a4bf70ab958f (diff) | |
Merge "Unity MSB address"
Diffstat (limited to 'catalog/packages/tests/test_vnfpackage.py')
| -rw-r--r-- | catalog/packages/tests/test_vnfpackage.py | 22 |
1 files changed, 6 insertions, 16 deletions
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, |