fix but for ETSI Catalog Manager needs to trigger a notification after storing ETSI...

Change-Id: I737d188a156b8cc6eb9e35f92e762131c174e4fb
Issue-ID: MODELING-352
Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>

diff --git a/catalog/packages/biz/sdc_vnf_package.py b/catalog/packages/biz/sdc_vnf_package.py
index 5f62d7e..3bfc533 100644 (file)
--- a/catalog/packages/biz/sdc_vnf_package.py
+++ b/catalog/packages/biz/sdc_vnf_package.py
@@ -21,7 +21,7 @@ import traceback
 import zipfile
 
 from catalog.packages.biz.vnf_package import VnfPackage
-from catalog.packages.const import PKG_STATUS
+from catalog.packages import const
 from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH
 from catalog.pub.config.config import REG_TO_MSB_REG_PARAM
 from catalog.pub.database.models import VnfPackageModel
@@ -30,6 +30,7 @@ from catalog.pub.msapi import sdc
 from catalog.pub.utils import fileutil
 from catalog.pub.utils import toscaparser
 from catalog.pub.utils.jobutil import JobUtil, JOB_ERROR_CODE
+from catalog.packages.biz.notificationsutil import PkgNotifications
 
 logger = logging.getLogger(__name__)
 
@@ -176,11 +177,13 @@ class NfDistributeThread(threading.Thread):
             vnfdModel=vnfd_json,
             localFilePath=local_file_name,
             vnfPackageUri=csar_name,
-            onboardingState=PKG_STATUS.ONBOARDED,
-            operationalState=PKG_STATUS.ENABLED,
-            usageState=PKG_STATUS.NOT_IN_USE
+            onboardingState=const.PKG_STATUS.ONBOARDED,
+            operationalState=const.PKG_STATUS.ENABLED,
+            usageState=const.PKG_STATUS.NOT_IN_USE
         ).save()
         JobUtil.add_job_status(self.job_id, 100, "CSAR(%s) distribute successfully." % self.csar_id)
+        send_notification(self.csar_id, const.PKG_NOTIFICATION_TYPE.ONBOARDING,
+                          const.PKG_CHANGE_TYPE.OP_STATE_CHANGE)
 
     def create_vnfd_zip(self, csar_id, vendor_vnf_file):
         """
@@ -246,7 +249,8 @@ class NfPkgDeleteThread(threading.Thread):
             inst_id=self.csar_id,
             job_id=self.job_id)
         JobUtil.add_job_status(self.job_id, 5, "Start to delete CSAR(%s)." % self.csar_id)
-
+        send_notification(self.csar_id, const.PKG_NOTIFICATION_TYPE.CHANGE,
+                          const.PKG_CHANGE_TYPE.PKG_DELETE)
         VnfPackageModel.objects.filter(vnfPackageId=self.csar_id).delete()
 
         JobUtil.add_job_status(self.job_id, 50, "Delete local CSAR(%s) file." % self.csar_id)
@@ -303,3 +307,9 @@ class NfPackage(object):
             "imageInfo": []
         }
         return [0, csar_info]
+
+
+def send_notification(pkg_id, type, pkg_change_type, operational_state=None):
+    notify = PkgNotifications(type, pkg_id, change_type=pkg_change_type,
+                              operational_state=operational_state)
+    notify.send_notification()

diff --git a/catalog/packages/biz/vnf_pkg_subscription.py b/catalog/packages/biz/vnf_pkg_subscription.py
index d059365..fef90b4 100644 (file)
--- a/catalog/packages/biz/vnf_pkg_subscription.py
+++ b/catalog/packages/biz/vnf_pkg_subscription.py
@@ -91,8 +91,8 @@ class CreateSubscription(object):
 
     def do_biz(self):
         self.subscription_id = str(uuid.uuid4())
-        self.check_callbackuri_connection()
         self.check_valid_auth_info()
+        self.check_callbackuri_connection()
         self.check_valid()
         self.save_db()
         subscription = VnfPkgSubscriptionModel.objects.get(

diff --git a/catalog/packages/tests/test_vnfpackage.py b/catalog/packages/tests/test_vnfpackage.py
index 37697b0..0b8bb25 100644 (file)
--- a/catalog/packages/tests/test_vnfpackage.py
+++ b/catalog/packages/tests/test_vnfpackage.py
@@ -13,8 +13,11 @@
 # limitations under the License.
 
 import json
-
 import mock
+import os
+import catalog.pub.utils.timeutil
+from requests.auth import HTTPBasicAuth
+
 from django.test import TestCase
 from rest_framework import status
 from rest_framework.test import APIClient
@@ -25,6 +28,9 @@ 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):
@@ -258,3 +264,118 @@ class TestNfPackage(TestCase):
         )
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertEqual(resp.data, {"error": "VNF CSAR(1) does not exist."})
+
+    @mock.patch("requests.post")
+    @mock.patch.object(sdc, 'download_artifacts')
+    @mock.patch.object(sdc, 'get_artifact')
+    @mock.patch("requests.get")
+    @mock.patch("uuid.uuid4")
+    @mock.patch.object(catalog.pub.utils.timeutil, "now_time")
+    def test_service_pkg_distribute_and_notify(self, mock_nowtime, mock_uuid, mock_requests_get, mock_get_artifact,
+                                               mock_download_artifacts, mock_requests_post):
+        mock_nowtime.return_value = "2019-02-16 14:41:16"
+        uuid_subscriptid = "99442b18-a5c7-11e8-998c-bf1755941f13"
+        uuid_csarid = "1234"
+        mock_uuid.side_effect = [uuid_subscriptid, "1111", "2222"]
+        mock_requests_get.return_value.status_code = 204
+        vnf_subscription_data = {
+            "filter": {
+                "notificationTypes": [
+                    "VnfPackageOnboardingNotification",
+                    "VnfPackageChangeNotification"
+                ],
+                "vnfdId": [
+                    "b1bb0ce7-2222-4fa7-95ed-4840d70a1177"
+                ],
+                "operationalState": ["ENABLED", "DISABLED"]
+            },
+            "callbackUri": "https://so-vnfm-simulator.onap:9093/vnfpkgm/v1/notification",
+            "authentication": {
+                "authType": [
+                    "BASIC"
+                ],
+                "paramsBasic": {
+                    "userName": "vnfm",
+                    "password": "password1$"
+                }
+            }
+        }
+        response = self.client.post(
+            "/api/vnfpkgm/v1/subscriptions",
+            data=vnf_subscription_data,
+            format='json')
+        self.assertEqual(201, response.status_code)
+        mock_download_artifacts.return_value = os.path.join(CATALOG_ROOT_PATH, "Sol004VnfCSAR.csar")
+        mock_get_artifact.return_value = {
+            "uuid": "c94490a0-f7ef-48be-b3f8-8d8662a37236",
+            "invariantUUID": "63eaec39-ffbe-411c-a838-448f2c73f7eb",
+            "name": "Sol004VnfCSAR",
+            "version": "2.0",
+            "toscaModelURL": "/sdc/v1/catalog/resources/c94490a0-f7ef-48be-b3f8-8d8662a37236/toscaModel",
+            "category": "Volte",
+            "subCategory": "VolteVF",
+            "resourceType": "VF",
+            "lifecycleState": "CERTIFIED",
+            "lastUpdaterUserId": "jh0003"
+        }
+        NfDistributeThread(csar_id=uuid_csarid, vim_ids=["1"], lab_vim_id="", job_id="4").on_distribute()
+        print(VnfPackageModel.objects.all().values())
+        expect_onboarding_notification = {
+            'id': "1111",
+            'notificationType': const.PKG_NOTIFICATION_TYPE.ONBOARDING,
+            'timeStamp': "2019-02-16 14:41:16",
+            'vnfPkgId': "1234",
+            '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)}
+
+            },
+            "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,
+                                              headers={'Connection': 'close',
+                                                       'content-type': 'application/json',
+                                                       'accept': 'application/json'},
+                                              auth=HTTPBasicAuth("vnfm", "password1$"),
+                                              verify=False)
+        mock_requests_post.return_value.status_code = 204
+        expect_deleted_notification = {
+            'id': "2222",
+            'notificationType': const.PKG_NOTIFICATION_TYPE.CHANGE,
+            '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)
+                }
+            }
+        }
+        NfPkgDeleteThread(csar_id=uuid_csarid, job_id="5").delete_csar()
+        mock_requests_post.assert_called_with(vnf_subscription_data["callbackUri"], data=expect_deleted_notification,
+                                              headers={'Connection': 'close',
+                                                       'content-type': 'application/json',
+                                                       'accept': 'application/json'},
+                                              auth=HTTPBasicAuth("vnfm", "password1$"),
+                                              verify=False)

diff --git a/static/catalog/Sol004VnfCSAR.csar b/static/catalog/Sol004VnfCSAR.csar
new file mode 100644 (file)
index 0000000..656c07b
Binary files /dev/null and b/static/catalog/Sol004VnfCSAR.csar differ