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
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")
'timeStamp': "2019-02-16 14:41:16",
'vnfPkgId': uuid_vnfPackageId,
'vnfdId': uuid_vnfdid,
- "subscriptionId": uuid_subscriptid,
'_links': {
- 'subscription': {
- 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
- pub_config.MSB_SERVICE_PORT,
- const.VNFPKG_SUBSCRIPTION_ROOT_URI,
- uuid_subscriptid)},
'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': '%s/%s%s' % (pub_config.MSB_BASE_URL, const.VNFPKG_SUBSCRIPTION_ROOT_URI, uuid_subscriptid)}
+ },
+ "subscriptionId": uuid_subscriptid
}
- mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"], data=expect_notification,
+ mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"], data=json.dumps(expect_notification),
headers={'Connection': 'close',
'content-type': 'application/json',
'accept': 'application/json'},
'timeStamp': "2019-12-16 14:41:16",
'vnfPkgId': "vnfpkgid1",
'vnfdId': "vnfdid1",
- 'changeType': const.PKG_CHANGE_TYPE.OP_STATE_CHANGE,
- 'operationalState': None,
- "subscriptionId": "1",
'_links': {
- 'subscription': {
- 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
- pub_config.MSB_SERVICE_PORT,
- const.VNFPKG_SUBSCRIPTION_ROOT_URI,
- "1")},
'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': '%s/%s%s' % (pub_config.MSB_BASE_URL, const.VNFPKG_SUBSCRIPTION_ROOT_URI, "1")}
+ },
+ 'changeType': const.PKG_CHANGE_TYPE.OP_STATE_CHANGE,
+ 'operationalState': None,
+ "subscriptionId": "1"
}
- mock_requests_post.assert_called_with(expect_callbackuri, data=expect_notification,
+ mock_requests_post.assert_called_with(expect_callbackuri, data=json.dumps(expect_notification),
headers={'Connection': 'close',
'content-type': 'application/json',
'accept': 'application/json'},