f41751cb04
Change I6488cc89e60a31605ddf80c7aa56ddf4871d3c1a added schema validation for volume type encryption, but it locked things down in a non-backwards compatible way by not allowing extra parameters. This has caused problems for at least Horizon. If we are going change this to not be backwards compatible it should include a microversion bump and moving the endpoint out of contrib to a standard endpoint. To keep some schema validation at least, this just allows extra parameters so existing API consumers should be unaffected. We can address locking things down better in a future release when we have time to do it right. Closes-bug: #1783467 Closes-bug: #1786054 Change-Id: I45c254eca69471509e7ae4c957df51282e2d1776 Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
46 lines
1.5 KiB
Python
46 lines
1.5 KiB
Python
# Copyright (C) 2018 NTT DATA
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""Schema for V3 volume type encryption API."""
|
|
|
|
import copy
|
|
|
|
from cinder.api.validation import parameter_types
|
|
|
|
create = {
|
|
'type': 'object',
|
|
'properties': {
|
|
'encryption': {
|
|
'type': 'object',
|
|
'properties': {
|
|
'key_size': parameter_types.key_size,
|
|
'provider': {'type': 'string', 'minLength': 0,
|
|
'maxLength': 255},
|
|
'control_location': {'enum': ['front-end', 'back-end']},
|
|
'cipher': {'type': ['string', 'null'],
|
|
'minLength': 0, 'maxLength': 255},
|
|
},
|
|
'required': ['provider', 'control_location'],
|
|
'additionalProperties': True,
|
|
},
|
|
},
|
|
'required': ['encryption'],
|
|
'additionalProperties': False,
|
|
}
|
|
|
|
|
|
update = copy.deepcopy(create)
|
|
update['properties']['encryption']['required'] = []
|