X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Ftests%2Ftest_vnf_pkg_subscription.py;h=fd229ec63450dd4b074669b818a59b55dbc552a1;hb=a8aae3166f06b86a609182b671d0e9a6ae314b44;hp=f00e2ac45c7acb965f580a14dc1394fc31d84984;hpb=0409420992ea31df6cbaa28e5cbd0ff6ecd03b36;p=modeling%2Fetsicatalog.git diff --git a/catalog/packages/tests/test_vnf_pkg_subscription.py b/catalog/packages/tests/test_vnf_pkg_subscription.py index f00e2ac..fd229ec 100644 --- a/catalog/packages/tests/test_vnf_pkg_subscription.py +++ b/catalog/packages/tests/test_vnf_pkg_subscription.py @@ -12,23 +12,25 @@ # 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 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.utils import toscaparser from catalog.pub.config.config import CATALOG_ROOT_PATH -from rest_framework import status +from catalog.pub.database.models import VnfPkgSubscriptionModel, VnfPackageModel +from catalog.pub.exceptions import SubscriptionDoesNotExistsException +from catalog.pub.utils import toscaparser +from .const import vnf_subscription_data, vnfd_data class TestNfPackageSubscription(TestCase): @@ -146,20 +148,16 @@ class TestNfPackageSubscription(TestCase): 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) @@ -184,9 +182,7 @@ class TestNfPackageSubscription(TestCase): 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) @@ -196,8 +192,9 @@ class TestNfPackageSubscription(TestCase): @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" @@ -226,7 +223,7 @@ class TestNfPackageSubscription(TestCase): 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, @@ -247,6 +244,20 @@ class TestNfPackageSubscription(TestCase): mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"], data=expect_notification, headers={'Connection': 'close'}) + 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): def setUp(self): @@ -271,20 +282,17 @@ 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, @@ -304,4 +312,5 @@ class NotificationTest(TestCase): } } } - mock_requests_post.assert_called_with(expect_callbackuri, data=expect_notification, headers={'Connection': 'close'}) + mock_requests_post.assert_called_with(expect_callbackuri, data=expect_notification, + headers={'Connection': 'close'})