Merge "Modify notification request data"

tacker/conductor/conductor_server.py

@@ -1488,13 +1488,11 @@ class Conductor(manager.Manager):
                 notification['subscriptionId'] = line.id
                 if (notification.get('notificationType') ==
                         'VnfLcmOperationOccurrenceNotification'):
-                    notification['_links'] = {}
                     notification['_links']['subscription'] = {}
                     notification['_links']['subscription']['href'] = \
                         CONF.vnf_lcm.endpoint_url + \
                         "/vnflcm/v1/subscriptions/" + line.id
                 else:
-                    notification['links'] = {}
                     notification['links']['subscription'] = {}
                     notification['links']['subscription']['href'] = \
                         CONF.vnf_lcm.endpoint_url + \

tacker/objects/vnf_lcm_op_occs.py

@@ -598,6 +598,7 @@ class VnfInfoModifications(base.TackerObject,
     fields = {
         'vnf_instance_name': fields.StringField(nullable=True),
         'vnf_instance_description': fields.StringField(nullable=True),
+        'metadata': fields.DictOfStringsField(nullable=True, default={}),
         'vim_connection_info': fields.ListOfObjectsField(
             'VimConnectionInfo', nullable=True, default=[]),
         'vim_connection_info_delete_ids':
@@ -630,6 +631,7 @@ class VnfInfoModifications(base.TackerObject,
     def _from_dict(cls, data_dict):
         vnf_instance_name = data_dict.get('vnf_instance_name')
         vnf_instance_description = data_dict.get('vnf_instance_description')
+        metadata = data_dict.get('metadata')
         vim_connection_info = data_dict.get('vim_connection_info', [])
         vim_connection_info_delete_ids = data_dict.get(
             'vim_connection_info_delete_ids')
@@ -643,6 +645,7 @@ class VnfInfoModifications(base.TackerObject,
         obj = cls(
             vnf_instance_name=vnf_instance_name,
             vnf_instance_description=vnf_instance_description,
+            metadata=metadata,
             vim_connection_info=vim_connection_info,
             vim_connection_info_delete_ids=vim_connection_info_delete_ids,
             vnf_pkg_id=vnf_pkg_id,
@@ -658,6 +661,7 @@ class VnfInfoModifications(base.TackerObject,
         return {
             'vnf_instance_name': self.vnf_instance_name,
             'vnf_instance_description': self.vnf_instance_description,
+            'metadata': self.metadata,
             'vim_connection_info': self.vim_connection_info,
             'vim_connection_info_delete_ids':
                 self.vim_connection_info_delete_ids,

tacker/tests/unit/objects/fakes.py

@@ -490,6 +490,7 @@ def get_changed_info_data():
     return {
         "vnf_instance_name": "",
         "vnf_instance_description": "",
+        "metadata": {"test:": "test_value"},
         "vnf_configurable_properties": {"test": "test_value"},
         "vnfc_info_modifications_delete_ids": ["test1"],
         "vnfd_id": "2c69a161-0000-4b0f-bcf8-391f8fc76600",

tacker/tests/unit/vnflcm/fakes.py

@@ -1309,6 +1309,7 @@ VNFLCMOPOCC_RESPONSE = {
         }]
     },
     'changedInfo': {
+        'metadata': {},
         'vimConnectionInfo': [],
         'vimConnectionInfoDeleteIds': [],
         'vnfPkgId': None,