Revision 51951d38 lib/rpc.py

b/lib/rpc.py
832 832
        n.netinfo = objects.Network.ToDict(nobj)
833 833
    return n.ToDict()
834 834

  
835
  def _DeviceDict(self, _, device):
835
  def _DeviceDict(self, _, (device, instance)):
836 836
    if isinstance(device, objects.NIC):
837 837
      return self._NicDict(None, device)
838 838
    elif isinstance(device, objects.Disk):
839
      return _ObjectToDict(None, device)
839
      return self._SingleDiskDictDP(None, (device, instance))
840 840

  
841 841
  def _InstDict(self, node, instance, hvp=None, bep=None, osp=None):
842 842
    """Convert the given instance to a dict.

Also available in: Unified diff