openstack/tacker
Code Issues Proposed changes

Fix status code for invalid filter conditions

Browse Source 
The current tacker returns 500 Internal Server Error to requests with
invalid filter conditions where a VNFID is not UUID. However, as the
error is caused by a bad request, the status code should be 400.

This bug occurs because data types of 'id' and 'vnfd_Id' in TackerObject
are 'string' which don't match the data types in DB, i.e., UUID. In
order to fix this bug, those data types in TackerObject are changed to
'uuid'.

Closes-Bug: 1924666
Closes-Bug: 1926632
Change-Id: I8decbb42d661a44c6c382cb1abbfc37d95084ffb
This commit is contained in:
Tsukasa Inoue 2021-06-08 12:12:21 +09:00 committed by Hiromu Asahina
parent fb782d70e2
commit 7add037259
9 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tacker/api/common/_filters.py
View File

@ -67,16 +67,18 @@ class Filter(BaseFilter):
} }
OPERATOR_SUPPORTED_DATA_TYPES = { OPERATOR_SUPPORTED_DATA_TYPES = {
'eq': ['string', 'number', 'enum', 'boolean', 'key_value_pair'], 'eq': ['uuid', 'string', 'number', 'enum', 'boolean',
'neq': ['string', 'number', 'enum', 'boolean', 'key_value_pair'], 'key_value_pair'],
'in': ['string', 'number', 'enum', 'key_value_pair'], 'neq': ['uuid', 'string', 'number', 'enum', 'boolean',
'nin': ['string', 'number', 'enum', 'key_value_pair'], 'key_value_pair'],
'gt': ['string', 'number', 'datetime', 'key_value_pair'], 'in': ['uuid', 'string', 'number', 'enum', 'key_value_pair'],
'gte': ['string', 'number', 'datetime', 'key_value_pair'], 'nin': ['uuid', 'string', 'number', 'enum', 'key_value_pair'],
'lt': ['string', 'number', 'datetime', 'key_value_pair'], 'gt': ['uuid', 'string', 'number', 'datetime', 'key_value_pair'],
'lte': ['string', 'number', 'datetime', 'key_value_pair'], 'gte': ['uuid', 'string', 'number', 'datetime', 'key_value_pair'],
'cont': ['string', 'key_value_pair'], 'lt': ['uuid', 'string', 'number', 'datetime', 'key_value_pair'],
'ncont': ['string', 'key_value_pair'], 'lte': ['uuid', 'string', 'number', 'datetime', 'key_value_pair'],
'cont': ['uuid', 'string', 'key_value_pair'],
'ncont': ['uuid', 'string', 'key_value_pair'],
} }
def __init__(self, operator, attribute, values): def __init__(self, operator, attribute, values):

6
tacker/objects/vnf_instance.py
View File

@ -334,20 +334,20 @@ class VnfInstance(base.TackerObject, base.TackerPersistentObject,
} }
ALL_ATTRIBUTES = { ALL_ATTRIBUTES = {
'id': ('id', "string", 'VnfInstance'), 'id': ('id', "uuid", 'VnfInstance'),
'vnfInstanceName': ('vnf_instance_name', 'string', 'VnfInstance'), 'vnfInstanceName': ('vnf_instance_name', 'string', 'VnfInstance'),
'vnfInstanceDescription': ( 'vnfInstanceDescription': (
'vnf_instance_description', 'string', 'VnfInstance'), 'vnf_instance_description', 'string', 'VnfInstance'),
'instantiationState': ('instantiation_state', 'string', 'VnfInstance'), 'instantiationState': ('instantiation_state', 'string', 'VnfInstance'),
'taskState': ('task_state', 'string', 'VnfInstance'), 'taskState': ('task_state', 'string', 'VnfInstance'),
'vnfdId': ('vnfd_id', 'string', 'VnfInstance'), 'vnfdId': ('vnfd_id', 'uuid', 'VnfInstance'),
'vnfProvider': ('vnf_provider', 'string', 'VnfInstance'), 'vnfProvider': ('vnf_provider', 'string', 'VnfInstance'),
'vnfProductName': ('vnf_product_name', 'string', 'VnfInstance'), 'vnfProductName': ('vnf_product_name', 'string', 'VnfInstance'),
'vnfSoftwareVersion': ( 'vnfSoftwareVersion': (
'vnf_software_version', 'string', 'VnfInstance'), 'vnf_software_version', 'string', 'VnfInstance'),
'vnfdVersion': ('vnfd_version', 'string', 'VnfInstance'), 'vnfdVersion': ('vnfd_version', 'string', 'VnfInstance'),
'tenantId': ('tenant_id', 'string', 'VnfInstance'), 'tenantId': ('tenant_id', 'string', 'VnfInstance'),
'vnfPkgId': ('vnf_pkg_id', 'string', 'VnfInstance'), 'vnfPkgId': ('vnf_pkg_id', 'uuid', 'VnfInstance'),
'vimConnectionInfo/*': ('vim_connection_info', 'key_value_pair', 'vimConnectionInfo/*': ('vim_connection_info', 'key_value_pair',
{"key_column": "key", "value_column": "value", {"key_column": "key", "value_column": "value",
"model": "VnfInstance"}), "model": "VnfInstance"}),

2
tacker/objects/vnf_instantiated_info.py
View File

@ -101,7 +101,7 @@ class InstantiatedVnfInfo(base.TackerObject, base.TackerObjectDictCompat,
'instantiatedInfo': { 'instantiatedInfo': {
'flavourId': ('id', 'string', 'VnfInstantiatedInfo'), 'flavourId': ('id', 'string', 'VnfInstantiatedInfo'),
'vnfInstanceId': 'vnfInstanceId':
('vnf_instance_id', 'string', 'VnfInstantiatedInfo'), ('vnf_instance_id', 'uuid', 'VnfInstantiatedInfo'),
'vnfState': ('vnf_state', 'string', 'VnfInstantiatedInfo'), 'vnfState': ('vnf_state', 'string', 'VnfInstantiatedInfo'),
'instanceId': ('instance_id', 'string', 'VnfInstantiatedInfo'), 'instanceId': ('instance_id', 'string', 'VnfInstantiatedInfo'),
'instantiationLevelId': 'instantiationLevelId':

2
tacker/objects/vnf_lcm_op_occs.py
View File

@ -246,7 +246,7 @@ class VnfLcmOpOcc(base.TackerObject, base.TackerObjectDictCompat,
} }
ALL_ATTRIBUTES = { ALL_ATTRIBUTES = {
'id': ('id', 'string', 'VnfLcmOpOccs'), 'id': ('id', 'uuid', 'VnfLcmOpOccs'),
'operationState': ('operation_state', 'string', 'VnfLcmOpOccs'), 'operationState': ('operation_state', 'string', 'VnfLcmOpOccs'),
'stateEnteredTime': 'stateEnteredTime':
('state_entered_time', 'datetime', 'VnfLcmOpOccs'), ('state_entered_time', 'datetime', 'VnfLcmOpOccs'),

2
tacker/objects/vnf_lcm_subscriptions.py
View File

@ -594,7 +594,7 @@ class LccnSubscription(base.TackerObject, base.TackerPersistentObject):
} }
ALL_ATTRIBUTES = { ALL_ATTRIBUTES = {
'id': ('id', 'string', 'id': ('id', 'uuid',
'VnfLcmSubscriptions'), 'VnfLcmSubscriptions'),
'vnfdIds': ('vnfd_ids', 'string', 'vnfdIds': ('vnfd_ids', 'string',
'VnfLcmFilters'), 'VnfLcmFilters'),

4
tacker/objects/vnf_package.py
View File

@ -286,7 +286,7 @@ class VnfPackage(base.TackerObject, base.TackerPersistentObject,
# 4. Valid values for a given data type if any. This value is set # 4. Valid values for a given data type if any. This value is set
# especially for 'enum' data type. # especially for 'enum' data type.
ALL_ATTRIBUTES = { ALL_ATTRIBUTES = {
'id': ('id', "string", 'VnfPackage'), 'id': ('id', "uuid", 'VnfPackage'),
'onboardingState': ('onboarding_state', "enum", 'VnfPackage', 'onboardingState': ('onboarding_state', "enum", 'VnfPackage',
fields.PackageOnboardingStateTypeField().valid_values), fields.PackageOnboardingStateTypeField().valid_values),
'operationalState': ('operational_state', 'enum', 'VnfPackage', 'operationalState': ('operational_state', 'enum', 'VnfPackage',
@ -296,7 +296,7 @@ class VnfPackage(base.TackerObject, base.TackerPersistentObject,
'vnfProvider': ('vnfd.vnf_provider', 'string', 'VnfPackageVnfd'), 'vnfProvider': ('vnfd.vnf_provider', 'string', 'VnfPackageVnfd'),
'vnfProductName': ('vnfd.vnf_product_name', 'string', 'vnfProductName': ('vnfd.vnf_product_name', 'string',
'VnfPackageVnfd'), 'VnfPackageVnfd'),
'vnfdId': ('vnfd.vnfd_id', 'string', 'VnfPackageVnfd'), 'vnfdId': ('vnfd.vnfd_id', 'uuid', 'VnfPackageVnfd'),
'vnfSoftwareVersion': ('vnfd.vnf_software_version', 'string', 'vnfSoftwareVersion': ('vnfd.vnf_software_version', 'string',
'VnfPackageVnfd'), 'VnfPackageVnfd'),
'vnfdVersion': ('vnfd.vnfd_version', 'string', 'VnfPackageVnfd'), 'vnfdVersion': ('vnfd.vnfd_version', 'string', 'VnfPackageVnfd'),

2
tacker/objects/vnf_software_image.py
View File

@ -83,7 +83,7 @@ class VnfSoftwareImage(base.TackerObject, base.TackerPersistentObject):
ALL_ATTRIBUTES = { ALL_ATTRIBUTES = {
"softwareImages": { "softwareImages": {
'id': ('software_image_id', 'string', 'VnfSoftwareImage'), 'id': ('software_image_id', 'uuid', 'VnfSoftwareImage'),
'imagePath': ('image_path', 'string', 'VnfSoftwareImage'), 'imagePath': ('image_path', 'string', 'VnfSoftwareImage'),
'diskFormat': ('disk_format', 'string', 'VnfSoftwareImage'), 'diskFormat': ('disk_format', 'string', 'VnfSoftwareImage'),
'userMetadata/*': ('metadata', 'key_value_pair', 'userMetadata/*': ('metadata', 'key_value_pair',

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

@ -1887,16 +1887,17 @@ class TestController(base.TestCase):
{'filter': "(eq,vnfInstanceDescription,dummy value)"}, {'filter': "(eq,vnfInstanceDescription,dummy value)"},
{'filter': "(eq,instantiationState,'NOT_INSTANTIATED')"}, {'filter': "(eq,instantiationState,'NOT_INSTANTIATED')"},
{'filter': "(eq,taskState,'ACTIVE')"}, {'filter': "(eq,taskState,'ACTIVE')"},
{'filter': "(eq,vnfdId,'dummy_vnfd_id')"}, {'filter': "(eq,vnfdId,%s)" % uuidsentinel.vnfd_id},
{'filter': "(eq,vnfProvider,'''dummy ''hi'' value''')"}, {'filter': "(eq,vnfProvider,'''dummy ''hi'' value''')"},
{'filter': "(eq,vnfProductName,'dummy_product_name')"}, {'filter': "(eq,vnfProductName,'dummy_product_name')"},
{'filter': "(eq,vnfSoftwareVersion,'1.0')"}, {'filter': "(eq,vnfSoftwareVersion,'1.0')"},
{'filter': "(eq,vnfdVersion,'dummy_vnfd_version')"}, {'filter': "(eq,vnfdVersion,'dummy_vnfd_version')"},
{'filter': "(eq,tenantId,'dummy_tenant_id')"}, {'filter': "(eq,tenantId,'dummy_tenant_id')"},
{'filter': "(eq,vnfPkgId,'dummy_pkg_id')"}, {'filter': "(eq,vnfPkgId,%s)" % uuidsentinel.vnf_pkg_id},
{'filter': "(eq,vimConnectionInfo/accessInfo/region,'dummy_id')"}, {'filter': "(eq,vimConnectionInfo/accessInfo/region,'dummy_id')"},
{'filter': "(eq,instantiatedInfo/flavourId,'dummy_flavour')"}, {'filter': "(eq,instantiatedInfo/flavourId,'dummy_flavour')"},
{'filter': "(eq,instantiatedInfo/vnfInstanceId,'dummy_vnf_id')"}, {'filter': "(eq,instantiatedInfo/vnfInstanceId,%s)" %
uuidsentinel.vnf_instance_id},
{'filter': "(eq,instantiatedInfo/vnfState,'ACTIVE')"}, {'filter': "(eq,instantiatedInfo/vnfState,'ACTIVE')"},
{'filter': "(eq,instantiatedInfo/instanceId,'dummy_vnf_id')"}, {'filter': "(eq,instantiatedInfo/instanceId,'dummy_vnf_id')"},
{'filter': {'filter':

23
tacker/tests/unit/vnfpkgm/test_controller.py
View File

@ -262,12 +262,12 @@ class TestController(base.TestCase):
@mock.patch.object(VnfPackagesList, "get_by_filters") @mock.patch.object(VnfPackagesList, "get_by_filters")
@ddt.data( @ddt.data(
{'filter': '(eq,vnfdId,dummy_vnfd_id)'}, {'filter': '(eq,vnfdId,%s)' % constants.UUID},
{'filter': '(in,vnfdId,dummy_vnfd_id)'}, {'filter': '(in,vnfdId,%s)' % constants.UUID},
{'filter': '(cont,vnfdId,dummy_vnfd_id)'}, {'filter': '(cont,vnfdId,%s)' % constants.UUID},
{'filter': '(neq,vnfdId,dummy_vnfd_id)'}, {'filter': '(neq,vnfdId,%s)' % constants.UUID},
{'filter': '(nin,vnfdId,dummy_vnfd_id)'}, {'filter': '(nin,vnfdId,%s)' % constants.UUID},
{'filter': '(ncont,vnfdId,dummy_vnfd_id)'}, {'filter': '(ncont,vnfdId,%s)' % constants.UUID},
{'filter': '(gt,softwareImages/createdAt,2020-03-11 04:10:15+00:00)'}, {'filter': '(gt,softwareImages/createdAt,2020-03-11 04:10:15+00:00)'},
{'filter': '(gte,softwareImages/createdAt,2020-03-14 04:10:15+00:00)'}, {'filter': '(gte,softwareImages/createdAt,2020-03-14 04:10:15+00:00)'},
{'filter': '(lt,softwareImages/createdAt,2020-03-20 04:10:15+00:00)'}, {'filter': '(lt,softwareImages/createdAt,2020-03-20 04:10:15+00:00)'},
@ -302,7 +302,8 @@ class TestController(base.TestCase):
@mock.patch.object(VnfPackagesList, "get_by_filters") @mock.patch.object(VnfPackagesList, "get_by_filters")
def test_index_filter_combination(self, mock_vnf_list): def test_index_filter_combination(self, mock_vnf_list):
"""Test multiple filter parameters separated by semicolon """ """Test multiple filter parameters separated by semicolon """
params = {'filter': '(eq,vnfdId,dummy_vnfd_id);(eq,id,dummy_id)'} params = {'filter': '(eq,vnfdId,%s);(eq,id,%s)' %
(constants.UUID, constants.UUID)}
query = urllib.parse.urlencode(params) query = urllib.parse.urlencode(params)
req = fake_request.HTTPRequest.blank('/vnfpkgm/v1/vnf_packages?' + req = fake_request.HTTPRequest.blank('/vnfpkgm/v1/vnf_packages?' +
query) query)
@ -318,8 +319,8 @@ class TestController(base.TestCase):
@mock.patch.object(VnfPackagesList, "get_by_filters") @mock.patch.object(VnfPackagesList, "get_by_filters")
@ddt.data( @ddt.data(
{'filter': '(eq,id,dummy_value)'}, {'filter': '(eq,id,%s)' % constants.UUID},
{'filter': '(eq,vnfdId,dummy_value)'}, {'filter': '(eq,vnfdId,%s)' % constants.UUID},
{'filter': '(eq,onboardingState,ONBOARDED)'}, {'filter': '(eq,onboardingState,ONBOARDED)'},
{'filter': '(eq,operationalState,ENABLED)'}, {'filter': '(eq,operationalState,ENABLED)'},
{'filter': '(eq,usageState,NOT_IN_USE)'}, {'filter': '(eq,usageState,NOT_IN_USE)'},
@ -330,7 +331,7 @@ class TestController(base.TestCase):
{'filter': '(eq,userDefinedData/key1,dummy_value)'}, {'filter': '(eq,userDefinedData/key1,dummy_value)'},
{'filter': '(eq,checksum/algorithm,dummy_value)'}, {'filter': '(eq,checksum/algorithm,dummy_value)'},
{'filter': '(eq,checksum/hash,dummy_value)'}, {'filter': '(eq,checksum/hash,dummy_value)'},
{'filter': '(eq,softwareImages/id,dummy_value)'}, {'filter': '(eq,softwareImages/id,%s)' % constants.UUID},
{'filter': '(eq,softwareImages/imagePath,dummy_value)'}, {'filter': '(eq,softwareImages/imagePath,dummy_value)'},
{'filter': '(eq,softwareImages/diskFormat,dummy_value)'}, {'filter': '(eq,softwareImages/diskFormat,dummy_value)'},
{'filter': '(eq,softwareImages/userMetadata/key3,dummy_value)'}, {'filter': '(eq,softwareImages/userMetadata/key3,dummy_value)'},
@ -464,6 +465,8 @@ class TestController(base.TestCase):
@mock.patch.object(VnfPackagesList, "get_by_filters") @mock.patch.object(VnfPackagesList, "get_by_filters")
@ddt.data( @ddt.data(
{'filter': '(eq,id,fake_value)'},
{'filter': '(eq,vnfd_id,fake_value)'},
{'filter': '(eq,operationalState,fake_value)'}, {'filter': '(eq,operationalState,fake_value)'},
{'filter': '(eq,softwareImages/size,fake_value)'}, {'filter': '(eq,softwareImages/size,fake_value)'},
{'filter': '(gt,softwareImages/createdAt,fake_value)'}, {'filter': '(gt,softwareImages/createdAt,fake_value)'},