Revision 156374c7 lib/rpc.py

b/lib/rpc.py
740 740
        n.netinfo = objects.Network.ToDict(nobj)
741 741
    return n.ToDict()
742 742

  
743
  def _DeviceDict(self, device):
743
  def _DeviceDict(self, (device, instance)):
744 744
    if isinstance(device, objects.NIC):
745 745
      return self._NicDict(device)
746 746
    elif isinstance(device, objects.Disk):
747
      return _ObjectToDict(device)
747
      return self._SingleDiskDictDP((device, instance))
748 748

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

Also available in: Unified diff