Notification stuffs.

- Send notification using notificationutil.

Change-Id: I35fbc0b57adff499cabb4b956bbc6fb6e794ef38
Issue-ID: VFC-1095
Signed-off-by: laili <lai.li@zte.com.cn>

diff --git a/lcm/lcm/nf/biz/instantiate_vnf.py b/lcm/lcm/nf/biz/instantiate_vnf.py
index 56e9c14..f86baab 100644 (file)
--- a/lcm/lcm/nf/biz/instantiate_vnf.py
+++ b/lcm/lcm/nf/biz/instantiate_vnf.py
@@ -21,10 +21,12 @@ from threading import Thread
 from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, \
     SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel
 from lcm.pub.exceptions import NFLCMException
-from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo, prepare_notification_data
+from lcm.pub.msapi.gvnfmdriver import prepare_notification_data
+# from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo
 from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id
 from lcm.pub.utils.jobutil import JobUtil
 from lcm.pub.utils.timeutil import now_time
+from lcm.pub.utils.notificationsutil import NotificationsUtil
 from lcm.pub.utils.values import ignore_case_get, get_none, get_boolean, get_integer
 from lcm.pub.vimapi import adaptor
 from lcm.nf.biz.grant_vnf import grant_resource
@@ -131,8 +133,9 @@ class InstantiateVnf(Thread):
     def lcm_notify(self):
         notification_content = prepare_notification_data(self.nf_inst_id, self.job_id, "ADDED")
         logger.info('Notify request data = %s' % notification_content)
-        resp = notify_lcm_to_nfvo(json.dumps(notification_content))
-        logger.info('Lcm notify end, response %s' % resp)
+        # resp = notify_lcm_to_nfvo(json.dumps(notification_content))
+        # logger.info('Lcm notify end, response %s' % resp)
+        NotificationsUtil().send_notification(notification_content)
 
     def vnf_inst_failed_handle(self, error_msg):
         logger.error('VNF instantiation failed, detail message: %s' % error_msg)

diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py
index e698c4d..4784fa2 100644 (file)
--- a/lcm/lcm/nf/tests/test_instantiate_vnf.py
+++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py
@@ -24,10 +24,11 @@ from lcm.nf.biz.instantiate_vnf import InstantiateVnf
 from lcm.nf.const import c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \\r
     c5_data_create_subnet, c3_data_get_volume, c6_data_create_port, c7_data_create_flavor, c8_data_list_image, \\r
     c9_data_create_vm, c10_data_get_vm, inst_req_data, vnfpackage_info\r
-from lcm.pub.database.models import NfInstModel, JobStatusModel\r
+from lcm.pub.database.models import NfInstModel, JobStatusModel, SubscriptionModel\r
 from lcm.pub.utils import restcall\r
 from lcm.pub.utils.jobutil import JobUtil\r
 from lcm.pub.utils.timeutil import now_time\r
+from lcm.pub.utils.notificationsutil import NotificationsUtil\r
 from lcm.pub.vimapi import api\r
 \r
 \r
@@ -68,22 +69,22 @@ class TestNFInstantiate(TestCase):
 \r
     @mock.patch.object(InstantiateVnf, 'run')\r
     def test_instantiate_vnf(self, mock_run):\r
-        NfInstModel(nfinstid='12', nf_name='VNF1', status="UN_INSTANTIATED").save()\r
+        NfInstModel(nfinstid='12', nf_name='VNF1', status='UN_INSTANTIATED').save()\r
         mock_run.re.return_value = None\r
-        response = self.client.post("/api/vnflcm/v1/vnf_instances/12/instantiate", data=inst_req_data, format='json')\r
+        response = self.client.post('/api/vnflcm/v1/vnf_instances/12/instantiate', data=inst_req_data, format='json')\r
         self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)\r
 \r
     def test_instantiate_vnf_when_inst_id_not_exist(self):\r
         self.nf_inst_id = str(uuid.uuid4())\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
-        JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")\r
+        JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         jobs = JobStatusModel.objects.filter(jobid=self.job_id,\r
                                              progress=0,\r
-                                             descp="INST_VNF_READY")\r
+                                             descp='INST_VNF_READY')\r
         self.assertEqual(1, len(jobs))\r
         data = inst_req_data\r
         InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, "VNF nf_inst_id is not exist.")\r
+        self.assert_job_result(self.job_id, 255, 'VNF nf_inst_id is not exist.')\r
 \r
     def test_instantiate_vnf_when_already_instantiated(self):\r
         NfInstModel.objects.create(nfinstid='1111',\r
@@ -99,14 +100,14 @@ class TestNFInstantiate(TestCase):
                                    create_time=now_time())\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
-        JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")\r
+        JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         jobs = JobStatusModel.objects.filter(jobid=self.job_id,\r
                                              progress=0,\r
-                                             descp="INST_VNF_READY")\r
+                                             descp='INST_VNF_READY')\r
         self.assertEqual(1, len(jobs))\r
         data = inst_req_data\r
         InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, "VNF instantiationState is not NOT_INSTANTIATED.")\r
+        self.assert_job_result(self.job_id, 255, 'VNF instantiationState is not NOT_INSTANTIATED.')\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
     def test_instantiate_vnf_when_get_packageinfo_by_csarid_failed(self, mock_call_req):\r
@@ -125,10 +126,10 @@ class TestNFInstantiate(TestCase):
         mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid]\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
-        JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")\r
+        JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         data = inst_req_data\r
         InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, "Failed to query vnf CSAR(111) from catalog.")\r
+        self.assert_job_result(self.job_id, 255, 'Failed to query vnf CSAR(111) from catalog.')\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
     def test_instantiate_vnf_when_applay_grant_failed(self, mock_call_req):\r
@@ -148,10 +149,10 @@ class TestNFInstantiate(TestCase):
         mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result]\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
-        JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")\r
+        JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         data = inst_req_data\r
         InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, "Nf instancing apply grant exception")\r
+        self.assert_job_result(self.job_id, 255, 'Nf instancing apply grant exception')\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
     @mock.patch.object(api, 'call')\r
@@ -173,14 +174,15 @@ class TestNFInstantiate(TestCase):
         mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume]\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
-        JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")\r
+        JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         data = inst_req_data\r
         InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 255, "unexpected exception")\r
+        self.assert_job_result(self.job_id, 255, 'unexpected exception')\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
     @mock.patch.object(api, 'call')\r
-    def test_instantiate_vnf_success(self, mock_call, mock_call_req):\r
+    @mock.patch.object(NotificationsUtil, 'post_notification')\r
+    def test_instantiate_vnf_success(self, mock_post_notification, mock_call, mock_call_req):\r
         NfInstModel.objects.create(nfinstid='1111',\r
                                    nf_name='vFW_01',\r
                                    package_id='222',\r
@@ -192,11 +194,36 @@ class TestNFInstantiate(TestCase):
                                    nf_desc='vFW in Nanjing TIC Edge',\r
                                    vnfdid='111',\r
                                    create_time=now_time())\r
+        SubscriptionModel.objects.create(\r
+            subscription_id=str(uuid.uuid4()),\r
+            callback_uri='api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification',\r
+            auth_info=json.JSONEncoder().encode({\r
+                'authType': ['BASIC'],\r
+                'paramsBasic': {\r
+                    'userName': 'username',\r
+                    'password': 'password'\r
+                }\r
+            }),\r
+            notification_types=str([\r
+                'VnfLcmOperationOccurrenceNotification',\r
+                'VnfIdentifierCreationNotification',\r
+                'VnfIdentifierDeletionNotification'\r
+            ]),\r
+            operation_types=str(['INSTANTIATE']),\r
+            operation_states=str(['COMPLETED']),\r
+            vnf_instance_filter=json.JSONEncoder().encode({\r
+                'vnfdIds': ['111'],\r
+                'vnfProductsFromProviders': [],\r
+                'vnfInstanceIds': ['1111'],\r
+                'vnfInstanceNames': [],\r
+            })\r
+        )\r
         r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200']\r
         r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200']\r
         r3_all_aai_result = [1, json.JSONEncoder().encode(''), '404']\r
-        r4_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']\r
-        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_all_aai_result, r4_lcm_notify_result]\r
+        # r4_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']\r
+        # mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_all_aai_result, r4_lcm_notify_result]\r
+        mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_all_aai_result]\r
         mock_call.side_effect = [c1_data_get_tenant_id,\r
                                  c2_data_create_volume, c3_data_get_volume,\r
                                  c4_data_create_network,\r
@@ -204,9 +231,10 @@ class TestNFInstantiate(TestCase):
                                  c6_data_create_port,\r
                                  c7_data_create_flavor,\r
                                  c8_data_list_image, c9_data_create_vm, c10_data_get_vm]\r
+        mock_post_notification.side_effect = None\r
         self.nf_inst_id = '1111'\r
         self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
-        JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")\r
+        JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
         data = inst_req_data\r
         InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
-        self.assert_job_result(self.job_id, 100, "Instantiate Vnf success.")\r
+        self.assert_job_result(self.job_id, 100, 'Instantiate Vnf success.')\r

diff --git a/lcm/lcm/pub/msapi/gvnfmdriver.py b/lcm/lcm/pub/msapi/gvnfmdriver.py
index 763b197..a61227f 100644 (file)
--- a/lcm/lcm/pub/msapi/gvnfmdriver.py
+++ b/lcm/lcm/pub/msapi/gvnfmdriver.py
@@ -1,22 +1,24 @@
 # Copyright 2017 ZTE Corporation.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #         http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an 'AS IS' BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 import json
 import logging
+import uuid
 
 from lcm.pub.exceptions import NFLCMException
 from lcm.pub.utils.restcall import req_by_msb
+from lcm.pub.utils.timeutil import now_time
 from lcm.pub.database.models import (
     NfInstModel, VmInstModel, NetworkInstModel,
     PortInstModel, StorageInstModel, VNFCInstModel
@@ -26,26 +28,26 @@ logger = logging.getLogger(__name__)
 
 
 def get_packageinfo_by_vnfdid(vnfdid):
-    ret = req_by_msb("api/gvnfmdriver/v1/vnfpackages", "GET")
+    ret = req_by_msb('api/gvnfmdriver/v1/vnfpackages', 'GET')
     if ret[0] != 0:
-        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
-        raise NFLCMException("Failed to query package_info of vnfdid(%s) from nslcm." % vnfdid)
+        logger.error('Status code is %s, detail is %s.', ret[2], ret[1])
+        raise NFLCMException('Failed to query package_info of vnfdid(%s) from nslcm.' % vnfdid)
     return json.JSONDecoder().decode(ret[1])
 
 
 def apply_grant_to_nfvo(data):
-    ret = req_by_msb("api/gvnfmdriver/v1/resource/grant", "PUT", data)
+    ret = req_by_msb('api/gvnfmdriver/v1/resource/grant', 'PUT', data)
     if ret[0] != 0:
-        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
-        raise NFLCMException("Nf instancing apply grant exception")
+        logger.error('Status code is %s, detail is %s.', ret[2], ret[1])
+        raise NFLCMException('Nf instancing apply grant exception')
     return json.JSONDecoder().decode(ret[1])
 
 
 def notify_lcm_to_nfvo(data):
-    ret = req_by_msb("api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification", "POST", data)
+    ret = req_by_msb('api/gvnfmdriver/v1/vnfs/lifecyclechangesnotification', 'POST', data)
     if ret[0] != 0:
-        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
-        raise NFLCMException("Nf lcm notify exception")
+        logger.error('Status code is %s, detail is %s.', ret[2], ret[1])
+        raise NFLCMException('Nf lcm notify exception')
     return ret[1]
 
 
@@ -113,11 +115,16 @@ def prepare_notification_data(nfinstid, jobid, changetype):
             }
         })
     notification_content = {
-        "notificationType": 'VnfLcmOperationOccurrenceNotification',
-        "notificationStatus": 'RESULT',
-        "vnfInstanceId": nfinstid,
-        "operation": 'INSTANTIATE',
-        "vnfLcmOpOccId": jobid,
+        'id': str(uuid.uuid4()),  # shall be the same if sent multiple times due to multiple subscriptions.
+        'notificationType': 'VnfLcmOperationOccurrenceNotification',
+        # set 'subscriptionId' after filtering for subscribers
+        'timeStamp': now_time(),
+        'notificationStatus': 'RESULT',
+        'operationState': 'COMPLETED',
+        'vnfInstanceId': nfinstid,
+        'operation': 'INSTANTIATE',
+        'isAutomaticInvocation': False,
+        'vnfLcmOpOccId': jobid,
         'affectedVnfcs': affected_vnfcs,
         'affectedVirtualLinks': affected_vls,
         'affectedVirtualStorages': affected_vss,
@@ -125,7 +132,12 @@ def prepare_notification_data(nfinstid, jobid, changetype):
             'id': None,  # TODO
             'resourceHandle': None,  # TODO
             'extLinkPorts': ext_link_ports
-        }]
+        }],
+        '_links': {
+            'vnfInstance': {'href': '/api/vnflcm/v1/vnf_instances/%s' % nfinstid},
+            # set 'subscription' link after filtering for subscribers
+            'vnfLcmOpOcc': {'href': '/api/vnflcm/v1/vnf_lcm_op_occs/%s' % jobid}
+        }
     }
     nfInsts = NfInstModel.objects.filter(nfinstid=nfinstid)
     notification_content['vnfmInstId'] = nfInsts[0].vnfminstid

diff --git a/lcm/lcm/pub/utils/notificationsutil.py b/lcm/lcm/pub/utils/notificationsutil.py
index 3af8f22..5327dc1 100644 (file)
--- a/lcm/lcm/pub/utils/notificationsutil.py
+++ b/lcm/lcm/pub/utils/notificationsutil.py
@@ -46,6 +46,7 @@ class NotificationsUtil(object):
         for subscription in subscriptions:
             # set subscription id
             notification["subscriptionId"] = subscription.subscription_id
+            notification['_links']['subscription'] = {'href': '/api/vnflcm/v1/subscriptions/%s' % subscription.subscription_id}
             callbackUri = subscription.callback_uri
             auth_info = json.loads(subscription.auth_info)
             if auth_info["authType"] == const.OAUTH2_CLIENT_CREDENTIALS:

diff --git a/lcm/lcm/pub/utils/tests.py b/lcm/lcm/pub/utils/tests.py
index 16210db..9bed37c 100644 (file)
--- a/lcm/lcm/pub/utils/tests.py
+++ b/lcm/lcm/pub/utils/tests.py
@@ -277,6 +277,7 @@ class TestNotificationUtils(unittest.TestCase):
             "vnfInstanceId": "99442b18-a5c7-11e8-998c-bf1755941f13",
             "operationState": "STARTING",
             "operation": "INSTANTIATE",
+            "_links": {}
         }
         mock_post.return_value.status_code = 204
         NotificationsUtil().send_notification(dummy_notification)
@@ -288,6 +289,7 @@ class TestNotificationUtils(unittest.TestCase):
             "vnfInstanceId": "9fe4080c-b1a3-11e8-bb96-645106374fd3",
             "operationState": "",
             "operation": "",
+            "_links": {}
         }
         mock_post.return_value.status_code = 204
         NotificationsUtil().send_notification(dummy_notification)