Revision b262a5c6 lib/rpc.py

b/lib/rpc.py
820 820
      rpc_defs.ED_INST_DICT_HVP_BEP_DP: self._InstDictHvpBepDp,
821 821
      rpc_defs.ED_INST_DICT_OSP_DP: self._InstDictOspDp,
822 822
      rpc_defs.ED_NIC_DICT: self._NicDict,
823
      rpc_defs.ED_DEVICE_DICT: self._DeviceDict,
823 824

  
824 825
      # Encoders annotating disk parameters
825 826
      rpc_defs.ED_DISKS_DICT_DP: self._DisksDictDP,
......
858 859
        n.netinfo = objects.Network.ToDict(nobj)
859 860
    return n.ToDict()
860 861

  
862
  def _DeviceDict(self, device):
863
    if isinstance(device, objects.NIC):
864
      return self._NicDict(device)
865
    elif isinstance(device, objects.Disk):
866
      return _ObjectToDict(device)
867

  
861 868
  def _InstDict(self, instance, hvp=None, bep=None, osp=None):
862 869
    """Convert the given instance to a dict.
863 870

  

Also available in: Unified diff