Merge "Modify notification request data"
This commit is contained in:
commit
480f760819
|
@ -1488,13 +1488,11 @@ class Conductor(manager.Manager):
|
||||||
notification['subscriptionId'] = line.id
|
notification['subscriptionId'] = line.id
|
||||||
if (notification.get('notificationType') ==
|
if (notification.get('notificationType') ==
|
||||||
'VnfLcmOperationOccurrenceNotification'):
|
'VnfLcmOperationOccurrenceNotification'):
|
||||||
notification['_links'] = {}
|
|
||||||
notification['_links']['subscription'] = {}
|
notification['_links']['subscription'] = {}
|
||||||
notification['_links']['subscription']['href'] = \
|
notification['_links']['subscription']['href'] = \
|
||||||
CONF.vnf_lcm.endpoint_url + \
|
CONF.vnf_lcm.endpoint_url + \
|
||||||
"/vnflcm/v1/subscriptions/" + line.id
|
"/vnflcm/v1/subscriptions/" + line.id
|
||||||
else:
|
else:
|
||||||
notification['links'] = {}
|
|
||||||
notification['links']['subscription'] = {}
|
notification['links']['subscription'] = {}
|
||||||
notification['links']['subscription']['href'] = \
|
notification['links']['subscription']['href'] = \
|
||||||
CONF.vnf_lcm.endpoint_url + \
|
CONF.vnf_lcm.endpoint_url + \
|
||||||
|
|
|
@ -598,6 +598,7 @@ class VnfInfoModifications(base.TackerObject,
|
||||||
fields = {
|
fields = {
|
||||||
'vnf_instance_name': fields.StringField(nullable=True),
|
'vnf_instance_name': fields.StringField(nullable=True),
|
||||||
'vnf_instance_description': fields.StringField(nullable=True),
|
'vnf_instance_description': fields.StringField(nullable=True),
|
||||||
|
'metadata': fields.DictOfStringsField(nullable=True, default={}),
|
||||||
'vim_connection_info': fields.ListOfObjectsField(
|
'vim_connection_info': fields.ListOfObjectsField(
|
||||||
'VimConnectionInfo', nullable=True, default=[]),
|
'VimConnectionInfo', nullable=True, default=[]),
|
||||||
'vim_connection_info_delete_ids':
|
'vim_connection_info_delete_ids':
|
||||||
|
@ -630,6 +631,7 @@ class VnfInfoModifications(base.TackerObject,
|
||||||
def _from_dict(cls, data_dict):
|
def _from_dict(cls, data_dict):
|
||||||
vnf_instance_name = data_dict.get('vnf_instance_name')
|
vnf_instance_name = data_dict.get('vnf_instance_name')
|
||||||
vnf_instance_description = data_dict.get('vnf_instance_description')
|
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 = data_dict.get('vim_connection_info', [])
|
||||||
vim_connection_info_delete_ids = data_dict.get(
|
vim_connection_info_delete_ids = data_dict.get(
|
||||||
'vim_connection_info_delete_ids')
|
'vim_connection_info_delete_ids')
|
||||||
|
@ -643,6 +645,7 @@ class VnfInfoModifications(base.TackerObject,
|
||||||
obj = cls(
|
obj = cls(
|
||||||
vnf_instance_name=vnf_instance_name,
|
vnf_instance_name=vnf_instance_name,
|
||||||
vnf_instance_description=vnf_instance_description,
|
vnf_instance_description=vnf_instance_description,
|
||||||
|
metadata=metadata,
|
||||||
vim_connection_info=vim_connection_info,
|
vim_connection_info=vim_connection_info,
|
||||||
vim_connection_info_delete_ids=vim_connection_info_delete_ids,
|
vim_connection_info_delete_ids=vim_connection_info_delete_ids,
|
||||||
vnf_pkg_id=vnf_pkg_id,
|
vnf_pkg_id=vnf_pkg_id,
|
||||||
|
@ -658,6 +661,7 @@ class VnfInfoModifications(base.TackerObject,
|
||||||
return {
|
return {
|
||||||
'vnf_instance_name': self.vnf_instance_name,
|
'vnf_instance_name': self.vnf_instance_name,
|
||||||
'vnf_instance_description': self.vnf_instance_description,
|
'vnf_instance_description': self.vnf_instance_description,
|
||||||
|
'metadata': self.metadata,
|
||||||
'vim_connection_info': self.vim_connection_info,
|
'vim_connection_info': self.vim_connection_info,
|
||||||
'vim_connection_info_delete_ids':
|
'vim_connection_info_delete_ids':
|
||||||
self.vim_connection_info_delete_ids,
|
self.vim_connection_info_delete_ids,
|
||||||
|
|
|
@ -490,6 +490,7 @@ def get_changed_info_data():
|
||||||
return {
|
return {
|
||||||
"vnf_instance_name": "",
|
"vnf_instance_name": "",
|
||||||
"vnf_instance_description": "",
|
"vnf_instance_description": "",
|
||||||
|
"metadata": {"test:": "test_value"},
|
||||||
"vnf_configurable_properties": {"test": "test_value"},
|
"vnf_configurable_properties": {"test": "test_value"},
|
||||||
"vnfc_info_modifications_delete_ids": ["test1"],
|
"vnfc_info_modifications_delete_ids": ["test1"],
|
||||||
"vnfd_id": "2c69a161-0000-4b0f-bcf8-391f8fc76600",
|
"vnfd_id": "2c69a161-0000-4b0f-bcf8-391f8fc76600",
|
||||||
|
|
|
@ -1309,6 +1309,7 @@ VNFLCMOPOCC_RESPONSE = {
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
'changedInfo': {
|
'changedInfo': {
|
||||||
|
'metadata': {},
|
||||||
'vimConnectionInfo': [],
|
'vimConnectionInfo': [],
|
||||||
'vimConnectionInfoDeleteIds': [],
|
'vimConnectionInfoDeleteIds': [],
|
||||||
'vnfPkgId': None,
|
'vnfPkgId': None,
|
||||||
|
|
Loading…
Reference in New Issue