From ea442fa81f9761538251b64d2f69d1f242d2bdc6 Mon Sep 17 00:00:00 2001 From: Kishan Kavala Date: Tue, 24 Dec 2013 16:34:03 +0530 Subject: [PATCH] CLOUDSTACK-5254: If VR is not upgraded, leave firewall rule in Active state. Rule will be applied when VR is upgraded --- .../router/VirtualNetworkApplianceManagerImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index a970af6c059..15b5ff27b21 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3719,6 +3719,14 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V typeString + " commands to the backend"); continue; } + + if (!checkRouterVersion(router)){ + //Rules will be applied after VR is upgraded + s_logger.debug("Router " + router.getInstanceName() + " requires upgrade, so not sending apply " + + typeString + " commands to the backend"); + continue; + } + try { result = applier.execute(network, router); connectedRouters.add(router);