import catalog.pub.utils.timeutil
from catalog.packages.tests.const import nsd_data
from catalog.pub.database.models import NSPackageModel, VnfPackageModel, PnfPackageModel
-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.utils import toscaparser
response = self.client.post("/api/nsd/v1/subscriptions",
data=self.subscription, format='json')
self.assertEqual(303, response.status_code)
- redirect_addr = "https://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT,
- os.path.join(const.NSDM_SUBSCRIPTION_ROOT_URI, subscriptionid))
+ redirect_addr = "%s/%s" % (MSB_BASE_URL, os.path.join(const.NSDM_SUBSCRIPTION_ROOT_URI, subscriptionid))
self.assertEqual(redirect_addr, response["Location"])
@mock.patch("requests.get")
'timeStamp': "nowtime()",
'nsdInfoId': "d0ea5ec3-0b98-438a-9bea-488230cff174",
'nsdId': "b632bddc-bccd-4180-bd8d-4e8a9578eff7",
- "subscriptionId": "1111",
'_links': {
- 'subscription': {
- 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
- pub_config.MSB_SERVICE_PORT,
- const.NSDM_SUBSCRIPTION_ROOT_URI,
- "1111")},
'nsdInfo': {
- 'href': 'http://%s:%s/%s/ns_descriptors/%s' % (pub_config.MSB_SERVICE_IP,
- pub_config.MSB_SERVICE_PORT,
- const.NSD_URL_PREFIX,
- "d0ea5ec3-0b98-438a-9bea-488230cff174")
- }
- }
+ 'href': '%s/%s/ns_descriptors/%s' % (pub_config.MSB_BASE_URL, const.NSD_URL_PREFIX, "d0ea5ec3-0b98-438a-9bea-488230cff174")},
+ 'subscription': {
+ 'href': '%s/%s%s' % (pub_config.MSB_BASE_URL, const.NSDM_SUBSCRIPTION_ROOT_URI, "1111")}
+
+ },
+ "subscriptionId": "1111"
}
- mock_requests_post.assert_called_with(expect_callbackuri, data=expect_notification,
+ mock_requests_post.assert_called_with(expect_callbackuri, data=json.dumps(expect_notification),
auth=HTTPBasicAuth("username", "password"),
headers={'Connection': 'close',
'content-type': 'application/json',
'timeStamp': "nowtime()",
'nsdInfoId': "nsdinfoid1",
'nsdId': "nsdid1",
- 'onboardingFailureDetails': "NSD(nsdid1) already exists.",
- "subscriptionId": "1",
'_links': {
- 'subscription': {
- 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
- pub_config.MSB_SERVICE_PORT,
- const.NSDM_SUBSCRIPTION_ROOT_URI,
- "1")},
'nsdInfo': {
- 'href': 'http://%s:%s/%s/ns_descriptors/%s' % (pub_config.MSB_SERVICE_IP,
- pub_config.MSB_SERVICE_PORT,
- const.NSD_URL_PREFIX,
- "nsdinfoid1")
- }
- }
+ 'href': '%s/%s/ns_descriptors/%s' % (pub_config.MSB_BASE_URL, const.NSD_URL_PREFIX, "nsdinfoid1")
+ },
+ 'subscription': {
+ 'href': '%s/%s%s' % (pub_config.MSB_BASE_URL, const.NSDM_SUBSCRIPTION_ROOT_URI, "1")}
+ },
+ 'onboardingFailureDetails': "NSD(nsdid1) already exists.",
+ "subscriptionId": "1"
}
mock_requests_post.assert_called_with(expect_callbackuri,
- data=expect_notification,
+ data=json.dumps(expect_notification),
headers={'Connection': 'close',
'content-type': 'application/json',
'accept': 'application/json'},
'timeStamp': "nowtime()",
'pnfdInfoIds': "pnfdInfoIds1",
'pnfdId': "pnfdId1",
- "subscriptionId": "1",
'_links': {
- 'subscription': {
- 'href': 'http://%s:%s/%s%s' % (pub_config.MSB_SERVICE_IP,
- pub_config.MSB_SERVICE_PORT,
- const.NSDM_SUBSCRIPTION_ROOT_URI,
- "1")},
'pnfdInfo': {
- 'href': 'http://%s:%s/%s/pnf_descriptors/%s' % (pub_config.MSB_SERVICE_IP,
- pub_config.MSB_SERVICE_PORT,
- const.NSD_URL_PREFIX,
- "pnfdInfoIds1")
- }
- }
+ 'href': '%s/%s/pnf_descriptors/%s' % (pub_config.MSB_BASE_URL, const.NSD_URL_PREFIX, "pnfdInfoIds1")
+ },
+ 'subscription': {
+ 'href': '%s/%s%s' % (pub_config.MSB_BASE_URL, const.NSDM_SUBSCRIPTION_ROOT_URI, "1")},
+ },
+ "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'},