From 6736569d2284b2be4875735d6316deb86a9976ee Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 4 Apr 2011 15:40:31 -0700 Subject: [PATCH] bug 9274: listPublicIpAddresses - don't list Direct ip addresses by default; list them only when "forVirtualNetwork=false" is specified in the request. status 9274: resolved fixed --- .../com/cloud/server/ManagementServerImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 17a9fa2c30f..e89bf877fde 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -2580,11 +2580,9 @@ public class ManagementServerImpl implements ManagementServer { sb.and("addressLIKE", sb.entity().getAddress(), SearchCriteria.Op.LIKE); } - if (forVirtualNetwork != null) { - SearchBuilder vlanSearch = _vlanDao.createSearchBuilder(); - vlanSearch.and("vlanType", vlanSearch.entity().getVlanType(), SearchCriteria.Op.EQ); - sb.join("vlanSearch", vlanSearch, sb.entity().getVlanId(), vlanSearch.entity().getId(), JoinBuilder.JoinType.INNER); - } + SearchBuilder vlanSearch = _vlanDao.createSearchBuilder(); + vlanSearch.and("vlanType", vlanSearch.entity().getVlanType(), SearchCriteria.Op.EQ); + sb.join("vlanSearch", vlanSearch, sb.entity().getVlanId(), vlanSearch.entity().getId(), JoinBuilder.JoinType.INNER); if ((isAllocated != null) && (isAllocated == true)) { sb.and("allocated", sb.entity().getAllocatedTime(), SearchCriteria.Op.NNULL); @@ -2598,10 +2596,14 @@ public class ManagementServerImpl implements ManagementServer { sc.setJoinParameters("domainSearch", "path", domain.getPath() + "%"); } + VlanType vlanType = null; if (forVirtualNetwork != null) { - VlanType vlanType = (Boolean) forVirtualNetwork ? VlanType.VirtualNetwork : VlanType.DirectAttached; - sc.setJoinParameters("vlanSearch", "vlanType", vlanType); + vlanType = (Boolean) forVirtualNetwork ? VlanType.VirtualNetwork : VlanType.DirectAttached; + } else { + vlanType = VlanType.VirtualNetwork; } + + sc.setJoinParameters("vlanSearch", "vlanType", vlanType); if (zone != null) { sc.setParameters("dataCenterId", zone);