Stephen Finucane
9c8d51fa0c
All APIs except the root version APIs now use strict query string parsing. A test is added to ensure same. A couple of tests need to be updated since they were using the wrong path: while the path is ignored when calling the controllers directly, the query strings are not. Change-Id: I6dcb5b8f1f865df8f6b17cd7f0d730c3bdff241e Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
91 lines
2.9 KiB
Python
91 lines
2.9 KiB
Python
# Copyright 2014 IBM Corporation. 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.
|
|
|
|
import copy
|
|
|
|
from nova.api.validation import parameter_types
|
|
|
|
create = {
|
|
'type': 'object',
|
|
'properties': {
|
|
'snapshot': {
|
|
'type': 'object',
|
|
'properties': {
|
|
'volume_id': {
|
|
'type': 'string', 'minLength': 1,
|
|
},
|
|
'create_info': {
|
|
'type': 'object',
|
|
'properties': {
|
|
'snapshot_id': {
|
|
'type': 'string', 'minLength': 1,
|
|
},
|
|
'type': {
|
|
'type': 'string', 'enum': ['qcow2'],
|
|
},
|
|
'new_file': {
|
|
'type': 'string', 'minLength': 1,
|
|
},
|
|
'id': {
|
|
'type': 'string', 'minLength': 1,
|
|
},
|
|
},
|
|
'required': ['snapshot_id', 'type', 'new_file'],
|
|
'additionalProperties': False,
|
|
},
|
|
},
|
|
'required': ['volume_id', 'create_info'],
|
|
'additionalProperties': False,
|
|
}
|
|
},
|
|
'required': ['snapshot'],
|
|
'additionalProperties': False,
|
|
}
|
|
|
|
delete_query = {
|
|
'type': 'object',
|
|
'properties': {
|
|
'delete_info': parameter_types.multi_params({'type': 'string'})
|
|
},
|
|
# NOTE(gmann): This is kept True to keep backward compatibility.
|
|
# As of now Schema validation stripped out the additional parameters and
|
|
# does not raise 400. In microversion 2.75, we have blocked the additional
|
|
# parameters.
|
|
'additionalProperties': True
|
|
}
|
|
|
|
delete_query_v275 = copy.deepcopy(delete_query)
|
|
delete_query_v275['additionalProperties'] = False
|
|
|
|
create_response = {
|
|
'type': 'object',
|
|
'properties': {
|
|
'snapshot': {
|
|
'type': 'object',
|
|
'properties': {
|
|
'id': {'type': ['null', 'string'], 'format': 'uuid'},
|
|
'volumeId': {'type': 'string', 'format': 'uuid'},
|
|
},
|
|
'required': ['id', 'volumeId'],
|
|
'additionalProperties': False,
|
|
},
|
|
},
|
|
'required': ['snapshot'],
|
|
'additionalProperties': False,
|
|
}
|
|
|
|
delete_response = {
|
|
'type': 'null',
|
|
}
|