openstack
/
keystone
Code Issues Proposed changes

Merge "Set Default and resource limit as defined schema"

This commit is contained in:
Zuul 2018-10-30 21:24:57 +00:00 committed by Gerrit Code Review
parent d15c0fe5f4 230ae86a62
commit 7024d0c440
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keystone/limit/schema.py
View File

@ -26,7 +26,9 @@ _registered_limit_properties = {
'maxLength': 255 'maxLength': 255
}, },
'default_limit': { 'default_limit': {
'type': 'integer' 'type': 'integer',
'minimum': -1,
'maximum': 0x7FFFFFFF # The maximum value a signed INT may have
}, },
'description': validation.nullable(parameter_types.description) 'description': validation.nullable(parameter_types.description)
} }
@ -61,7 +63,9 @@ _limit_create_properties = {
'maxLength': 255 'maxLength': 255
}, },
'resource_limit': { 'resource_limit': {
'type': 'integer' 'type': 'integer',
'minimum': -1,
'maximum': 0x7FFFFFFF # The maximum value a signed INT may have
}, },
'description': validation.nullable(parameter_types.description) 'description': validation.nullable(parameter_types.description)
} }
@ -81,7 +85,9 @@ limit_create = {
_limit_update_properties = { _limit_update_properties = {
'resource_limit': { 'resource_limit': {
'type': 'integer' 'type': 'integer',
'minimum': -1,
'maximum': 0x7FFFFFFF # The maximum value a signed INT may have
}, },
'description': validation.nullable(parameter_types.description) 'description': validation.nullable(parameter_types.description)
} }

28
keystone/tests/unit/test_validation.py
View File

@ -2563,6 +2563,8 @@ class LimitValidationTestCase(unit.BaseTestCase):
{'resource_name': ''}, {'resource_name': ''},
{'resource_name': 'a' * 256}, {'resource_name': 'a' * 256},
{'default_limit': 'not_int'}, {'default_limit': 'not_int'},
{'default_limit': -10},
{'default_limit': 10000000000000000},
{'description': 123}, {'description': 123},
{'description': True}] {'description': True}]
for invalid_desc in _INVALID_FORMATS: for invalid_desc in _INVALID_FORMATS:
@ -2584,6 +2586,8 @@ class LimitValidationTestCase(unit.BaseTestCase):
{'resource_name': ''}, {'resource_name': ''},
{'resource_name': 'a' * 256}, {'resource_name': 'a' * 256},
{'default_limit': 'not_int'}, {'default_limit': 'not_int'},
{'default_limit': -10},
{'default_limit': 10000000000000000},
{'description': 123}] {'description': 123}]
for invalid_desc in _INVALID_FORMATS: for invalid_desc in _INVALID_FORMATS:
request_to_validate = {'service_id': uuid.uuid4().hex, request_to_validate = {'service_id': uuid.uuid4().hex,
@ -2667,6 +2671,8 @@ class LimitValidationTestCase(unit.BaseTestCase):
{'resource_name': 123}, {'resource_name': 123},
{'resource_name': ''}, {'resource_name': ''},
{'resource_name': 'a' * 256}, {'resource_name': 'a' * 256},
{'resource_limit': -10},
{'resource_limit': 10000000000000000},
{'resource_limit': 'not_int'}, {'resource_limit': 'not_int'},
{'description': 123}] {'description': 123}]
for invalid_desc in _INVALID_FORMATS: for invalid_desc in _INVALID_FORMATS:
@ -2683,11 +2689,25 @@ class LimitValidationTestCase(unit.BaseTestCase):
request_to_validate) request_to_validate)
def test_validate_limit_update_request_with_invalid_input(self): def test_validate_limit_update_request_with_invalid_input(self):
request_to_validate = {'resource_limit': 'not_int'} _INVALID_FORMATS = [{'resource_name': 123},
{'resource_limit': 'not_int'},
{'resource_name': ''},
{'resource_name': 'a' * 256},
{'resource_limit': -10},
{'resource_limit': 10000000000000000},
{'description': 123}]
for invalid_desc in _INVALID_FORMATS:
request_to_validate = [{'project_id': uuid.uuid4().hex,
'service_id': uuid.uuid4().hex,
'region_id': 'RegionOne',
'resource_name': 'volume',
'resource_limit': 10,
'description': 'test description'}]
request_to_validate[0].update(invalid_desc)
self.assertRaises(exception.SchemaValidationError, self.assertRaises(exception.SchemaValidationError,
self.update_limits_validator.validate, self.update_limits_validator.validate,
request_to_validate) request_to_validate)
def test_validate_limit_create_request_with_addition_input_fails(self): def test_validate_limit_create_request_with_addition_input_fails(self):
request_to_validate = [{'service_id': uuid.uuid4().hex, request_to_validate = [{'service_id': uuid.uuid4().hex,