Revision 8b312c1d lib/cmdlib.py

b/lib/cmdlib.py
3712 3712 
    primary_ip = self.op.primary_ip = dns_data.ip
3713 3713 
    if self.op.secondary_ip is None:
3714 3714 
      self.op.secondary_ip = primary_ip
3715 
    if not netutils.IsValidIP4(self.op.secondary_ip):
3715 
    if not netutils.IP4Address.IsValid(self.op.secondary_ip):
3716 3716 
      raise errors.OpPrereqError("Invalid secondary IP given",
3717 3717 
                                 errors.ECODE_INVAL)
3718 3718 
    secondary_ip = self.op.secondary_ip
......
7015 7015 
                                     errors.ECODE_INVAL)
7016 7016 
        nic_ip = self.hostname1.ip
7017 7017 
      else:
7018 
        if not netutils.IsValidIP4(ip):
7018 
        if not netutils.IP4Address.IsValid(ip):
7019 7019 
          raise errors.OpPrereqError("Given IP address '%s' doesn't look"
7020 7020 
                                     " like a valid IP" % ip,
7021 7021 
                                     errors.ECODE_INVAL)
......
8690 8690 
        if nic_ip.lower() == constants.VALUE_NONE:
8691 8691 
          nic_dict['ip'] = None
8692 8692 
        else:
8693 
          if not netutils.IsValidIP4(nic_ip):
8693 
          if not netutils.IP4Address.IsValid(nic_ip):
8694 8694 
            raise errors.OpPrereqError("Invalid IP address '%s'" % nic_ip,
8695 8695 
                                       errors.ECODE_INVAL)
8696 8696 

  		












Also available in:
  Unified diff