openstack/cinder
Code Issues Proposed changes

Merge "Use utils.validate_dictionary_string_length"

Browse Source
This commit is contained in:
Jenkins
2016-08-31 05:16:29 +00:00
committed by Gerrit Code Review
parent 1d0e7d0603 3d036a5198
commit 8e32bc047a
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cinder/api/v3/group_specs.py
+3 -13
View File
@@ -23,6 +23,7 @@ from cinder import exception
from cinder.i18n import _
from cinder import policy
from cinder import rpc
from cinder import utils
from cinder.volume import group_types
@@ -57,17 +58,6 @@ class GroupTypeSpecsController(wsgi.Controller):
self._check_type(context, group_type_id)
return self._get_group_specs(context, group_type_id)
def _validate_group_specs(self, specs):
"""Validating key and value of group specs."""
for key, value in specs.items():
if key is not None:
self.validate_string_length(key, 'Key "%s"' % key,
min_length=1, max_length=255)
if value is not None:
self.validate_string_length(value, 'Value for key "%s"' % key,
min_length=0, max_length=255)
@wsgi.Controller.api_version('3.11')
@wsgi.response(202)
def create(self, req, group_type_id, body=None):
@@ -78,7 +68,7 @@ class GroupTypeSpecsController(wsgi.Controller):
self._check_type(context, group_type_id)
specs = body['group_specs']
self._check_key_names(specs.keys())
self._validate_group_specs(specs)
utils.validate_dictionary_string_length(specs)
db.group_type_specs_update_or_create(context,
group_type_id,
@@ -105,7 +95,7 @@ class GroupTypeSpecsController(wsgi.Controller):
expl = _('Request body contains too many items')
raise webob.exc.HTTPBadRequest(explanation=expl)
self._check_key_names(body.keys())
self._validate_group_specs(body)
utils.validate_dictionary_string_length(body)
db.group_type_specs_update_or_create(context,
group_type_id,