openstack
/
cinder
Code Issues Proposed changes

Merge "Allow using forward slashes in metadata" into stable/rocky

This commit is contained in:
Zuul 2018-10-22 16:21:04 +00:00 committed by Gerrit Code Review
parent a5cb26e30d d59b432ddd
commit c118e8f92c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/api/validation/parameter_types.py
View File

@ -147,7 +147,7 @@ uuid = {
extra_specs = {
'type': 'object',
'patternProperties': {
'^[a-zA-Z0-9-_:. ]{1,255}$': {
'^[a-zA-Z0-9-_:. /]{1,255}$': {
'type': 'string', 'maxLength': 255
}
},
@ -173,7 +173,7 @@ group_snapshot_status = {
extra_specs_with_null = copy.deepcopy(extra_specs)
extra_specs_with_null['patternProperties'][
'^[a-zA-Z0-9-_:. ]{1,255}$']['type'] = ['string', 'null']
'^[a-zA-Z0-9-_:. /]{1,255}$']['type'] = ['string', 'null']
name_allow_zero_min_length = {

3
cinder/tests/functional/test_volumes.py
View File

@ -82,7 +82,8 @@ class VolumesTest(functional_helpers._FunctionalTestBase):
# Create volume
metadata = {'key1': 'value1',
'key2': 'value2'}
'key2': 'value2',
'volume/created/by': 'cinder'}
created_volume = self.api.post_volume(
{'volume': {'size': 1,
'metadata': metadata}})