From 10fb2a0f39be2fec9749d6627bed2dc7d05c1110 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 22 Nov 2010 20:53:27 -0800 Subject: [PATCH] bug 7292: fixed assignig LB to non-source Nat ip address status 7292: resolved fixed --- .../src/com/cloud/network/NetworkManagerImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 563d8d718c5..2119d481ead 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1162,13 +1162,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag throw new InvalidParameterValueException("Failed to assign to load balancer " + loadBalancerId + ", the load balancer was not found."); } - DomainRouterVO syncObject = _routerMgr.getRouter(loadBalancer.getIpAddress()); - if(syncObject == null){ - throw new InvalidParameterValueException("Failed to assign to load balancer " + loadBalancerId + ", the domain router was not found at "+loadBalancer.getIpAddress()); - } - else{ - cmd.synchronizeCommand("Router", syncObject.getId()); - } // Permission check... Account account = UserContext.current().getAccount(); @@ -1295,6 +1288,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag if (firewallRulesToApply.isEmpty()) { return true; } + + //Sync on domR + if(router == null){ + throw new InvalidParameterValueException("Failed to assign to load balancer " + loadBalancerId + ", the domain router was not found at " + loadBalancer.getIpAddress()); + } + else{ + cmd.synchronizeCommand("Router", router.getId()); + } IPAddressVO ipAddr = _ipAddressDao.findById(loadBalancer.getIpAddress()); List ipAddrs = listPublicIpAddressesInVirtualNetwork(accountId, ipAddr.getDataCenterId(), null);