7b2c467df1
On v2.1 API schemas, there is much duplicated code related to ip address validation. This patch adds parameter_types.ip_address and replaces the duplicated code with it for cleanup. NOTE: "fixed_ip" parameter of "create a server" API contained null as allowed type, but this patch replaces it with parameter_types. ip_address which doesn't contain null type. Because "fixed_ip" is not required on the schema and nova can get null if not passing "fixed_ip" (ref: _get_requested_networks()). On v2.1 API, we are implementing this kind of strict validation and this patch also applies it. Partially implements blueprint v2-on-v3-api Change-Id: I3c681578a5f56e873ee022201b389432900eef07
49 lines
1.4 KiB
Python
49 lines
1.4 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.
|
|
|
|
from nova.api.validation import parameter_types
|
|
|
|
|
|
create = {
|
|
'type': 'object',
|
|
'properties': {
|
|
'cloudpipe': {
|
|
'type': 'object',
|
|
'properties': {
|
|
'project_id': parameter_types.project_id,
|
|
},
|
|
'additionalProperties': False,
|
|
},
|
|
},
|
|
'required': ['cloudpipe'],
|
|
'additionalProperties': False,
|
|
}
|
|
|
|
update = {
|
|
'type': 'object',
|
|
'properties': {
|
|
'configure_project': {
|
|
'type': 'object',
|
|
'properties': {
|
|
'vpn_ip': parameter_types.ip_address,
|
|
'vpn_port': parameter_types.tcp_udp_port,
|
|
},
|
|
'required': ['vpn_ip', 'vpn_port'],
|
|
'additionalProperties': False,
|
|
},
|
|
},
|
|
'required': ['configure_project'],
|
|
'additionalProperties': False,
|
|
}
|