Revert "Fix VPC restart with multi-CIDR networks: handle comma-separated CIDR in NetworkVO.equals()"

jean · jean · commit 1a22d356a7f7 · 2026-03-19T13:04:12.000-03:00
This reverts commit a68680a.
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java
@@ -600,9 +600,7 @@ public boolean equals(Object obj) {
             return true;
         }
 
-        return NetUtils.isNetworkAWithinNetworkB(
-                com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(cidr),
-                com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(that.cidr));
+        return NetUtils.isNetworkAWithinNetworkB(cidr, that.cidr);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -600,9 +600,7 @@ public boolean equals(Object obj) {`
`600`	`600`	`return true;`
`601`	`601`	`}`
`602`	`602`
`603`		`- return NetUtils.isNetworkAWithinNetworkB(`
`604`		`- com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(cidr),`
`605`		`- com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(that.cidr));`
	`603`	`+ return NetUtils.isNetworkAWithinNetworkB(cidr, that.cidr);`
`606`	`604`	`}`
`607`	`605`
`608`	`606`	`@Override`