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

bug 6163: waiting on Alex to give me the go ahead for this bug, commenting out some of the code till then

This commit is contained in:
abhishek 2010-09-14 10:52:04 -07:00
parent ab166071f8
commit edc85dd12d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2658,20 +2658,20 @@ public class UserVmManagerImpl implements UserVmManager {
forAccount = true;
guestVlan = vlansForAccount.get(0);//FIXME: iterate over all vlans
}
else
{
//list zone wide vlans that are direct attached and tagged
//if exists pick random one
//set forZone = true
//note the dao method below does a NEQ on vlan id, hence passing untagged
List<VlanVO> zoneWideVlans = _vlanDao.searchForZoneWideVlans(dc.getId(),VlanType.DirectAttached.toString(),"untagged");
if(zoneWideVlans!=null && zoneWideVlans.size()>0){
forZone = true;
guestVlan = zoneWideVlans.get(0);//FIXME: iterate over all vlans
}
}
// else
// {
// //list zone wide vlans that are direct attached and tagged
// //if exists pick random one
// //set forZone = true
//
// //note the dao method below does a NEQ on vlan id, hence passing untagged
// List<VlanVO> zoneWideVlans = _vlanDao.searchForZoneWideVlans(dc.getId(),VlanType.DirectAttached.toString(),"untagged");
//
// if(zoneWideVlans!=null && zoneWideVlans.size()>0){
// forZone = true;
// guestVlan = zoneWideVlans.get(0);//FIXME: iterate over all vlans
// }
// }
while ((pod = _agentMgr.findPod(template, offering, dc, account.getId(), avoids)) != null) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Attempting to create direct attached vm in pod " + pod.first().getName());