From ebe664cff22a8533253babf80ed2fb978352bbf1 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 16 Feb 2012 14:57:19 -0800 Subject: [PATCH] bug 13041: in Basic zone just restart all exising domRs in the zone during the networkRestart, don't try to create a new one status 13041: resolved fixed reviewed-by: Sheng Yang --- .../router/VirtualNetworkApplianceManagerImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 680ca763bac..fe79cd871d0 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1197,11 +1197,17 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian } List routers; Long podId = null; + if (isPodBased) { + Pod pod = dest.getPod(); + if (pod != null) { + podId = pod.getId(); + } + } + if (publicNetwork) { routers = _routerDao.listByNetworkAndRole(guestNetwork.getId(), Role.VIRTUAL_ROUTER); } else { - if (isPodBased) { - podId = dest.getPod().getId(); + if (isPodBased && podId != null) { routers = _routerDao.listByNetworkAndPodAndRole(guestNetwork.getId(), podId, Role.VIRTUAL_ROUTER); plan = new DataCenterDeployment(dcId, podId, null, null, null, null); } else { @@ -1224,7 +1230,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian } /* If old network is redundant but new is single router, then routers.size() = 2 but routerCount = 1 */ - if (routers.size() >= routerCount) { + if (routers.size() >= routerCount || (isPodBased && podId == null)) { return routers; }