openstack
/
compute-hyperv
Code Issues Proposed changes

Pick up driver API change 

The "rescue" method now accepts a block device info argument,
which we'll need to pick up.

Change-Id: I88544e220f7923decce65ffee544bd8064cdfc46
This commit is contained in:
Lucian Petrut 2020-04-13 14:37:25 +03:00
parent f327d0549c
commit 3a7ea8e7cd
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compute_hyperv/nova/driver.py
View File

@ -421,7 +421,7 @@ class HyperVDriver(driver.ComputeDriver):
return self._vmops.detach_interface(instance, vif)
def rescue(self, context, instance, network_info, image_meta,
rescue_password):
rescue_password, block_device_info):
image_meta = self._recreate_image_meta(context, instance, image_meta)
self._vmops.rescue_instance(context, instance, network_info,
image_meta, rescue_password)

23
compute_hyperv/tests/unit/test_driver.py
View File

@ -565,6 +565,29 @@ class HyperVDriverTestCase(test_base.HyperVBaseTestCase):
self.driver._vmops.attach_interface.assert_called_once_with(
self.context, mock_instance, mock.sentinel.vif)
@mock.patch.object(driver.HyperVDriver, '_recreate_image_meta')
def test_rescue(self, mock_recreate_img_meta):
self.driver.rescue(
mock.sentinel.context, mock.sentinel.instance,
mock.sentinel.network_info, mock.sentinel.image_meta,
mock.sentinel.rescue_password, mock.sentinel.block_device_info)
mock_recreate_img_meta.assert_called_once_with(
mock.sentinel.context, mock.sentinel.instance,
mock.sentinel.image_meta)
self.driver._vmops.rescue_instance.assert_called_once_with(
mock.sentinel.context, mock.sentinel.instance,
mock.sentinel.network_info,
mock_recreate_img_meta.return_value,
mock.sentinel.rescue_password)
def test_unrescue(self):
self.driver.unrescue(
mock.sentinel.instance, mock.sentinel.network_info)
self.driver._vmops.unrescue_instance.assert_called_once_with(
mock.sentinel.instance)
def _check_recreate_image_meta(self, mock_image_meta, image_ref='',
instance_img_ref=''):
system_meta = {'image_base_image_ref': instance_img_ref}