You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2014/05/06 16:51:57 UTC
[2/4] git commit: updated refs/heads/master to 59bf355
CLOUDSTACK-6577: Disable service monitoring in RVR
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9b623bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9b623bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9b623bc
Branch: refs/heads/master
Commit: b9b623bccc6819f4a8f96054c51ecc5d3f1db944
Parents: 1159158
Author: Jayapal <ja...@apache.org>
Authored: Mon May 5 13:45:51 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Tue May 6 20:08:30 2014 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9b623bc/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 5e4c6a5..49da7ec 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;
}