VPC: CS-15550 - fixed listVPCs by cidr
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b4753964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b4753964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b4753964
Branch: refs/heads/vpc
Commit: b4753964389ce6be27eedd10e5e045a2bb5c5527
Parents: eb52f4a
Author: Alena Prokharchyk <[email protected]>
Authored: Wed Jul 11 19:10:21 2012 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Fri Jul 13 13:26:59 2012 -0700
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b4753964/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 28086a4..b83a169 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<VpcVO> 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);
}
