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/biz/notificationsutil.py | |
| parent | d4f87a40133722da489e4ae03825be544a7baca7 (diff) | |
| parent | 246df561b466d1202a40ece1c133a4bf70ab958f (diff) | |
Merge "Unity MSB address"
Diffstat (limited to 'catalog/packages/biz/notificationsutil.py')
| -rw-r--r-- | catalog/packages/biz/notificationsutil.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/catalog/packages/biz/notificationsutil.py b/catalog/packages/biz/notificationsutil.py index 4b8f736..31760cc 100644 --- a/catalog/packages/biz/notificationsutil.py +++ b/catalog/packages/biz/notificationsutil.py @@ -61,10 +61,7 @@ class NotificationsUtil(object): # set subscription id notification["subscriptionId"] = sub.get_subscription_id() notification['_links']['subscription'] = { - 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - self.subscription_root_uri, - notification["subscriptionId"]) + 'href': '%s/%s%s' % (pub_config.MSB_BASE_URL, self.subscription_root_uri, notification["subscriptionId"]) } callbackuri = sub.callback_uri """ @@ -152,10 +149,7 @@ class PkgNotifications(NotificationsUtil): 'vnfdId': vnfd_id, '_links': { 'vnfPackage': { - 'href': 'http://%s:%s/%s/vnf_packages/%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.PKG_URL_PREFIX, - self.vnf_pkg_id) + 'href': '%s/%s/vnf_packages/%s' % (pub_config.MSB_BASE_URL, const.PKG_URL_PREFIX, self.vnf_pkg_id) } } } @@ -198,10 +192,7 @@ class NsdNotifications(NotificationsUtil): 'nsdId': self.nsd_id, '_links': { 'nsdInfo': { - 'href': 'http://%s:%s/%s/ns_descriptors/%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.NSD_URL_PREFIX, - self.nsd_info_id) + 'href': '%s/%s/ns_descriptors/%s' % (pub_config.MSB_BASE_URL, const.NSD_URL_PREFIX, self.nsd_info_id) } } } @@ -241,10 +232,9 @@ class PnfNotifications(NotificationsUtil): 'pnfdId': self.pnfd_id, '_links': { 'pnfdInfo': { - 'href': 'http://%s:%s/%s/pnf_descriptors/%s' % (pub_config.MSB_SERVICE_IP, - pub_config.MSB_SERVICE_PORT, - const.NSD_URL_PREFIX, - self.pnfd_info_id) + 'href': '%s/%s/pnf_descriptors/%s' % (pub_config.MSB_BASE_URL, + const.NSD_URL_PREFIX, + self.pnfd_info_id) } } } |