openstack/compute-hyperv
Code Issues Proposed changes

Merge "Fix driver spawn method signature"

Browse Source
This commit is contained in:
Zuul 2017-10-23 08:58:14 +00:00 committed by Gerrit Code Review
commit 810a29f677
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compute_hyperv/nova/driver.py
View File

@ -155,7 +155,8 @@ class HyperVDriver(driver.ComputeDriver):
return self._vmops.estimate_instance_overhead(instance_info)
def spawn(self, context, instance, image_meta, injected_files,
admin_password, network_info=None, block_device_info=None):
admin_password, allocations, network_info=None,
block_device_info=None):
image_meta = self._recreate_image_meta(context, instance, image_meta)
self._vmops.spawn(context, instance, image_meta, injected_files,
admin_password, network_info, block_device_info)

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

@ -151,7 +151,8 @@ class HyperVDriverTestCase(test_base.HyperVBaseTestCase):
self.driver.spawn(
mock.sentinel.context, mock.sentinel.instance,
mock.sentinel.image_meta, mock.sentinel.injected_files,
mock.sentinel.admin_password, mock.sentinel.network_info,
mock.sentinel.admin_password, mock.sentinel.allocations,
mock.sentinel.network_info,
mock.sentinel.block_device_info)
mock_recreate_img_meta.assert_called_once_with(