From c3e0f060ab67bad5233d112ceda5f7c8b2beaac4 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 18 Jan 2012 14:45:19 -0800 Subject: [PATCH] bug 12986: return domain level networks when listAll is passed along with account/domainId status 12986: resolved fixed --- .../com/cloud/network/NetworkManagerImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 906e91d0689..cbf6c48210e 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2547,16 +2547,16 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag if (isSystem == null || !isSystem) { //Get domain level networks - if (domainId != null && !listAll) { + if (domainId != null) { networksToReturn.addAll(listDomainLevelNetworks(buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, restartRequired), searchFilter, domainId)); - } else if (permittedAccounts.isEmpty()){ - networksToReturn.addAll(listAccountSpecificNetworksByDomainPath(buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, restartRequired), searchFilter, path, isRecursive)); - } - - //get account specific networks - if (!permittedAccounts.isEmpty()){ + } + + if (!permittedAccounts.isEmpty()) { networksToReturn.addAll(listAccountSpecificNetworks(buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, restartRequired), searchFilter, permittedAccounts)); - } + } else if (domainId == null){ + networksToReturn.addAll(listAccountSpecificNetworksByDomainPath(buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, aclType, skipProjectNetworks, restartRequired), searchFilter, path, isRecursive)); + } + } else { networksToReturn = _networksDao.search(buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId, null, skipProjectNetworks, restartRequired), searchFilter); }