From fac57a0a837a2d8a291029ed99479796c8d625c9 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Mon, 5 May 2014 13:45:51 +0530 Subject: [PATCH] CLOUDSTACK-6577: Disable service monitoring in RVR (cherry picked from commit b9b623bccc6819f4a8f96054c51ecc5d3f1db944) Signed-off-by: Rohit Yadav Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java --- .../VirtualNetworkApplianceManagerImpl.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index b0e12283cea..f3c6ffa29ff 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -2372,20 +2372,24 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V if (reprogramGuestNtwks) { finalizeIpAssocForNetwork(cmds, router, provider, guestNetworkId, null); finalizeNetworkRulesForNetwork(cmds, router, provider, guestNetworkId); + + NetworkOffering offering = _networkOfferingDao.findById((_networkDao.findById(guestNetworkId)).getNetworkOfferingId()); + //service monitoring is currently not added in RVR + if (!offering.getRedundantRouter()) { + String serviceMonitringSet = _configDao.getValue(Config.EnableServiceMonitoring.key()); + + if (serviceMonitringSet != null && serviceMonitringSet.equalsIgnoreCase("true")) { + finalizeMonitorServiceOnStrat(cmds, profile, router, provider, guestNetworkId, true); + } else { + finalizeMonitorServiceOnStrat(cmds, profile, router, provider, guestNetworkId, false); + } + } + } finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNetworkId); } - String serviceMonitringSet = _configDao.getValue(Config.EnableServiceMonitoring.key()); - - if (serviceMonitringSet != null && serviceMonitringSet.equalsIgnoreCase("true")) { - finalizeMonitorServiceOnStrat(cmds, profile, router, provider, routerGuestNtwkIds.get(0), true); - } else { - finalizeMonitorServiceOnStrat(cmds, profile, router, provider, routerGuestNtwkIds.get(0), false); - } - - return true; }