networks: sep check of masklen only for start,end type creation

yunionio · Jun 9, 2020 · f27e177 · f27e177
1 parent 232077b
commit f27e177
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go
@@ -1300,6 +1300,9 @@ func (manager *SNetworkManager) ValidateCreateData(ctx context.Context, userCred
 		// 根据掩码得到合法的GuestIpPrefix
 		input.GuestIpPrefix = prefix.String()
 	} else {
+		if !isValidMaskLen(input.GuestIpMask) {
+			return input, httperrors.NewInputParameterError("Invalid masklen %d", input.GuestIpMask)
+		}
 		ipStart, err := netutils.NewIPV4Addr(input.GuestIpStart)
 		if err != nil {
 			return input, httperrors.NewInputParameterError("Invalid start ip: %s %s", input.GuestIpStart, err)
@@ -1311,10 +1314,6 @@ func (manager *SNetworkManager) ValidateCreateData(ctx context.Context, userCred
 		ipRange = netutils.NewIPV4AddrRange(ipStart, ipEnd)
 	}
 
-	if !isValidMaskLen(input.GuestIpMask) {
-		return input, httperrors.NewInputParameterError("Invalid masklen %d", input.GuestIpMask)
-	}
-
 	if len(input.GuestDns) == 0 {
 		input.GuestDns = options.Options.DNSServer
 	}