openstack
/
tacker
Code Issues Proposed changes

Change of Additional Properties on LCM operation 

Modified additional properties on LCM operation in order to
change "don't care" setting on validating unsupported attribute.

Change-Id: I87abdb9147a0a8824c8fb1fd457f578398061a2c
This commit is contained in:
Koichi Edagawa 2020-09-11 18:59:58 +09:00 committed by Aldinson C. Esto
parent 3213241570
commit 0db10beb6c
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tacker/api/schemas/vnf_lcm.py
View File

@ -32,7 +32,7 @@ _extManagedVirtualLinkData = {
'vimConnectionId': parameter_types.identifier 'vimConnectionId': parameter_types.identifier
}, },
'required': ['id', 'vnfVirtualLinkDescId', 'resourceId'], 'required': ['id', 'vnfVirtualLinkDescId', 'resourceId'],
'additionalProperties': False, 'additionalProperties': True,
}, },
} }
@ -63,7 +63,7 @@ _ipaddresses = {
} }
}, },
'required': ['type', 'fixedAddresses'], 'required': ['type', 'fixedAddresses'],
'additionalProperties': False 'additionalProperties': True
} }
} }
@ -77,7 +77,7 @@ _ipOverEthernetAddressData = {
{'required': ['macAddress']}, {'required': ['macAddress']},
{'required': ['ipAddresses']} {'required': ['ipAddresses']}
], ],
'additionalProperties': False 'additionalProperties': True
} }
_cpProtocolData = { _cpProtocolData = {
@ -91,7 +91,7 @@ _cpProtocolData = {
'ipOverEthernet': _ipOverEthernetAddressData, 'ipOverEthernet': _ipOverEthernetAddressData,
}, },
'required': ['layerProtocol'], 'required': ['layerProtocol'],
'additionalProperties': False, 'additionalProperties': True,
} }
} }
@ -104,7 +104,7 @@ _vnfExtCpConfig = {
'linkPortId': parameter_types.identifier, 'linkPortId': parameter_types.identifier,
'cpProtocolData': _cpProtocolData, 'cpProtocolData': _cpProtocolData,
}, },
'additionalProperties': False, 'additionalProperties': True,
} }
} }
@ -117,7 +117,7 @@ _vnfExtCpData = {
'cpConfig': _vnfExtCpConfig, 'cpConfig': _vnfExtCpConfig,
}, },
'required': ['cpdId', 'cpConfig'], 'required': ['cpdId', 'cpConfig'],
'additionalProperties': False, 'additionalProperties': True,
}, },
} }
@ -129,7 +129,7 @@ _resourceHandle = {
'vimLevelResourceType': {'type': 'string', 'maxLength': 255}, 'vimLevelResourceType': {'type': 'string', 'maxLength': 255},
}, },
'required': ['resourceId'], 'required': ['resourceId'],
'additionalProperties': False, 'additionalProperties': True,
} }
_extLinkPortData = { _extLinkPortData = {
@ -141,7 +141,7 @@ _extLinkPortData = {
'resourceHandle': _resourceHandle, 'resourceHandle': _resourceHandle,
}, },
'required': ['id', 'resourceHandle'], 'required': ['id', 'resourceHandle'],
'additionalProperties': False, 'additionalProperties': True,
} }
} }
@ -158,7 +158,7 @@ _extVirtualLinkData = {
}, },
'required': ['id', 'resourceId', 'extCps'], 'required': ['id', 'resourceId', 'extCps'],
'additionalProperties': False, 'additionalProperties': True,
} }
} }
@ -174,7 +174,7 @@ _vimConnectionInfo = {
'accessInfo': parameter_types.keyvalue_pairs, 'accessInfo': parameter_types.keyvalue_pairs,
}, },
'required': ['id', 'vimType'], 'required': ['id', 'vimType'],
'additionalProperties': False, 'additionalProperties': True,
} }
} }
@ -187,7 +187,7 @@ create = {
'metadata': parameter_types.keyvalue_pairs, 'metadata': parameter_types.keyvalue_pairs,
}, },
'required': ['vnfdId'], 'required': ['vnfdId'],
'additionalProperties': False, 'additionalProperties': True,
} }
instantiate = { instantiate = {
@ -201,7 +201,7 @@ instantiate = {
'additionalParams': parameter_types.keyvalue_pairs, 'additionalParams': parameter_types.keyvalue_pairs,
}, },
'required': ['flavourId'], 'required': ['flavourId'],
'additionalProperties': False, 'additionalProperties': True,
} }
terminate = { terminate = {
@ -213,7 +213,7 @@ terminate = {
'additionalParams': parameter_types.keyvalue_pairs, 'additionalParams': parameter_types.keyvalue_pairs,
}, },
'required': ['terminationType'], 'required': ['terminationType'],
'additionalProperties': False, 'additionalProperties': True,
} }
heal = { heal = {
@ -229,7 +229,7 @@ heal = {
} }
}, },
'additionalProperties': False, 'additionalProperties': True,
} }
register_subscription = { register_subscription = {
@ -240,7 +240,7 @@ register_subscription = {
'authentication': parameter_types.keyvalue_pairs, 'authentication': parameter_types.keyvalue_pairs,
}, },
'required': ['callbackUri'], 'required': ['callbackUri'],
'additionalProperties': False, 'additionalProperties': True,
} }
update = { update = {
@ -253,7 +253,7 @@ update = {
'metadata': parameter_types.keyvalue_pairs, 'metadata': parameter_types.keyvalue_pairs,
'vimConnectionInfo': _vimConnectionInfo, 'vimConnectionInfo': _vimConnectionInfo,
}, },
'additionalProperties': False, 'additionalProperties': True,
} }
scale = { scale = {
@ -266,5 +266,5 @@ scale = {
'additionalParams': parameter_types.keyvalue_pairs 'additionalParams': parameter_types.keyvalue_pairs
}, },
'required': ['type', 'aspectId'], 'required': ['type', 'aspectId'],
'additionalProperties': False, 'additionalProperties': True,
} }

8
tacker/api/schemas/vnf_packages.py
View File

@ -26,7 +26,7 @@ create = {
'properties': { 'properties': {
'userDefinedData': parameter_types.keyvalue_pairs 'userDefinedData': parameter_types.keyvalue_pairs
}, },
'additionalProperties': False, 'additionalProperties': True,
} }
upload_from_uri = { upload_from_uri = {
@ -47,7 +47,7 @@ upload_from_uri = {
}, },
'required': ['addressInformation'], 'required': ['addressInformation'],
'additionalProperties': False, 'additionalProperties': True,
} }
""" """
@ -65,7 +65,7 @@ patch = {
}, },
'anyOf': [{'required': ['operationalState']}, 'anyOf': [{'required': ['operationalState']},
{'required': ['userDefinedData']}], {'required': ['userDefinedData']}],
'additionalProperties': False 'additionalProperties': True
} }
query_params_v1 = { query_params_v1 = {
@ -77,5 +77,5 @@ query_params_v1 = {
'all_fields': {'format': 'all_fields'}, 'all_fields': {'format': 'all_fields'},
'exclude_default': {'format': 'exclude_default'}, 'exclude_default': {'format': 'exclude_default'},
}, },
'additionalProperties': False, 'additionalProperties': True,
} }

5
tacker/tests/unit/vnflcm/test_controller.py
View File

@ -1086,10 +1086,7 @@ class TestController(base.TestCase):
# Call Instantiate API # Call Instantiate API
resp = req.get_response(self.app) resp = req.get_response(self.app)
self.assertEqual(http_client.BAD_REQUEST, resp.status_code) self.assertEqual(http_client.INTERNAL_SERVER_ERROR, resp.status_code)
self.assertEqual("Additional properties are not allowed "
"('additional_property' was unexpected)",
resp.json['badRequest']['message'])
@mock.patch.object(TackerManager, 'get_service_plugins', @mock.patch.object(TackerManager, 'get_service_plugins',
return_value={'VNFM': return_value={'VNFM':