(fix) Remove uri slot from block_devices

In stable-2.10 we have userspace access mode for rbd. Backend
calculates uri along with link and dev_path. Thus we have
three items in block_devices and kvm_disks tuples.

We this patch we remove the third value.

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index 6e0a5e5..6b0582f 100644 (file)
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -92,16 +92,16 @@ _FIND_RUNTIME_ENTRY = {
   constants.HOTPLUG_TARGET_NIC:
     lambda nic, kvm_nics: [n for n in kvm_nics if n.uuid == nic.uuid],
   constants.HOTPLUG_TARGET_DISK:
-    lambda disk, kvm_disks: [(d, l, u) for (d, l, u) in kvm_disks
+    lambda disk, kvm_disks: [(d, l) for (d, l) in kvm_disks
                              if d.uuid == disk.uuid]
   }
 _RUNTIME_DEVICE = {
   constants.HOTPLUG_TARGET_NIC: lambda d: d,
-  constants.HOTPLUG_TARGET_DISK: lambda (d, e, _): d
+  constants.HOTPLUG_TARGET_DISK: lambda (d, e): d
   }
 _RUNTIME_ENTRY = {
   constants.HOTPLUG_TARGET_NIC: lambda d, e: d,
-  constants.HOTPLUG_TARGET_DISK: lambda d, e: (d, e, None)
+  constants.HOTPLUG_TARGET_DISK: lambda d, e: (d, e)
   }
 
 
@@ -148,8 +148,8 @@ def _AnalyzeSerializedRuntime(serialized_runtime):
     kvm_cmd, serialized_nics, hvparams, serialized_blockdevs = loaded_runtime
 
   kvm_nics = [objects.NIC.FromDict(snic) for snic in serialized_nics]
-  block_devices = [(objects.Disk.FromDict(sdisk), link, uri)
-                   for sdisk, link, uri in serialized_blockdevs]
+  block_devices = [(objects.Disk.FromDict(sdisk), link)
+                   for sdisk, link in serialized_blockdevs]
 
   return (kvm_cmd, kvm_nics, hvparams, block_devices)
 
@@ -1531,8 +1531,8 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     kvm_cmd, kvm_nics, hvparams, block_devices = kvm_runtime
 
     serialized_nics = [nic.ToDict() for nic in kvm_nics]
-    serialized_blockdevs = [(blk.ToDict(), link, uri)
-                            for blk, link, uri in block_devices]
+    serialized_blockdevs = [(blk.ToDict(), link)
+                            for blk, link in block_devices]
     serialized_form = serializer.Dump((kvm_cmd, serialized_nics, hvparams,
                                       serialized_blockdevs))