# See the License for the specific language governing permissions and
# limitations under the License.
-import uuid
-import mock
import json
import os
+import uuid
-from rest_framework.test import APIClient
+import mock
from django.test import TestCase
+from rest_framework import status
+from rest_framework.test import APIClient
+from requests.auth import HTTPBasicAuth
-from catalog.pub.database.models import VnfPkgSubscriptionModel, VnfPackageModel
-from .const import vnf_subscription_data, vnfd_data
-from catalog.packages.biz.notificationsutil import NotificationsUtil, prepare_vnfpkg_notification
+import catalog.pub.utils.timeutil
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
-import catalog.pub.utils.timeutil
+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
from catalog.pub.utils import toscaparser
-from catalog.pub.config.config import CATALOG_ROOT_PATH
-from rest_framework import status
+from catalog.packages.tests.const import vnfd_data
class TestNfPackageSubscription(TestCase):
response.data["callbackUri"]
)
self.assertEqual(temp_uuid, response.data["id"])
- temp_uuid = "00442b18-a5c7-11e8-998c-bf1755941f12"
+ temp2_uuid = "00442b18-a5c7-11e8-998c-bf1755941f12"
mock_requests.return_value.status_code = 204
mock_requests.get.status_code = 204
- mock_uuid4.return_value = temp_uuid
+ mock_uuid4.return_value = temp2_uuid
response = self.client.post(
"/api/vnfpkgm/v1/subscriptions",
data=self.vnf_subscription_data,
format='json'
)
self.assertEqual(303, response.status_code)
+ 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")
+ def test_callbackuri_same_subscriptions(self, mock_requests):
+ mock_requests.return_value.status_code = 204
+ mock_requests.get.status_code = 204
+ response = self.client.post(
+ "/api/vnfpkgm/v1/subscriptions",
+ data=self.vnf_subscription_data,
+ format='json'
+ )
+ self.assertEqual(201, response.status_code)
+ self.assertEqual(
+ self.vnf_subscription_data["callbackUri"],
+ response.data["callbackUri"]
+ )
+ newsubs = self.vnf_subscription_data
+ newsubs["filter"]["vnfdId"] = ["ssss"]
+ response = self.client.post(
+ "/api/vnfpkgm/v1/subscriptions",
+ data=self.vnf_subscription_data,
+ format='json'
+ )
+ self.assertEqual(201, response.status_code)
+ self.assertEqual(
+ newsubs["callbackUri"],
+ response.data["callbackUri"]
+ )
@mock.patch("requests.get")
@mock.patch.object(uuid, 'uuid4')
self.assertEqual(temp_uuid, response.data["id"])
@mock.patch("requests.get")
- @mock.patch.object(uuid, 'uuid4')
- def test_get_subscription_with_id_not_exists(self, mock_uuid4, mock_requests):
- temp_uuid = "99442b18-a5c7-11e8-998c-bf1755941f13"
- dummy_uuid = str(uuid.uuid4())
+ def test_get_subscription_with_id_not_exists(self, mock_requests):
mock_requests.return_value.status_code = 204
mock_requests.get.status_code = 204
- mock_uuid4.return_value = temp_uuid
self.client.post(
"/api/vnfpkgm/v1/subscriptions",
data=self.vnf_subscription_data,
format='json'
)
response = self.client.get(
- "/api/vnfpkgm/v1/subscriptions/%s" % dummy_uuid,
+ "/api/vnfpkgm/v1/subscriptions/111",
format='json'
)
self.assertEqual(404, response.status_code)
response = self.client.delete("/api/vnfpkgm/v1/subscriptions/%s" % temp_uuid)
self.assertEqual(204, response.status_code)
- @mock.patch("requests.get")
- @mock.patch.object(uuid, 'uuid4')
- def test_delete_subscription_with_id_not_exists(self, mock_uuid4, mock_requests):
+ def test_delete_subscription_with_id_not_exists(self):
dummy_uuid = str(uuid.uuid4())
response = self.client.delete("/api/vnfpkgm/v1/subscriptions/%s" % dummy_uuid)
self.assertEqual(404, response.status_code)
@mock.patch("requests.post")
@mock.patch("uuid.uuid4")
@mock.patch.object(catalog.pub.utils.timeutil, "now_time")
- def test_vnfpkg_subscript_notify(self, mock_nowtime, mock_uuid, mock_requests_post, mock_parse_vnfd, mock_requests_get):
- mock_nowtime.return_value = "nowtime()"
+ def test_vnfpkg_subscript_notify(self, mock_nowtime, mock_uuid, mock_requests_post, mock_parse_vnfd,
+ mock_requests_get):
+ mock_nowtime.return_value = "2019-02-16 14:41:16"
uuid_subscriptid = "99442b18-a5c7-11e8-998c-bf1755941f13"
uuid_vnfPackageId = "3fa85f64-5717-4562-b3fc-2c963f66afa6"
uuid_vnfdid = "00342b18-a5c7-11e8-998c-bf1755941f12"
expect_notification = {
'id': "1111",
'notificationType': const.PKG_NOTIFICATION_TYPE.ONBOARDING,
- 'timeStamp': "nowtime()",
+ '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,
- headers={'Connection': 'close'})
+ 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'},
+ auth=HTTPBasicAuth("admin", "pwd1234"),
+ verify=False)
+
+ def test_service_query_single_subscription_not_found(self):
+ try:
+ subscription_id = "test_not_found"
+ QuerySubscription().query_single_subscription(subscription_id)
+ except SubscriptionDoesNotExistsException as e:
+ self.assertEqual("Subscription with ID: %s does not exist" % subscription_id, e.args[0])
+
+ def test_service_delete_single_subscription_not_found(self):
+ try:
+ subscription_id = "test_not_found"
+ TerminateSubscription().terminate(subscription_id)
+ except SubscriptionDoesNotExistsException as e:
+ self.assertEqual("Subscription with ID: %s does not exist" % subscription_id, e.args[0])
class NotificationTest(TestCase):
vnfd_id="vnfdid1",
vnf_pkg_id="vnfpkgid1"
).save()
- mock_nowtime.return_value = "nowtime()"
+ mock_nowtime.return_value = "2019-12-16 14:41:16"
mock_uuid.return_value = "1111"
- notification_content = prepare_vnfpkg_notification("vnfpkgid1", const.PKG_NOTIFICATION_TYPE.CHANGE,
- const.PKG_CHANGE_TYPE.OP_STATE_CHANGE, operational_state=None)
- filters = {
- 'vnfdId': 'vnfd_id',
- 'vnfPkgId': 'vnf_pkg_id'
- }
- NotificationsUtil().send_notification(notification_content, filters, True)
+ notify = PkgNotifications(const.PKG_NOTIFICATION_TYPE.CHANGE, "vnfpkgid1",
+ const.PKG_CHANGE_TYPE.OP_STATE_CHANGE, operational_state=None)
+
+ notify.send_notification()
expect_callbackuri = "http://127.0.0.1/self"
expect_notification = {
'id': "1111",
'notificationType': const.PKG_NOTIFICATION_TYPE.CHANGE,
- 'timeStamp': "nowtime()",
+ '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, headers={'Connection': 'close'})
+ mock_requests_post.assert_called_with(expect_callbackuri, data=json.dumps(expect_notification),
+ headers={'Connection': 'close',
+ 'content-type': 'application/json',
+ 'accept': 'application/json'},
+ verify=False)
Code Review / modeling / etsicatalog.git / blobdiff