From 7d0338bd8216a30feeca3eec6a63a7f52459269a Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Tue, 24 Jul 2012 11:55:02 -0700
Subject: [PATCH] listPublicIpAddresses: when do join with nics table, count
 only non-removed nics

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
---
 server/src/com/cloud/server/ManagementServerImpl.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 047305ed249..bcdafa98cef 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);