diff options
Diffstat (limited to 'catalog/packages/tests')
| -rw-r--r-- | catalog/packages/tests/test_nsdm_subscription.py | 31 | ||||
| -rw-r--r-- | catalog/packages/tests/test_vnf_pkg_subscription.py | 21 |
2 files changed, 20 insertions, 32 deletions
diff --git a/catalog/packages/tests/test_nsdm_subscription.py b/catalog/packages/tests/test_nsdm_subscription.py index 98ad9c1..d1e8770 100644 --- a/catalog/packages/tests/test_nsdm_subscription.py +++ b/catalog/packages/tests/test_nsdm_subscription.py @@ -22,7 +22,7 @@ from rest_framework import status from catalog.packages.biz.nsdm_subscription import NsdmSubscription from catalog.pub.database.models import NsdmSubscriptionModel -from catalog.packages.biz.notificationsutil import NotificationsUtil, prepare_nsd_notification, prepare_pnfd_notification +from catalog.packages.biz.notificationsutil import NsdNotifications, PnfNotifications from catalog.packages import const from catalog.pub.config import config as pub_config import catalog.pub.utils.timeutil @@ -607,8 +607,6 @@ class TestNsdmSubscription(TestCase): 'timeStamp': "nowtime()", 'nsdInfoId': "d0ea5ec3-0b98-438a-9bea-488230cff174", 'nsdId': "b632bddc-bccd-4180-bd8d-4e8a9578eff7", - 'onboardingFailureDetails': None, - 'nsdOperationalState': None, "subscriptionId": "1111", '_links': { 'subscription': { @@ -647,14 +645,11 @@ class NotificationTest(TestCase): def test_nsdpkg_notify(self, mock_nowtime, mock_uuid, mock_requests_post): mock_nowtime.return_value = "nowtime()" mock_uuid.return_value = "1111" - notification_content = prepare_nsd_notification("nsdinfoid1", "nsdid1", - const.NSD_NOTIFICATION_TYPE.NSD_ONBOARDING_FAILURE, - "NSD(nsdid1) already exists.", operational_state=None) - filters = { - 'nsdInfoId': 'nsdInfoId', - 'nsdId': 'nsdId', - } - NotificationsUtil().send_notification(notification_content, filters, False) + notify = NsdNotifications(const.NSD_NOTIFICATION_TYPE.NSD_ONBOARDING_FAILURE, + nsd_info_id="nsdinfoid1", + nsd_id="nsdid1", + failure_details="NSD(nsdid1) already exists.", operational_state=None) + notify.send_notification() expect_callbackuri = "http://127.0.0.1/self" expect_notification = { 'id': "1111", @@ -663,7 +658,6 @@ class NotificationTest(TestCase): 'nsdInfoId': "nsdinfoid1", 'nsdId': "nsdid1", 'onboardingFailureDetails': "NSD(nsdid1) already exists.", - 'nsdOperationalState': None, "subscriptionId": "1", '_links': { 'subscription': { @@ -687,13 +681,11 @@ class NotificationTest(TestCase): def test_pnfpkg_notify(self, mock_nowtime, mock_uuid, mock_requests_post): mock_nowtime.return_value = "nowtime()" mock_uuid.return_value = "1111" - notification_content = prepare_pnfd_notification("pnfdInfoIds1", 'pnfdId1', - const.NSD_NOTIFICATION_TYPE.PNFD_ONBOARDING) - filters = { - 'pnfdId': 'pnfdId', - 'pnfdInfoIds': 'pnfdInfoIds', - } - NotificationsUtil().send_notification(notification_content, filters, False) + notify = PnfNotifications(const.NSD_NOTIFICATION_TYPE.PNFD_ONBOARDING, + pnfd_info_id="pnfdInfoIds1", + pnfd_id='pnfdId1', + failure_details=None) + notify.send_notification() expect_callbackuri = "http://127.0.0.1/self" expect_notification = { 'id': "1111", @@ -701,7 +693,6 @@ class NotificationTest(TestCase): 'timeStamp': "nowtime()", 'pnfdInfoIds': "pnfdInfoIds1", 'pnfdId': "pnfdId1", - 'onboardingFailureDetails': None, "subscriptionId": "1", '_links': { 'subscription': { diff --git a/catalog/packages/tests/test_vnf_pkg_subscription.py b/catalog/packages/tests/test_vnf_pkg_subscription.py index f00e2ac..bc7ee49 100644 --- a/catalog/packages/tests/test_vnf_pkg_subscription.py +++ b/catalog/packages/tests/test_vnf_pkg_subscription.py @@ -22,7 +22,7 @@ from django.test import TestCase 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 +from catalog.packages.biz.notificationsutil import PkgNotifications from catalog.packages import const from catalog.pub.config import config as pub_config import catalog.pub.utils.timeutil @@ -197,7 +197,7 @@ class TestNfPackageSubscription(TestCase): @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()" + 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 +226,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, @@ -271,20 +271,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, |