apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 8704: listNetworks with account/domainId parameter - return account specific and shared networks

Browse Source 
status 8704: resolved fixed
This commit is contained in:
alena 2011-02-25 11:26:26 -08:00
parent 1dbd012fdc
commit fdbdba7a78
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1746,13 +1746,20 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
sc.addAnd("guestType", SearchCriteria.Op.EQ, type);
}
if (!isSystem && (isShared == null || !isShared) && accountName != null && domainId != null) {
sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
sc.addAnd("isShared", SearchCriteria.Op.EQ, false);
}
if (isShared != null) {
sc.addAnd("isShared", SearchCriteria.Op.EQ, isShared);
if (!isSystem) {
if (accountName != null && domainId != null) {
if (isShared == null) {
sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
sc.addOr("isShared", SearchCriteria.Op.EQ, true);
} else if (!isShared) {
sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
} else {
sc.addAnd("isShared", SearchCriteria.Op.EQ, true);
}
} else if (isShared != null) {
sc.addAnd("isShared", SearchCriteria.Op.EQ, isShared);
}
}
if (isDefault != null) {