"""Prepare disks for VM instance successfully."""
existing_vim_volumes = []
created_items = {}
+ block_device_mapping = {}
vm_av_zone = ["nova"]
mock_root_volumes.return_value = root_vol_id
self.vimconn.cinder = CopyingMock()
self.vimconn._prepare_disk_for_vminstance(
- name, existing_vim_volumes, created_items, vm_av_zone, disk_list2
+ name,
+ existing_vim_volumes,
+ created_items,
+ vm_av_zone,
+ block_device_mapping,
+ disk_list2,
)
self.vimconn.cinder.volumes.set_bootable.assert_called_once_with(
root_vol_id, True
existing_vim_volumes = []
created_items = {}
vm_av_zone = ["nova"]
+ block_device_mapping = {}
mock_root_volumes.return_value = root_vol_id
mock_created_vol_availability.return_value = 1700
with self.assertRaises(VimConnException) as err:
self.vimconn._prepare_disk_for_vminstance(
- name, existing_vim_volumes, created_items, vm_av_zone, disk_list2
+ name,
+ existing_vim_volumes,
+ created_items,
+ vm_av_zone,
+ block_device_mapping,
+ disk_list2,
)
self.assertEqual(
str(err.exception), "Timeout creating volumes for instance basicvm"
"""Disk list is empty."""
existing_vim_volumes = []
created_items = {}
+ block_device_mapping = {}
vm_av_zone = ["nova"]
mock_created_vol_availability.return_value = 2
mock_existing_vol_availability.return_value = 3
self.vimconn._prepare_disk_for_vminstance(
- name, existing_vim_volumes, created_items, vm_av_zone, disk_list
+ name,
+ existing_vim_volumes,
+ created_items,
+ vm_av_zone,
+ block_device_mapping,
+ disk_list,
)
self.vimconn.cinder.volumes.set_bootable.assert_not_called()
mock_created_vol_availability.assert_called_once_with(0, created_items)
existing_vim_volumes = []
created_items = {}
vm_av_zone = ["nova"]
+ block_device_mapping = {}
mock_root_volumes.side_effect = Exception()
mock_created_vol_availability.return_value = 10
with self.assertRaises(Exception):
self.vimconn._prepare_disk_for_vminstance(
- name, existing_vim_volumes, created_items, vm_av_zone, disk_list2
+ name,
+ existing_vim_volumes,
+ created_items,
+ vm_av_zone,
+ block_device_mapping,
+ disk_list2,
)
self.vimconn.cinder.volumes.set_bootable.assert_not_called()
mock_created_vol_availability.assert_not_called()
existing_vim_volumes = []
created_items = {}
vm_av_zone = ["nova"]
+ block_device_mapping = {}
mock_root_volumes.return_value = root_vol_id
mock_non_root_volumes.side_effect = Exception
with self.assertRaises(Exception):
self.vimconn._prepare_disk_for_vminstance(
- name, existing_vim_volumes, created_items, vm_av_zone, disk_list2
+ name,
+ existing_vim_volumes,
+ created_items,
+ vm_av_zone,
+ block_device_mapping,
+ disk_list2,
)
self.vimconn.cinder.volumes.set_bootable.assert_not_called()
mock_created_vol_availability.assert_not_called()
existing_vim_volumes=[],
created_items={},
vm_av_zone="nova",
+ block_device_mapping={},
disk_list=disk_list2,
)
self.vimconn.nova.servers.create.assert_called_once_with(
key_name="my_keypair",
userdata="userdata",
config_drive=True,
- block_device_mapping=None,
+ block_device_mapping={},
scheduler_hints={},
)
mock_time.assert_called_once()
existing_vim_volumes=[],
created_items={},
vm_av_zone="nova",
+ block_device_mapping={},
disk_list=disk_list2,
)
self.vimconn.nova.servers.create.assert_called_once_with(
key_name="my_keypair",
userdata="userdata",
config_drive=True,
- block_device_mapping=None,
+ block_device_mapping={},
scheduler_hints={},
)
mock_time.assert_called_once()
existing_vim_volumes=[],
created_items={},
vm_av_zone="nova",
+ block_device_mapping={},
disk_list=disk_list2,
)
self.vimconn.nova.servers.create.assert_called_once_with(
key_name="my_keypair",
userdata="userdata",
config_drive=True,
- block_device_mapping=None,
+ block_device_mapping={},
scheduler_hints={"group": "38b73-e9cc-5a6a-t270-82cc4811bd4a"},
)
mock_time.assert_called_once()
existing_vim_volumes=[],
created_items={},
vm_av_zone="nova",
+ block_device_mapping={},
disk_list=disk_list2,
)
key_name="my_keypair",
userdata="userdata",
config_drive=True,
- block_device_mapping=None,
+ block_device_mapping={},
scheduler_hints={},
)
mock_time.assert_not_called()