# limitations under the License.
import json
-import mock
import os
-import catalog.pub.utils.timeutil
-from requests.auth import HTTPBasicAuth
+import mock
from django.test import TestCase
+from requests.auth import HTTPBasicAuth
from rest_framework import status
from rest_framework.test import APIClient
+import catalog.pub.utils.timeutil
+from catalog.packages import const
from catalog.packages.biz.sdc_vnf_package import NfDistributeThread, NfPkgDeleteThread
+from catalog.pub.config.config import CATALOG_ROOT_PATH
from catalog.pub.database.models import JobStatusModel, JobModel
from catalog.pub.database.models import VnfPackageModel
from catalog.pub.msapi import sdc
from catalog.pub.utils import restcall, toscaparser
from .const import vnfd_data
-from catalog.pub.config.config import CATALOG_ROOT_PATH
-from catalog.packages import const
-from catalog.pub.config import config as pub_config
class TestNfPackage(TestCase):
"VnfPackageOnboardingNotification",
"VnfPackageChangeNotification"
],
- "vnfdId": [
- "b1bb0ce7-2222-4fa7-95ed-4840d70a1177"
- ],
+ "vnfPkgId": [uuid_csarid],
"operationalState": ["ENABLED", "DISABLED"]
},
"callbackUri": "https://so-vnfm-simulator.onap:9093/vnfpkgm/v1/notification",
'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)},
- '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/vnf_packages/%s' % (const.PKG_URL_PREFIX, uuid_csarid)},
+ 'subscription': {
+ 'href': '/%s%s' % (const.VNFPKG_SUBSCRIPTION_ROOT_URI, uuid_subscriptid)}
},
"subscriptionId": uuid_subscriptid
}
mock_requests_post.return_value.status_code = 204
- mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"], data=expect_onboarding_notification,
+ mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"],
+ data=json.dumps(expect_onboarding_notification),
headers={'Connection': 'close',
'content-type': 'application/json',
'accept': 'application/json'},
'timeStamp': "2019-02-16 14:41:16",
'vnfPkgId': "1234",
'vnfdId': "b1bb0ce7-2222-4fa7-95ed-4840d70a1177",
- 'changeType': const.PKG_CHANGE_TYPE.PKG_DELETE,
- 'operationalState': None,
- "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_csarid)
- }
- }
+ 'href': '/%s/vnf_packages/%s' % (const.PKG_URL_PREFIX,
+ uuid_csarid)},
+ 'subscription': {
+ 'href': '/%s%s' % (const.VNFPKG_SUBSCRIPTION_ROOT_URI,
+ uuid_subscriptid)}
+
+ },
+ 'changeType': const.PKG_CHANGE_TYPE.PKG_DELETE,
+ 'operationalState': None,
+ "subscriptionId": uuid_subscriptid
}
NfPkgDeleteThread(csar_id=uuid_csarid, job_id="5").delete_csar()
- mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"], data=expect_deleted_notification,
+ mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"],
+ data=json.dumps(expect_deleted_notification),
headers={'Connection': 'close',
'content-type': 'application/json',
'accept': 'application/json'},