diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-01 03:52:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-01 03:52:21 +0000 |
| commit | 957a2a6909fb6b5d9773ef74160543f4d984cc96 (patch) | |
| tree | 4e8b8085bae26e18121a550b52fec6c0c955eaa1 | |
| parent | 87401deacff181829c0934fb409dd56eb1fc3a71 (diff) | |
| parent | d1414c8a4f44484a4b4c39d9ba5f8a9d386f696b (diff) | |
Merge "Fixes the Hyper-V driver's method signature"
| -rw-r--r-- | nova/tests/test_hypervapi.py | 2 | ||||
| -rwxr-xr-x | nova/virt/hyperv/driver.py | 5 | ||||
| -rw-r--r-- | nova/virt/hyperv/vmops.py | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py index 5912bb301..aaceff8ec 100644 --- a/nova/tests/test_hypervapi.py +++ b/nova/tests/test_hypervapi.py @@ -516,7 +516,7 @@ class HyperVAPITestCase(test.TestCase): self._setup_destroy_mocks() self._mox.ReplayAll() - self._conn.destroy(self._instance_data) + self._conn.destroy(self._instance_data, None) self._mox.VerifyAll() def test_live_migration(self): diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py index e29ef7cbe..289f3c4b6 100755 --- a/nova/virt/hyperv/driver.py +++ b/nova/virt/hyperv/driver.py @@ -57,9 +57,10 @@ class HyperVDriver(driver.ComputeDriver): block_device_info=None): self._vmops.reboot(instance, network_info, reboot_type) - def destroy(self, instance, network_info=None, cleanup=True, + def destroy(self, instance, network_info, block_device_info=None, destroy_disks=True): - self._vmops.destroy(instance, network_info, cleanup, destroy_disks) + self._vmops.destroy(instance, network_info, block_device_info, + destroy_disks) def get_info(self, instance): return self._vmops.get_info(instance) diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py index c7a4e5468..f488e993f 100644 --- a/nova/virt/hyperv/vmops.py +++ b/nova/virt/hyperv/vmops.py @@ -241,7 +241,7 @@ class VMOps(object): create_dir=False, remove_dir=True) - def destroy(self, instance, network_info=None, cleanup=True, + def destroy(self, instance, network_info=None, block_device_info=None, destroy_disks=True): instance_name = instance['name'] LOG.info(_("Got request to destroy instance: %s"), instance_name) |