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

listNetworks api - return only networks belonging to the caller plus Shared networks when command is called without any parameters

This commit is contained in:
alena 2010-12-03 13:59:47 -08:00
parent 2759e422f5
commit cb605e626a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2012,7 +2012,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
accountId = account.getId();
}
}
} else {
accountId = account.getId();
}
} else {
accountId = account.getId();
}
@ -2039,9 +2041,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
sc.addAnd("id", SearchCriteria.Op.EQ, id);
}
if (accountId != null) {
sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
SearchCriteria<NetworkVO> ssc = _networkConfigDao.createSearchCriteria();
ssc.addOr("accountId", SearchCriteria.Op.EQ, accountId);
if (accountName == null && domainId == null) {
ssc.addOr("accountId", SearchCriteria.Op.EQ, 1L);
}
sc.addAnd("accountId", SearchCriteria.Op.SC, ssc);
return _networkConfigDao.search(sc, searchFilter);
}