From bb9fda3435628900ac7f789b50686415c5f42da3 Mon Sep 17 00:00:00 2001 From: alena Date: Wed, 14 Sep 2011 16:11:01 -0700 Subject: [PATCH] Fixed the problem in addDhcpEntry code when _dnsBasicZoneUpdates was never reset once set to false. Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java --- .../router/VirtualNetworkApplianceManagerImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 218fff7f9cc..aa792b599fd 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -192,7 +192,6 @@ import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.VirtualMachineName; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VirtualMachineProfile.Param; -import com.cloud.vm.VmDetailConstants; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; @@ -1667,10 +1666,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { List rets = new ArrayList(routers.size()); - - - boolean sendPasswordAndVmData = true; - boolean sendDnsDhcpData = true; _userVmDao.loadDetails((UserVmVO) profile.getVirtualMachine()); DataCenter dc = dest.getDataCenter(); @@ -1680,7 +1675,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian List connectedRouters = new ArrayList(); List disconnectedRouters = new ArrayList(); - for (DomainRouterVO router : routers) { + + for (DomainRouterVO router : routers) { + boolean sendPasswordAndVmData = true; + boolean sendDnsDhcpData = true; + if (router.getState() != State.Running) { s_logger.warn("Unable to add virtual machine " + profile.getVirtualMachine() + " to the router " + router + " as the router is not in Running state"); continue;