Revision c0c3fa27 lib/cmdlib.py

b/lib/cmdlib.py
3594 3594 
    primary_ip = self.op.primary_ip = dns_data.ip
3595 3595 
    if self.op.secondary_ip is None:
3596 3596 
      self.op.secondary_ip = primary_ip
3597 
    if not utils.IsValidIP(self.op.secondary_ip):
3597 
    if not utils.IsValidIP4(self.op.secondary_ip):
3598 3598 
      raise errors.OpPrereqError("Invalid secondary IP given",
3599 3599 
                                 errors.ECODE_INVAL)
3600 3600 
    secondary_ip = self.op.secondary_ip
......
6839 6839 
                                     errors.ECODE_INVAL)
6840 6840 
        nic_ip = self.hostname1.ip
6841 6841 
      else:
6842 
        if not utils.IsValidIP(ip):
6842 
        if not utils.IsValidIP4(ip):
6843 6843 
          raise errors.OpPrereqError("Given IP address '%s' doesn't look"
6844 6844 
                                     " like a valid IP" % ip,
6845 6845 
                                     errors.ECODE_INVAL)
......
8513 8513 
        if nic_ip.lower() == constants.VALUE_NONE:
8514 8514 
          nic_dict['ip'] = None
8515 8515 
        else:
8516 
          if not utils.IsValidIP(nic_ip):
8516 
          if not utils.IsValidIP4(nic_ip):
8517 8517 
            raise errors.OpPrereqError("Invalid IP address '%s'" % nic_ip,
8518 8518 
                                       errors.ECODE_INVAL)
8519 8519 

  		












Also available in:
  Unified diff