@@ -3194,6 +3194,7 @@ def test_get_instance_block_device_info_source_image(self):
3194
3194
'image_id': uuids.image,
3195
3195
'boot_index': 0
3196
3196
})])
3197
+ driver_bdms = driver_block_device.convert_all_volumes(*bdms)
3197
3198
3198
3199
with (mock.patch.object(
3199
3200
objects.BlockDeviceMappingList,
@@ -3208,13 +3209,7 @@ def test_get_instance_block_device_info_source_image(self):
3208
3209
'swap': None,
3209
3210
'ephemerals': [],
3210
3211
'root_device_name': None,
3211
- 'block_device_mapping': [{
3212
- 'connection_info': {
3213
- 'driver_volume_type': 'rbd'
3214
- },
3215
- 'mount_device': '/dev/vda',
3216
- 'delete_on_termination': False
3217
- }]
3212
+ 'block_device_mapping': driver_bdms
3218
3213
}
3219
3214
self.assertTrue(mock_get_by_instance.called)
3220
3215
self.assertEqual(block_device_info, expected)
@@ -3229,6 +3224,8 @@ def test_get_instance_block_device_info_passed_bdms(self):
3229
3224
'source_type': 'volume',
3230
3225
'destination_type': 'volume'})
3231
3226
])
3227
+ driver_bdms = driver_block_device.convert_all_volumes(*bdms)
3228
+
3232
3229
with (mock.patch.object(
3233
3230
objects.BlockDeviceMappingList,
3234
3231
'get_by_instance_uuid')) as mock_get_by_instance:
@@ -3240,13 +3237,7 @@ def test_get_instance_block_device_info_passed_bdms(self):
3240
3237
'swap': None,
3241
3238
'ephemerals': [],
3242
3239
'root_device_name': None,
3243
- 'block_device_mapping': [{
3244
- 'connection_info': {
3245
- 'driver_volume_type': 'rbd'
3246
- },
3247
- 'mount_device': '/dev/vdd',
3248
- 'delete_on_termination': False
3249
- }]
3240
+ 'block_device_mapping': driver_bdms
3250
3241
}
3251
3242
self.assertFalse(mock_get_by_instance.called)
3252
3243
self.assertEqual(block_device_info, expected)
@@ -3302,11 +3293,27 @@ def test_get_instance_block_device_info_swap_and_ephemerals(self):
3302
3293
'get_by_instance_uuid', return_value=bdms)
3303
3294
) as mock_get_by_instance_uuid:
3304
3295
expected_block_device_info = {
3305
- 'swap': {'device_name': '/dev/vdd', 'swap_size': 1},
3306
- 'ephemerals': [{'device_name': '/dev/vdb', 'num': 0, 'size': 1,
3307
- 'virtual_name': 'ephemeral0'},
3308
- {'device_name': '/dev/vdc', 'num': 1, 'size': 2,
3309
- 'virtual_name': 'ephemeral1'}],
3296
+ 'swap': {
3297
+ 'device_name': '/dev/vdd',
3298
+ 'swap_size': 1,
3299
+ 'disk_bus': 'virtio'
3300
+ },
3301
+ 'ephemerals': [
3302
+ {
3303
+ 'device_name': '/dev/vdb',
3304
+ 'device_type': 'disk',
3305
+ 'disk_bus': 'virtio',
3306
+ 'guest_format': None,
3307
+ 'size': 1
3308
+ },
3309
+ {
3310
+ 'device_name': '/dev/vdc',
3311
+ 'device_type': 'disk',
3312
+ 'disk_bus': 'virtio',
3313
+ 'guest_format': None,
3314
+ 'size': 2
3315
+ }
3316
+ ],
3310
3317
'block_device_mapping': [],
3311
3318
'root_device_name': None
3312
3319
}
0 commit comments