Revision 860bf930 lib/rpc.py

b/lib/rpc.py
702 702
      rpc_defs.ED_INST_DICT_HVP_BEP_DP: self._InstDictHvpBepDp,
703 703
      rpc_defs.ED_INST_DICT_OSP_DP: self._InstDictOspDp,
704 704
      rpc_defs.ED_NIC_DICT: self._NicDict,
705
      rpc_defs.ED_DEVICE_DICT: self._DeviceDict,
705 706

  
706 707
      # Encoders annotating disk parameters
707 708
      rpc_defs.ED_DISKS_DICT_DP: self._DisksDictDP,
......
739 740
        n.netinfo = objects.Network.ToDict(nobj)
740 741
    return n.ToDict()
741 742

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

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

  

Also available in: Unified diff