From 7462aa8539bdf9262dae545dc9d6ed650fa9f9a2 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Tue, 31 May 2011 18:36:41 -0700
Subject: [PATCH] Add host verification for CheckRouterCommand

We only send CheckRouterCommand to the hosts managed by current management
server.
---
 .../network/router/VirtualNetworkApplianceManagerImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 24258ab484f..efc8407802c 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -72,6 +72,7 @@ import com.cloud.alert.AlertManager;
 import com.cloud.api.commands.UpgradeRouterCmd;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.capacity.dao.CapacityDao;
+import com.cloud.cluster.ManagementServerNode;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManager;
 import com.cloud.configuration.dao.ConfigurationDao;
@@ -95,6 +96,7 @@ import com.cloud.exception.OperationTimedoutException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.StorageUnavailableException;
+import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.IPAddressVO;
@@ -712,6 +714,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
 
             for (DomainRouterVO router : routers) {
                 String privateIP = router.getPrivateIpAddress();
+                HostVO host = _hostDao.findById(router.getHostId());
+                /* Only cover hosts managed by this management server */
+                if (host.getManagementServerId() != ManagementServerNode.getManagementServerId()) {
+                    continue;
+                }
                 if (privateIP != null) {
                     final CheckRouterCommand command = new CheckRouterCommand();
                     command.setAccessDetail(NetworkElementCommand.ROUTER_IP, router.getPrivateIpAddress());