cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: listPublicIpAddresses: when do join with nics table, count only non-removed nics
Date Tue, 24 Jul 2012 19:41:17 GMT
Updated Branches:
  refs/heads/master a924eb196 -> 7d0338bd8


listPublicIpAddresses: when do join with nics table, count only non-removed nics

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.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/7d0338bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7d0338bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7d0338bd

Branch: refs/heads/master
Commit: 7d0338bd8216a30feeca3eec6a63a7f52459269a
Parents: a924eb1
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Tue Jul 24 11:55:02 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Tue Jul 24 12:42:46 2012 -0700

----------------------------------------------------------------------
 .../src/com/cloud/server/ManagementServerImpl.java |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7d0338bd/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 047305e..bcdafa9 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1765,11 +1765,6 @@ public class ManagementServerImpl implements ManagementServer {
             vlanType = VlanType.VirtualNetwork;
         }
 
-        // don't show SSVM/CPVM ips
-        if (vlanType == VlanType.VirtualNetwork && (allocatedOnly)) {
-            sb.and("associatedNetworkId", sb.entity().getAssociatedWithNetworkId(), SearchCriteria.Op.NNULL);
      
-        }
-
         SearchCriteria<IPAddressVO> sc = sb.create();
         if (isAllocated) {
           _accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts,
listProjectResourcesCriteria);


Mime
View raw message