VPC: fixed list public ips by vpcId
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/09bd4e17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/09bd4e17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/09bd4e17 Branch: refs/heads/vpc Commit: 09bd4e1725e4c4be2320e5c8676a65010108cc85 Parents: fcdf6f2 Author: Alena Prokharchyk <[email protected]> Authored: Tue Jun 26 16:35:56 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Thu Jun 28 10:16:22 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/server/ManagementServerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/09bd4e17/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 41e66d4..2ac0156 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1742,7 +1742,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); }
