From 18e837516a8dba168d3be79404a4c03e03176baa Mon Sep 17 00:00:00 2001 From: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com> Date: Mon, 2 Nov 2020 10:40:16 +0200 Subject: [PATCH] Hiding system reserved IP addresses (#4408) This PR removes system reserved IP addresses from the options of acquiring IP addresses. Choosing any reserved IP address results in an error. The IP addresses should not have been displayed in the first place. Fixes: #4310 --- server/src/main/java/com/cloud/server/ManagementServerImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index ab68b614142..042ade5c808 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -1998,6 +1998,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe sb.and("vpcId", sb.entity().getVpcId(), SearchCriteria.Op.EQ); sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ); sb.and("display", sb.entity().isDisplay(), SearchCriteria.Op.EQ); + sb.and("forsystemvms", sb.entity().isForSystemVms(), SearchCriteria.Op.EQ); if (forLoadBalancing != null && forLoadBalancing) { final SearchBuilder lbSearch = _loadbalancerDao.createSearchBuilder(); @@ -2106,6 +2107,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe sc.setParameters("state", state); } + sc.setParameters( "forsystemvms", false); final Pair, Integer> result = _publicIpAddressDao.searchAndCount(sc, searchFilter); return new Pair, Integer>(result.first(), result.second()); }