convert ip to string

kubeovn · Dec 6, 2020 · 7246037 · 7246037
1 parent 2aecb3d
commit 7246037
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/pkg/util/net.go b/pkg/util/net.go
@@ -144,3 +144,15 @@ func GenerateRandomV4IP(cidr string) string {
 	t := big.NewInt(0).Add(Ip2BigInt(ip), add)
 	return fmt.Sprintf("%s/%d", BigInt2Ip(t), netMask)
 }
+
+func IPToString(ip string) string {
+	ipNet, _, err := net.ParseCIDR(ip)
+	if err == nil {
+		return ipNet.String()
+	}
+	ipNet = net.ParseIP(ip)
+	if ipNet != nil {
+		return ipNet.String()
+	}
+	return ""
+}
diff --git a/pkg/util/validator.go b/pkg/util/validator.go
@@ -138,12 +138,13 @@ func ValidatePodNetwork(annotations map[string]string) error {
 	return nil
 }
 
-func ValidatePodCidr(cidrStr, ipStr string) error {
-	if SubnetBroadCast(cidrStr) == ipStr {
-		return fmt.Errorf("%s is the broadcast ip in cidr %s", ipStr, cidrStr)
+func ValidatePodCidr(cidr, ip string) error {
+	ipStr := IPToString(ip)
+	if SubnetBroadCast(cidr) == ipStr {
+		return fmt.Errorf("%s is the broadcast ip in cidr %s", ipStr, cidr)
 	}
-	if SubnetNumber(cidrStr) == ipStr {
-		return fmt.Errorf("%s is the network number ip in cidr %s", ipStr, cidrStr)
+	if SubnetNumber(cidr) == ipStr {
+		return fmt.Errorf("%s is the network number ip in cidr %s", ipStr, cidr)
 	}
 
 	return nil