etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the bug in listNetworks when isSystem parameter was ignored if it was specified along with account/domainId parameter

This commit is contained in:
alena 2011-04-19 18:26:45 -07:00
parent 7103e1c9a7
commit 63cd66beb0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -1819,7 +1819,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (isShared == null || isShared) {
List<NetworkVO> allNetworks = _networksDao.listNetworksBy(true);
for (NetworkVO network : allNetworks) {
if (!isNetworkAvailableInDomain(network.getId(), domainId)) {
NetworkOffering offering = _configMgr.getNetworkOffering(network.getNetworkOfferingId());
if (!isNetworkAvailableInDomain(network.getId(), domainId) || offering.isSystemOnly()) {
avoidNetworks.add(network.getId());
} else {
allowedSharedNetworks.add(network.getId());
@ -1836,6 +1837,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (domainId != null && accountName == null) {
List<NetworkVO> allNetworks = _networksDao.listNetworksBy(true);
for (NetworkVO network : allNetworks) {
if (!isNetworkAvailableInDomain(network.getId(), domainId)) {
avoidNetworks.add(network.getId());
}