From ca270cbdf728b2aa646772bc611fcb0170d7276a 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 --- .../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 80ca1cfec7c..56fb3b1ec5e 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -2485,6 +2485,19 @@ 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); @@ -2495,15 +2508,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V } - String serviceMonitringSet = SetServiceMonitor.valueIn(router.getDataCenterId()); - //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; }