Matt Riedemann
e34f05edb2
The legacy v2 API allowed None for the boot_index [1]. It allowed this implicitly because the API code would convert the block_device_mapping_v2 dict from the request into a BlockDeviceMapping object, which has a boot_index field that is nullable (allows None). The API reference documentation [2] also says: "To disable a device from booting, set the boot index to a negative value or use the default boot index value, which is None." It appears that with the move to v2.1 and request schema validation, the boot_index schema was erroneously set to not allow None for a value, which is not backward compatible with the v2 API behavior. This change fixes the schema to allow boot_index=None again and adds a test to show it working. This should not require a microversion bump since it's fixing a regression in the v2.1 API which worked in the v2 API and is already handled throughout Nova's block device code. Closes-Bug: #1662699 [1] https://github.com/openstack/nova/blob/13.0.0/nova/compute/api.py#L1268 [2] http://developer.openstack.org/api-ref/compute/#create-server Change-Id: Ice78a0982bcce491f0c9690903ed2c6b6aaab1be
88 lines
2.8 KiB
Python
88 lines
2.8 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.
|
|
|
|
import copy
|
|
|
|
from nova.api.openstack.compute.schemas import block_device_mapping_v1
|
|
from nova.api.validation import parameter_types
|
|
|
|
|
|
block_device_mapping_new_item = {
|
|
# defined in nova/block_device.py:from_api()
|
|
# NOTE: Client can specify the Id with the combination of
|
|
# source_type and uuid, or a single attribute like volume_id/
|
|
# image_id/snapshot_id.
|
|
'source_type': {
|
|
'type': 'string',
|
|
'enum': ['volume', 'image', 'snapshot', 'blank'],
|
|
},
|
|
'uuid': {
|
|
'type': 'string', 'minLength': 1, 'maxLength': 255,
|
|
'pattern': '^[a-zA-Z0-9._-]*$',
|
|
},
|
|
'image_id': parameter_types.image_id,
|
|
'destination_type': {
|
|
'type': 'string',
|
|
'enum': ['local', 'volume'],
|
|
},
|
|
# Defined as varchar(255) in column "guest_format" in table
|
|
# "block_device_mapping"
|
|
'guest_format': {
|
|
'type': 'string', 'maxLength': 255,
|
|
},
|
|
# Defined as varchar(255) in column "device_type" in table
|
|
# "block_device_mapping"
|
|
'device_type': {
|
|
'type': 'string', 'maxLength': 255,
|
|
},
|
|
# Defined as varchar(255) in column "disk_bus" in table
|
|
# "block_device_mapping"
|
|
'disk_bus': {
|
|
'type': 'string', 'maxLength': 255,
|
|
},
|
|
# Defined as integer in nova/block_device.py:from_api()
|
|
# NOTE(mriedem): boot_index=None is also accepted for backward
|
|
# compatibility with the legacy v2 API.
|
|
'boot_index': {
|
|
'type': ['integer', 'string', 'null'],
|
|
'pattern': '^-?[0-9]+$',
|
|
},
|
|
}
|
|
|
|
block_device_mapping = copy.deepcopy(
|
|
block_device_mapping_v1.legacy_block_device_mapping)
|
|
block_device_mapping['properties'].update(block_device_mapping_new_item)
|
|
|
|
server_create = {
|
|
'block_device_mapping_v2': {
|
|
'type': 'array',
|
|
'items': block_device_mapping
|
|
}
|
|
}
|
|
|
|
block_device_mapping_with_tags_new_item = {
|
|
'tag': parameter_types.tag
|
|
}
|
|
|
|
block_device_mapping_with_tags = copy.deepcopy(block_device_mapping)
|
|
block_device_mapping_with_tags['properties'].update(
|
|
block_device_mapping_with_tags_new_item)
|
|
|
|
server_create_with_tags = {
|
|
'block_device_mapping_v2': {
|
|
'type': 'array',
|
|
'items': block_device_mapping_with_tags
|
|
}
|
|
}
|