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

list systemonly direct network if zone is security group enabled

This commit is contained in:
Edison Su 2011-02-25 14:22:54 -05:00
parent 10ff7127fe
commit 5f3415d377
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1670,7 +1670,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
SearchCriteria<NetworkVO> sc = sb.create();
if (!isSystem) {
sc.setJoinParameters("networkOfferingSearch", "systemOnly", false);
if (zoneId != null) {
DataCenterVO dc = _dcDao.findById(zoneId);
if (dc != null && !dc.isSecurityGroupEnabled()) {
sc.setJoinParameters("networkOfferingSearch", "systemOnly", false);
}
}
} else {
sc.setJoinParameters("networkOfferingSearch", "systemOnly", true);
sc.setJoinParameters("zoneSearch", "networkType", NetworkType.Advanced.toString());