BaseVM: move implementation to VM

mypy will complain not finding _destroy in BaseVM once we add typing hints.

`Snapshot` and `VM` have had different implementations because of vm-uninstall
vs snapshot-uninstall, and diverged further because of xapi-project/xen-api#4145.
The code in `BaseVM.destroy` is specific to this issue's workaround for VM
and has no reason to be there.

This corrects the situation, and moves the comment about the xapi issue to
a better place.

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

lib/basevm.py

@@ -64,12 +64,6 @@ def vdi_uuids(self, sr_uuid=None):
     def destroy_vdi(self, vdi_uuid: str) -> None:
         self.host.xe('vdi-destroy', {'uuid': vdi_uuid})
 
-    # FIXME: move this method and the above back to class VM if not useful in Snapshot class?
-    def destroy(self):
-        for vdi_uuid in self.vdi_uuids():
-            self.destroy_vdi(vdi_uuid)
-        self._destroy()
-
     def all_vdis_on_host(self, host):
         for vdi_uuid in self.vdi_uuids():
             sr = SR(self.host.pool.get_vdi_sr_uuid(vdi_uuid), self.host.pool)

lib/vm.py

@@ -161,15 +161,16 @@ def unpause(self):
     def _disk_list(self):
         return self.host.xe('vm-disk-list', {'uuid': self.uuid, 'vbd-params': ''}, minimal=True)
 
-    def _destroy(self):
-        self.host.xe('vm-destroy', {'uuid': self.uuid})
-
     def destroy(self, verify=False):
-        # Note: not using xe vm-uninstall (which would be convenient) because it leaves a VDI behind
-        # See https://github.com/xapi-project/xen-api/issues/4145
         if not self.is_halted():
             self.shutdown(force=True)
-        super().destroy()
+
+        # Note: not using xe vm-uninstall (which would be convenient) because it leaves a VDI behind
+        # See https://github.com/xapi-project/xen-api/issues/4145
+        for vdi_uuid in self.vdi_uuids():
+            self.destroy_vdi(vdi_uuid)
+        self.host.xe('vm-destroy', {'uuid': self.uuid})
+
         if verify:
             wait_for_not(self.exists, "Wait for VM destroyed")