BaseVM: simplify .vdi_uuids() by telling XAPI not to show VBDs

Previous xe command was outputing a mix of VDI,VBD,VDI,VBD and forced to
skip those unwanted VBDs.  Just avoid getting them in the first place.

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

Author: ydirson

lib/basevm.py

@@ -43,9 +43,7 @@ def vdi_uuids(self, sr_uuid=None):
         if output == '':
             return []
 
-        all_uuids = output.split(',')  # Split based on commas
-        # Select only every alternate UUID (even index positions)
-        vdis = all_uuids[0::2]  # Start at 0, step by 2
+        vdis = output.split(',')
 
         if sr_uuid is None:
             return vdis

lib/snapshot.py

@@ -4,7 +4,8 @@
 
 class Snapshot(BaseVM):
     def _disk_list(self):
-        return self.host.xe('snapshot-disk-list', {'uuid': self.uuid}, minimal=True)
+        return self.host.xe('snapshot-disk-list', {'uuid': self.uuid, 'vbd-params': ''},
+                            minimal=True)
 
     def destroy(self, verify=False):
         logging.info("Delete snapshot " + self.uuid)

lib/vm.py

@@ -159,7 +159,7 @@ def unpause(self):
         self.host.xe('vm-unpause', {'uuid': self.uuid})
 
     def _disk_list(self):
-        return self.host.xe('vm-disk-list', {'uuid': self.uuid}, minimal=True)
+        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})