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
63 lines
2.3 KiB
Python
63 lines
2.3 KiB
Python
# Copyright 2014 NEC 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
|
|
|
|
|
|
_hints = {
|
|
'type': 'object',
|
|
'properties': {
|
|
'group': {
|
|
# NOTE: The value of 'group' is stored to value which is
|
|
# defined as varchar(255) in instance_system_metadata table.
|
|
'type': 'string', 'maxLength': 255,
|
|
},
|
|
'different_host': {
|
|
# NOTE: The value of 'different_host' is the set of server
|
|
# uuids where a new server is scheduled on a different host.
|
|
# A user can specify one server as string parameter and should
|
|
# specify multiple servers as array parameter instead.
|
|
'type': ['string', 'array'],
|
|
'format': 'uuid',
|
|
'items': parameter_types.server_id
|
|
},
|
|
'same_host': {
|
|
# NOTE: The value of 'different_host' is the set of server
|
|
# uuids where a new server is scheduled on the same host.
|
|
'type': ['string', 'array'],
|
|
'items': parameter_types.server_id
|
|
},
|
|
'query': {
|
|
# NOTE: The value of 'query' is converted to dict data with
|
|
# jsonutils.loads() and used for filtering hosts.
|
|
'type': ['string', 'object'],
|
|
},
|
|
# NOTE: The value of 'target_cell' is the cell name what cell
|
|
# a new server is scheduled on.
|
|
'target_cell': parameter_types.name,
|
|
'build_near_host_ip': parameter_types.ip_address,
|
|
'cidr': {
|
|
'type': 'string',
|
|
'pattern': '^\/[0-9a-f.:]+$'
|
|
},
|
|
},
|
|
'additionalProperties': False
|
|
}
|
|
|
|
|
|
server_create = {
|
|
'os:scheduler_hints': _hints,
|
|
'OS-SCH-HNT:scheduler_hints': _hints,
|
|
}
|