From 0b620bc85219b2ca253e3548b34b67db4cbaacb0 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Tue, 26 Jun 2012 16:35:56 -0700
Subject: [PATCH] VPC: fixed list public ips by vpcId

---
 server/src/com/cloud/server/ManagementServerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index d25a468af8d..28323b2cbf1 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1744,7 +1744,7 @@ public class ManagementServerImpl implements ManagementServer {
         }
 
         // don't show SSVM/CPVM ips
-        if (vlanType == VlanType.VirtualNetwork && (allocatedOnly)) {
+        if (vlanType == VlanType.VirtualNetwork && (allocatedOnly) && vpcId == null) {
             sb.and("associatedNetworkId", sb.entity().getAssociatedWithNetworkId(), SearchCriteria.Op.NNULL);
         }