Merge "Switch server create to block_device_mapping_v2"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
d4c13676d1
@ -507,28 +507,40 @@ class CreateServer(command.ShowOne):
|
||||
"exception": e}
|
||||
)
|
||||
|
||||
block_device_mapping = {}
|
||||
block_device_mapping_v2 = []
|
||||
if volume:
|
||||
# When booting from volume, for now assume no other mappings
|
||||
# This device value is likely KVM-specific
|
||||
block_device_mapping = {'vda': volume}
|
||||
else:
|
||||
block_device_mapping_v2 = [{'uuid': volume,
|
||||
'boot_index': '0',
|
||||
'source_type': 'volume',
|
||||
'destination_type': 'volume'
|
||||
}]
|
||||
for dev_map in parsed_args.block_device_mapping:
|
||||
dev_key, dev_vol = dev_map.split('=', 1)
|
||||
block_volume = None
|
||||
if dev_vol:
|
||||
vol = dev_vol.split(':', 1)[0]
|
||||
if vol:
|
||||
vol_id = utils.find_resource(
|
||||
dev_name, dev_map = dev_map.split('=', 1)
|
||||
if dev_map:
|
||||
dev_map = dev_map.split(':')
|
||||
if len(dev_map) > 0:
|
||||
mapping = {
|
||||
'device_name': dev_name,
|
||||
'uuid': utils.find_resource(
|
||||
volume_client.volumes,
|
||||
vol,
|
||||
).id
|
||||
block_volume = dev_vol.replace(vol, vol_id)
|
||||
dev_map[0],
|
||||
).id}
|
||||
# Block device mapping v1 compatibility
|
||||
if len(dev_map) > 1 and \
|
||||
dev_map[1] in ('volume', 'snapshot'):
|
||||
mapping['source_type'] = dev_map[1]
|
||||
else:
|
||||
mapping['source_type'] = 'volume'
|
||||
mapping['destination_type'] = 'volume'
|
||||
if len(dev_map) > 2:
|
||||
mapping['volume_size'] = dev_map[2]
|
||||
if len(dev_map) > 3:
|
||||
mapping['delete_on_termination'] = dev_map[3]
|
||||
else:
|
||||
msg = _("Volume name or ID must be specified if "
|
||||
"--block-device-mapping is specified")
|
||||
raise exceptions.CommandError(msg)
|
||||
block_device_mapping.update({dev_key: block_volume})
|
||||
block_device_mapping_v2.append(mapping)
|
||||
|
||||
nics = []
|
||||
if parsed_args.nic in ('auto', 'none'):
|
||||
@ -598,7 +610,7 @@ class CreateServer(command.ShowOne):
|
||||
userdata=userdata,
|
||||
key_name=parsed_args.key_name,
|
||||
availability_zone=parsed_args.availability_zone,
|
||||
block_device_mapping=block_device_mapping,
|
||||
block_device_mapping_v2=block_device_mapping_v2,
|
||||
nics=nics,
|
||||
scheduler_hints=hints,
|
||||
config_drive=config_drive)
|
||||
|
||||
@ -417,19 +417,23 @@ class ServerTests(base.TestCase):
|
||||
|
||||
# NOTE(dtroyer): Prior to https://review.openstack.org/#/c/407111
|
||||
# --block-device-mapping was ignored if --volume
|
||||
# present on the command line, so this volume should
|
||||
# not be attached.
|
||||
# present on the command line. Now we should see the
|
||||
# attachment.
|
||||
cmd_output = json.loads(self.openstack(
|
||||
'volume show -f json ' +
|
||||
empty_volume_name
|
||||
))
|
||||
attachments = cmd_output['attachments']
|
||||
self.assertEqual(
|
||||
0,
|
||||
1,
|
||||
len(attachments),
|
||||
)
|
||||
self.assertEqual(
|
||||
"available",
|
||||
server['id'],
|
||||
attachments[0]['server_id'],
|
||||
)
|
||||
self.assertEqual(
|
||||
"in-use",
|
||||
cmd_output['status'],
|
||||
)
|
||||
|
||||
|
||||
@ -308,7 +308,7 @@ class TestServerCreate(TestServer):
|
||||
userdata=None,
|
||||
key_name=None,
|
||||
availability_zone=None,
|
||||
block_device_mapping={},
|
||||
block_device_mapping_v2=[],
|
||||
nics=[],
|
||||
scheduler_hints={},
|
||||
config_drive=None,
|
||||
@ -363,7 +363,7 @@ class TestServerCreate(TestServer):
|
||||
userdata=None,
|
||||
key_name='keyname',
|
||||
availability_zone=None,
|
||||
block_device_mapping={},
|
||||
block_device_mapping_v2=[],
|
||||
nics=[],
|
||||
scheduler_hints={'a': ['b', 'c']},
|
||||
config_drive=None,
|
||||
@ -443,7 +443,7 @@ class TestServerCreate(TestServer):
|
||||
userdata=None,
|
||||
key_name=None,
|
||||
availability_zone=None,
|
||||
block_device_mapping={},
|
||||
block_device_mapping_v2=[],
|
||||
nics=[{'net-id': 'net1_uuid',
|
||||
'v4-fixed-ip': '',
|
||||
'v6-fixed-ip': '',
|
||||
@ -500,7 +500,7 @@ class TestServerCreate(TestServer):
|
||||
userdata=None,
|
||||
key_name=None,
|
||||
availability_zone=None,
|
||||
block_device_mapping={},
|
||||
block_device_mapping_v2=[],
|
||||
nics=[],
|
||||
scheduler_hints={},
|
||||
config_drive=None,
|
||||
@ -550,7 +550,7 @@ class TestServerCreate(TestServer):
|
||||
userdata=None,
|
||||
key_name=None,
|
||||
availability_zone=None,
|
||||
block_device_mapping={},
|
||||
block_device_mapping_v2=[],
|
||||
nics=[],
|
||||
scheduler_hints={},
|
||||
config_drive=None,
|
||||
@ -605,7 +605,7 @@ class TestServerCreate(TestServer):
|
||||
userdata=mock_file,
|
||||
key_name=None,
|
||||
availability_zone=None,
|
||||
block_device_mapping={},
|
||||
block_device_mapping_v2=[],
|
||||
nics=[],
|
||||
scheduler_hints={},
|
||||
config_drive=None,
|
||||
@ -656,9 +656,14 @@ class TestServerCreate(TestServer):
|
||||
userdata=None,
|
||||
key_name=None,
|
||||
availability_zone=None,
|
||||
block_device_mapping={
|
||||
'vda': real_volume_mapping
|
||||
},
|
||||
block_device_mapping_v2=[{
|
||||
'device_name': 'vda',
|
||||
'uuid': real_volume_mapping.split(':', 1)[0],
|
||||
'destination_type': 'volume',
|
||||
'source_type': 'volume',
|
||||
'delete_on_termination': '0',
|
||||
'volume_size': ''
|
||||
}],
|
||||
nics=[],
|
||||
scheduler_hints={},
|
||||
config_drive=None,
|
||||
|
||||
16
releasenotes/notes/bug-1647406-c936581034a1b6e4.yaml
Normal file
16
releasenotes/notes/bug-1647406-c936581034a1b6e4.yaml
Normal file
@ -0,0 +1,16 @@
|
||||
---
|
||||
fixes:
|
||||
- |
|
||||
Allow ``--block-device-mapping`` option to work correctly with
|
||||
``--volume`` option in ``server create`` command.
|
||||
After :lpbug:`1383338` ``--block-device-mapping`` was ignored if
|
||||
``--volume`` was present. Block device mappings are now appended
|
||||
to the mapping created by the ``--volume`` option if it is present.
|
||||
The device name of the boot volume specificed in the ``--volume`` option
|
||||
is no longer assumed to be *'vda'* but now uses the hypervisor's boot
|
||||
index to obtain the device name. This maintains the status quo for
|
||||
**QEMU/KVM** hypervisors but **XEN**, **parallels** and others
|
||||
*virt types* that have device naming is different from ``vd*``
|
||||
should now also work correctly.
|
||||
[:lpbug:`1497845`]
|
||||
[:lpbug:`1647406`]
|
||||
Loading…
Reference in New Issue
Block a user