all subclasses of ComputeDriver should fully implement the interface of the destroy method.

4 files changed, 4 insertions, 4 deletions

diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 2898f23a4..b7396d61c 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -293,7 +293,7 @@ class FakeConnection(driver.ComputeDriver):
         """
         pass
 
-    def destroy(self, instance, network_info):
+    def destroy(self, instance, network_info, cleanup=True):
         key = instance.name
         if key in self.instances:
             del self.instances[key]
diff --git a/nova/virt/hyperv.py b/nova/virt/hyperv.py
index 315f635c7..1e4cce10c 100644
--- a/nova/virt/hyperv.py
+++ b/nova/virt/hyperv.py
@@ -373,7 +373,7 @@ class HyperVConnection(driver.ComputeDriver):
             raise exception.InstanceNotFound(instance_id=instance.id)
         self._set_vm_state(instance.name, 'Reboot')
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info, cleanup=True):
         """Destroy the VM. Also destroy the associated VHD disk files"""
         LOG.debug(_("Got request to destroy vm %s"), instance.name)
         vm = self._lookup(instance.name)
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index ce57847b2..10d80c0a0 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -136,7 +136,7 @@ class VMWareESXConnection(driver.ComputeDriver):
         """Reboot VM instance."""

         self._vmops.reboot(instance, network_info)

 

-    def destroy(self, instance, network_info):

+    def destroy(self, instance, network_info, cleanup=True):

         """Destroy VM instance."""

         self._vmops.destroy(instance, network_info)

 

diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 042bf2b02..571638496 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -216,7 +216,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """
         self._vmops.inject_file(instance, b64_path, b64_contents)
 
-    def destroy(self, instance, network_info):
+    def destroy(self, instance, network_info, cleanup=True):
         """Destroy VM instance"""
         self._vmops.destroy(instance, network_info)