diff options
| author |   hongyuzhao <zhao.hongyu@zte.com.cn> | 2019-12-14 13:29:36 +0800 |
|---|---|---|
| committer | hongyuzhao <zhao.hongyu@zte.com.cn> | 2019-12-14 13:56:40 +0800 |
| commit | 0409420992ea31df6cbaa28e5cbd0ff6ecd03b36 (patch) | |
| tree | e3fc8e4618c2dd4895d8130b679d27605a660e85 /catalog/packages/biz | |
| parent | 5f632e314dcb48bcf30596ef2a2c0af60e836c3c (diff) | |
Modify notification endpoint interface definition in swagger
Change-Id: I4e31d2ad533a5971e748931240e4eac9e43ed96d
Issue-ID: MODELING-288
Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>
Diffstat (limited to 'catalog/packages/biz')
| -rw-r--r-- | catalog/packages/biz/notificationsutil.py | 8 | ||||
| -rw-r--r-- | catalog/packages/biz/vnf_pkg_subscription.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/catalog/packages/biz/notificationsutil.py b/catalog/packages/biz/notificationsutil.py index 4fa8e79..8a653b4 100644 --- a/catalog/packages/biz/notificationsutil.py +++ b/catalog/packages/biz/notificationsutil.py @@ -25,6 +25,7 @@ from catalog.pub.config import config as pub_config import traceback from django.db.models import Q + logger = logging.getLogger(__name__) @@ -108,8 +109,6 @@ def prepare_vnfpkg_notification(vnf_pkg_id, notification_type, pkg_change_type, 'timeStamp': catalog.pub.utils.timeutil.now_time(), 'vnfPkgId': vnf_pkg_id, 'vnfdId': vnfd_id, - 'changeType': pkg_change_type, - 'operationalState': operational_state, '_links': { 'vnfPackage': { 'href': 'http://%s:%s/%s/vnf_packages/%s' % (pub_config.MSB_SERVICE_IP, @@ -119,6 +118,11 @@ def prepare_vnfpkg_notification(vnf_pkg_id, notification_type, pkg_change_type, } } } + + if notification_type == "VnfPackageChangeNotification": + notification_content['changeType'] = pkg_change_type + notification_content['operationalState'] = operational_state + return notification_content diff --git a/catalog/packages/biz/vnf_pkg_subscription.py b/catalog/packages/biz/vnf_pkg_subscription.py index 29ef92e..69ce2e8 100644 --- a/catalog/packages/biz/vnf_pkg_subscription.py +++ b/catalog/packages/biz/vnf_pkg_subscription.py @@ -57,7 +57,7 @@ class CreateSubscription(object): self.vnfd_id = ignore_case_get(self.filter, "vnfdId", []) self.vnf_pkg_id = ignore_case_get(self.filter, "vnfPkgId", []) self.vnf_products_from_provider = \ - ignore_case_get(self.filter, "vnfProductsFromProviders", {}) + ignore_case_get(self.filter, "vnfProductsFromProviders", []) def check_callbackuri_connection(self): logger.debug("SubscribeNotification-post::> Sending GET request " |