From f41751cb04dc934c79ef7090aad23b807a7d9bbc Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Wed, 8 Aug 2018 14:34:22 -0500 Subject: [PATCH] Allow extra parameters in volume_type_encryption 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 --- cinder/api/schemas/volume_type_encryption.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cinder/api/schemas/volume_type_encryption.py b/cinder/api/schemas/volume_type_encryption.py index 179dbef059d..4ee55a3d515 100644 --- a/cinder/api/schemas/volume_type_encryption.py +++ b/cinder/api/schemas/volume_type_encryption.py @@ -13,10 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -""" -Schema for V3 volume type encryption API. +"""Schema for V3 volume type encryption API.""" -""" import copy from cinder.api.validation import parameter_types @@ -35,7 +33,7 @@ create = { 'minLength': 0, 'maxLength': 255}, }, 'required': ['provider', 'control_location'], - 'additionalProperties': False, + 'additionalProperties': True, }, }, 'required': ['encryption'],