From b4753964389ce6be27eedd10e5e045a2bb5c5527 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 11 Jul 2012 19:10:21 -0700 Subject: [PATCH] VPC: CS-15550 - fixed listVPCs by cidr Conflicts: server/src/com/cloud/network/vpc/VpcManagerImpl.java --- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 28086a442ba..b83a1696d1d 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -674,7 +674,8 @@ public class VpcManagerImpl implements VpcManager, Manager{ sb.and("zoneId", sb.entity().getZoneId(), SearchCriteria.Op.EQ); sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ); sb.and("restartRequired", sb.entity().isRestartRequired(), SearchCriteria.Op.EQ); - + sb.and("cidr", sb.entity().getCidr(), SearchCriteria.Op.EQ); + // now set the SC criteria... SearchCriteria sc = sb.create(); _accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria); @@ -710,6 +711,10 @@ public class VpcManagerImpl implements VpcManager, Manager{ sc.addAnd("state", SearchCriteria.Op.EQ, state); } + if (cidr != null) { + sc.addAnd("cidr", SearchCriteria.Op.EQ, cidr); + } + if (restartRequired != null) { sc.addAnd("restartRequired", SearchCriteria.Op.EQ, restartRequired); }