Browse Source

Merge "compute: Validate a BDMs disk_bus when provided"

changes/20/744020/2
Zuul 4 days ago
committed by Gerrit Code Review
parent
commit
e1dd204b54
7 changed files with 38 additions and 4 deletions
  1. +4
    -3
      api-ref/source/parameters.yaml
  2. +1
    -0
      nova/api/openstack/compute/servers.py
  3. +7
    -0
      nova/compute/api.py
  4. +5
    -0
      nova/exception.py
  5. +2
    -0
      nova/objects/fields.py
  6. +2
    -1
      nova/tests/unit/api/openstack/compute/test_serversV21.py
  7. +17
    -0
      nova/tests/unit/compute/test_compute_api.py

+ 4
- 3
api-ref/source/parameters.yaml View File

@@ -2515,9 +2515,10 @@ disk_available_least_total:
disk_bus:
description: |
Disk bus type, some hypervisors (currently only libvirt) support
specify this parameter. Some example disk_bus values can be: `ide`,
`usb`, `virtio`, `scsi`. This is not an exhaustive list as it depends
on the virtualization driver, and may change as more support is added.
specify this parameter. Some example disk_bus values can be: ``fdc``,
``ide``, ``sata``, ``scsi``, ``usb``, ``virtio``, ``xen``, ``lxc``
and ``uml``. Support for each bus type depends on the virtualization driver
and underlying hypervisor.
in: body
required: false
type: string


+ 1
- 0
nova/api/openstack/compute/servers.py View File

@@ -752,6 +752,7 @@ class ServersController(wsgi.Controller):
exception.InvalidBDMEphemeralSize,
exception.InvalidBDMFormat,
exception.InvalidBDMSwapSize,
exception.InvalidBDMDiskBus,
exception.VolumeTypeNotFound,
exception.AutoDiskConfigDisabledByImage,
exception.InstanceGroupNotFound,


+ 7
- 0
nova/compute/api.py View File

@@ -1771,6 +1771,13 @@ class API(base.Base):
"(source: 'blank', dest: 'volume') need to have non-zero "
"size"))

# NOTE(lyarwood): Ensure the disk_bus is at least known to Nova.
# The virt driver may reject this later but for now just ensure
# it's listed as an acceptable value of the DiskBus field class.
disk_bus = bdm.disk_bus if 'disk_bus' in bdm else None
if disk_bus and disk_bus not in fields_obj.DiskBus.ALL:
raise exception.InvalidBDMDiskBus(disk_bus=disk_bus)

ephemeral_size = sum(bdm.volume_size or instance_type['ephemeral_gb']
for bdm in block_device_mappings
if block_device.new_format_is_ephemeral(bdm))


+ 5
- 0
nova/exception.py View File

@@ -251,6 +251,11 @@ class TooManyDiskDevices(InvalidBDM):
code = 403


class InvalidBDMDiskBus(InvalidBDM):
msg_fmr = _("Block Device Mapping is invalid: The provided disk bus "
"%(disk_bus)s is not valid.")


class InvalidAttribute(Invalid):
msg_fmt = _("Attribute not supported: %(attr)s")



+ 2
- 0
nova/objects/fields.py View File

@@ -341,6 +341,8 @@ class DiskBus(BaseNovaEnum):

# NOTE(aspiers): If you change this, don't forget to update the
# docs and metadata for hw_*_bus in glance.
# NOTE(lyarwood): Also update the possible values in the api-ref for the
# block_device_mapping_v2.disk_bus parameter.
FDC = "fdc"
IDE = "ide"
SATA = "sata"


+ 2
- 1
nova/tests/unit/api/openstack/compute/test_serversV21.py View File

@@ -5056,7 +5056,8 @@ class ServersControllerCreateTest(test.TestCase):
(exception.InvalidBDMVolume, {'id': 'fake'}),
(exception.InvalidBDMImage, {'id': 'fake'}),
(exception.InvalidBDMBootSequence, {}),
(exception.InvalidBDMLocalsLimit, {}))
(exception.InvalidBDMLocalsLimit, {}),
(exception.InvalidBDMDiskBus, {'disk_bus': 'foo'}))

ex_iter = iter(bdm_exceptions)



+ 17
- 0
nova/tests/unit/compute/test_compute_api.py View File

@@ -4616,6 +4616,23 @@ class _ComputeAPIUnitTestMixIn(object):
bdms, image_cache, volumes)
mock_get_image.assert_called_once_with(self.context, image_id)

@mock.patch('nova.compute.api.API._get_image')
def test_validate_bdm_disk_bus(self, mock_get_image):
"""Tests that _validate_bdm fail if an invalid disk_bus is provided
"""
instance = self._create_instance_obj()
bdms = objects.BlockDeviceMappingList(objects=[
objects.BlockDeviceMapping(
boot_index=0, image_id=instance.image_ref,
source_type='image', destination_type='volume',
volume_type=None, snapshot_id=None, volume_id=None,
volume_size=1, disk_bus='virtio-scsi')])
image_cache = volumes = {}
self.assertRaises(exception.InvalidBDMDiskBus,
self.compute_api._validate_bdm,
self.context, instance, objects.Flavor(),
bdms, image_cache, volumes)

def test_the_specified_volume_type_id_assignment_to_name(self):
"""Test _check_requested_volume_type method is called, if the user
is using the volume type ID, assign volume_type to volume type name.


Loading…
Cancel
Save