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

bug 7434: When direct.attach.untagged.vlan.enabled is set to "true", return only service offerings with Direct network support. 

status 7434: resolved fixed
This commit is contained in:
alena 2011-02-22 11:22:11 -08:00
parent 92423042e1
commit 154794d94c
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -3818,21 +3818,28 @@ public class ManagementServerImpl implements ManagementServer {
}
//if account doesn't have direct ip addresses and there are no direct Zone wide vlans, return virtual service offerings only
//If untagged network is enabled, return only direct service offerings
List<VlanVO> accountDirectVlans = new ArrayList<VlanVO>();
List<VlanVO> zoneDirectVlans = new ArrayList<VlanVO>();
if (accountId != null && zoneId != null) {
accountDirectVlans = _vlanDao.listVlansForAccountByType(null, ((Long)accountId).longValue(), VlanType.DirectAttached);
zoneDirectVlans = listZoneWideVlansByType(VlanType.DirectAttached, (Long)zoneId);
if (accountDirectVlans.isEmpty() && zoneDirectVlans.isEmpty()) {
sc.addAnd("guestIpType", SearchCriteria.Op.EQ, GuestIpType.Virtualized);
}
} else if (zoneId != null) {
zoneDirectVlans = listZoneWideVlansByType(VlanType.DirectAttached, (Long)zoneId);
if (zoneDirectVlans.isEmpty()) {
sc.addAnd("guestIpType", SearchCriteria.Op.EQ, GuestIpType.Virtualized);
}
}
boolean isDirectUntaggedNetworkEnabled = new Boolean(_configDao.getValue("direct.attach.untagged.vlan.enabled"));
if (isDirectUntaggedNetworkEnabled) {
sc.addAnd("guestIpType", SearchCriteria.Op.EQ, GuestIpType.DirectSingle);
} else {
if (accountId != null && zoneId != null) {
accountDirectVlans = _vlanDao.listVlansForAccountByType(null, ((Long)accountId).longValue(), VlanType.DirectAttached);
zoneDirectVlans = listZoneWideVlansByType(VlanType.DirectAttached, (Long)zoneId);
if (accountDirectVlans.isEmpty() && zoneDirectVlans.isEmpty()) {
sc.addAnd("guestIpType", SearchCriteria.Op.EQ, GuestIpType.Virtualized);
}
} else if (zoneId != null) {
zoneDirectVlans = listZoneWideVlansByType(VlanType.DirectAttached, (Long)zoneId);
if (zoneDirectVlans.isEmpty()) {
sc.addAnd("guestIpType", SearchCriteria.Op.EQ, GuestIpType.Virtualized);
}
}
}
return _offeringsDao.search(sc, searchFilter);
}