(2.10) Fix in RPC

Use _SingleDiskDictDP() instead of _ObjectDict() for serializing
a disk.

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
Signed-off-by: Thomas Thrainer <thomasth@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

In stable-2.10 rpc methods take node as first argument.

Conflicts:
	lib/rpc.py

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

diff --git a/lib/cmdlib/instance.py b/lib/cmdlib/instance.py
index fa0163f..f22e134 100644 (file)
--- a/lib/cmdlib/instance.py
+++ b/lib/cmdlib/instance.py
@@ -3173,7 +3173,8 @@ class LUInstanceSetParams(LogicalUnit):
     self.LogInfo("Trying to hotplug device...")
     result = self.rpc.call_hotplug_device(self.instance.primary_node,
                                           self.instance, action, dev_type,
-                                          device, extra, seq)
+                                          (device, self.instance),
+                                          extra, seq)
     if result.fail_msg:
       self.LogWarning("Could not hotplug device: %s" % result.fail_msg)
       self.LogInfo("Continuing execution..")

diff --git a/lib/rpc.py b/lib/rpc.py
index d18a534..606673b 100644 (file)
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -740,11 +740,11 @@ class RpcRunner(_RpcClientBase,
         n.netinfo = objects.Network.ToDict(nobj)
     return n.ToDict()
 
-  def _DeviceDict(self, device):
+  def _DeviceDict(self, (device, instance)):
     if isinstance(device, objects.NIC):
       return self._NicDict(device)
     elif isinstance(device, objects.Disk):
-      return _ObjectToDict(device)
+      return self._SingleDiskDictDP((device, instance))
 
   def _InstDict(self, instance, hvp=None, bep=None, osp=None):
     """Convert the given instance to a dict.