From edc85dd12db5572cc7d8ec53df3bc04f29586912 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 14 Sep 2010 10:52:04 -0700 Subject: [PATCH] bug 6163: waiting on Alex to give me the go ahead for this bug, commenting out some of the code till then --- .../src/com/cloud/vm/UserVmManagerImpl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index c3d5bf4e8fb..4ab89304043 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -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 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 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());