5cc5a84110
Nova API checks that the value of the group scheduler hint shall be a valid server-group uuid, however it was done by custom code not jsonschema. Moreover the exception was not handled by the API so both v2.0 and v.2.1 returned HTTP 500 if the group hint wasn't a valid uuid of an existing server group. The custom code to check for the validity of the group uuid is kept in nova.compute.api as it is still needed in v2.0. In v2.0 InstanceGroupNotFound exception are now translated to HTTPBadRequest. In v2.1 the scheduler_hint jsonschema is now extended to check the format of the group hint and the api is now translates the InstanceGroupNotFound to HTTPBadRequest. Closes-bug: #1535759 Change-Id: I38d98c74f6cceed5b4becf9ed67f7189cba479fa
79 lines
2.6 KiB
Python
79 lines
2.6 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': {
|
|
'type': 'string',
|
|
'format': 'uuid'
|
|
},
|
|
'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.
|
|
'oneOf': [
|
|
{
|
|
'type': 'string',
|
|
'format': 'uuid'
|
|
},
|
|
{
|
|
'type': 'array',
|
|
'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,
|
|
'different_cell': {
|
|
'type': ['string', 'array'],
|
|
'items': {
|
|
'type': 'string'
|
|
}
|
|
},
|
|
'build_near_host_ip': parameter_types.ip_address,
|
|
'cidr': {
|
|
'type': 'string',
|
|
'pattern': '^\/[0-9a-f.:]+$'
|
|
},
|
|
},
|
|
# NOTE: As this Mail:
|
|
# http://lists.openstack.org/pipermail/openstack-dev/2015-June/067996.html
|
|
# pointed out the limit the scheduler-hints in the API is problematic. So
|
|
# relax it.
|
|
'additionalProperties': True
|
|
}
|
|
|
|
|
|
server_create = {
|
|
'os:scheduler_hints': _hints,
|
|
'OS-SCH-HNT:scheduler_hints': _hints,
|
|
}
|