Merge branch 'fix/ZSTAC-81182' into '5.5.12'

gitlab · gitlab · commit be53c72bed19 · 2026-02-16T03:35:27.000Z
&lt;fix&gt;[network]: filter reserved IPs in getFreeIp

See merge request zstackio/zstack!9170
diff --git a/network/src/main/java/org/zstack/network/l3/L3BasicNetwork.java b/network/src/main/java/org/zstack/network/l3/L3BasicNetwork.java
@@ -1075,6 +1075,13 @@ private void handle(APIGetFreeIpMsg msg) {
             }
             limit -= freeIpInventorys.size();
         }
+
+        Set<ReservedIpRangeVO> reservedIpRanges = self.getReservedIpRanges();
+        if (reservedIpRanges != null && !reservedIpRanges.isEmpty()) {
+            freeIpInventorys.removeIf(freeIp -> reservedIpRanges.stream().anyMatch(
+                    r -> NetworkUtils.isInRange(freeIp.getIp(), r.getStartIp(), r.getEndIp())));
+        }
+
         reply.setInventories(freeIpInventorys);
 
         bus.reply(msg, reply);

Original file line number	Diff line number	Diff line change
`@@ -1075,6 +1075,13 @@ private void handle(APIGetFreeIpMsg msg) {`
`1075`	`1075`	`}`
`1076`	`1076`	`limit -= freeIpInventorys.size();`
`1077`	`1077`	`}`
	`1078`	`+`
	`1079`	`+ Set<ReservedIpRangeVO> reservedIpRanges = self.getReservedIpRanges();`
	`1080`	`+ if (reservedIpRanges != null && !reservedIpRanges.isEmpty()) {`
	`1081`	`+ freeIpInventorys.removeIf(freeIp -> reservedIpRanges.stream().anyMatch(`
	`1082`	`+ r -> NetworkUtils.isInRange(freeIp.getIp(), r.getStartIp(), r.getEndIp())));`
	`1083`	`+ }`
	`1084`	`+`
`1078`	`1085`	`reply.setInventories(freeIpInventorys);`
`1079`	`1086`
`1080`	`1087`	`bus.reply(msg, reply);`