cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/3] git commit: updated refs/heads/4.4 to c081cf7
Date Tue, 06 May 2014 15:49:19 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 3a3457e71 -> c081cf7b1


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/ca270cbd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca270cbd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca270cbd

Branch: refs/heads/4.4
Commit: ca270cbdf728b2aa646772bc611fcb0170d7276a
Parents: 3a3457e
Author: Jayapal <jayapal@apache.org>
Authored: Mon May 5 13:45:51 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Tue May 6 17:47:39 2014 +0200

----------------------------------------------------------------------
 .../VirtualNetworkApplianceManagerImpl.java     | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca270cbd/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 80ca1cf..56fb3b1 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;
     }
 


Mime
View raw message