Revision aedf5fd7 lib/rpc.py

b/lib/rpc.py
664 664
      rpc_defs.ED_INST_DICT_HVP_BEP: self._InstDictHvpBep,
665 665
      rpc_defs.ED_INST_DICT_OSP: self._InstDictOsp,
666 666

  
667
      # Encoders annotating disk parameters
668
      rpc_defs.ED_DISKS_DICT_DP: self._DisksDictDP,
669
      rpc_defs.ED_SINGLE_DISK_DICT_DP: self._SingleDiskDictDP,
670

  
667 671
      # Encoders with special requirements
668 672
      rpc_defs.ED_FILE_DETAILS: compat.partial(_PrepareFileUpload, _getents),
669 673
      })
......
732 736
    """
733 737
    return self._InstDict(instance, osp=osparams)
734 738

  
739
  def _DisksDictDP(self, (disks, instance)):
740
    """Wrapper for L{AnnotateDiskParams}.
741

  
742
    """
743
    diskparams = self._cfg.GetInstanceDiskParams(instance)
744
    return [disk.ToDict()
745
            for disk in AnnotateDiskParams(instance.disk_template,
746
                                           disks, diskparams)]
747

  
748
  def _SingleDiskDictDP(self, (disk, instance)):
749
    """Wrapper for L{AnnotateDiskParams}.
750

  
751
    """
752
    (anno_disk,) = self._DisksDictDP(([disk], instance))
753
    return anno_disk
754

  
735 755

  
736 756
class JobQueueRunner(_RpcClientBase, _generated_rpc.RpcClientJobQueue):
737 757
  """RPC wrappers for job queue.

Also available in: Unified diff