Revision 8b46606c lib/cmdlib.py

b/lib/cmdlib.py
5887 5887 
      else:
5888 5888 
        if not isinstance(disk_op, int):
5889 5889 
          raise errors.OpPrereqError("Invalid disk index")
5890 
        if not isinstance(disk_dict, dict):
5891 
          msg = "Invalid disk value: expected dict, got '%s'" % disk_dict
5892 
          raise errors.OpPrereqError(msg)
5893 

  		





  5890
  5894
  
    
      if disk_op == constants.DDM_ADD:


  		





  5891
  5895
  
    
        mode = disk_dict.setdefault('mode', constants.DISK_RDWR)


  		





  5892
  5896
  
    
        if mode not in constants.DISK_ACCESS_SET:


  		





  ......




  5921
  5925
  
    
      else:


  		





  5922
  5926
  
    
        if not isinstance(nic_op, int):


  		





  5923
  5927
  
    
          raise errors.OpPrereqError("Invalid nic index")


  		





  
  5928
  
    
        if not isinstance(nic_dict, dict):


  		





  
  5929
  
    
          msg = "Invalid nic value: expected dict, got '%s'" % nic_dict


  		





  
  5930
  
    
          raise errors.OpPrereqError(msg)


  		





  5924
  5931
  
    

  		





  5925
  5932
  
    
      # nic_dict should be a dict


  		





  5926
  5933
  
    
      nic_ip = nic_dict.get('ip', None)


  		












Also available in:
  Unified diff