You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/25 20:05:06 UTC
[10/20] git commit: updated refs/heads/4.3 to 67df5b9
CLOUDSTACK-6577: Disable service monitoring in RVR
(cherry picked from commit b9b623bccc6819f4a8f96054c51ecc5d3f1db944)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fac57a0a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fac57a0a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fac57a0a
Branch: refs/heads/4.3
Commit: fac57a0a837a2d8a291029ed99479796c8d625c9
Parents: dddc648
Author: Jayapal <ja...@apache.org>
Authored: Mon May 5 13:45:51 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:10:27 2014 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fac57a0a/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 b0e1228..f3c6ffa 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);
- }
- finalizeUserDataAndDhcpOnStart(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);
+ }
+ }
- 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);
+ finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNetworkId);
}
-
return true;
}