diff options
Diffstat (limited to 'catalog/packages/tests/test_vnf_pkg_subscription.py')
| -rw-r--r-- | catalog/packages/tests/test_vnf_pkg_subscription.py | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/catalog/packages/tests/test_vnf_pkg_subscription.py b/catalog/packages/tests/test_vnf_pkg_subscription.py index 28edd64..f9f6ff2 100644 --- a/catalog/packages/tests/test_vnf_pkg_subscription.py +++ b/catalog/packages/tests/test_vnf_pkg_subscription.py @@ -27,7 +27,7 @@ from catalog.packages import const from catalog.packages.biz.notificationsutil import PkgNotifications from catalog.packages.biz.vnf_pkg_subscription import QuerySubscription, TerminateSubscription from catalog.pub.config import config as pub_config -from catalog.pub.config.config import CATALOG_ROOT_PATH, MSB_SERVICE_IP, MSB_SERVICE_PORT +from catalog.pub.config.config import CATALOG_ROOT_PATH, MSB_BASE_URL from catalog.pub.database.models import VnfPkgSubscriptionModel, VnfPackageModel from catalog.pub.exceptions import SubscriptionDoesNotExistsException from .const import vnf_subscription_data @@ -92,8 +92,7 @@ class TestNfPackageSubscription(TestCase): format='json' ) self.assertEqual(303, response.status_code) - redirect_addr = "https://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, - os.path.join(const.VNFPKG_SUBSCRIPTION_ROOT_URI, temp_uuid)) + redirect_addr = "%s/%s" % (MSB_BASE_URL, os.path.join(const.VNFPKG_SUBSCRIPTION_ROOT_URI, temp_uuid)) self.assertEqual(redirect_addr, response["Location"]) @mock.patch("requests.get") @@ -260,16 +259,10 @@ class TestNfPackageSubscription(TestCase): 'vnfdId': uuid_vnfdid, '_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_vnfPackageId) + 'href': '%s/%s/vnf_packages/%s' % (pub_config.MSB_BASE_URL, const.PKG_URL_PREFIX, uuid_vnfPackageId) }, '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 } @@ -333,16 +326,10 @@ class NotificationTest(TestCase): 'vnfdId': "vnfdid1", '_links': { 'vnfPackage': { - 'href': 'http://%s:%s/%s/vnf_packages/%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.PKG_URL_PREFIX, - "vnfpkgid1") + 'href': '%s/%s/vnf_packages/%s' % (pub_config.MSB_BASE_URL, const.PKG_URL_PREFIX, "vnfpkgid1") }, 'subscription': { - 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.VNFPKG_SUBSCRIPTION_ROOT_URI, - "1")} + 'href': '%s/%s%s' % (pub_config.MSB_BASE_URL, const.VNFPKG_SUBSCRIPTION_ROOT_URI, "1")} }, 'changeType': const.PKG_CHANGE_TYPE.OP_STATE_CHANGE, 'operationalState': None, |