etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7292: fixed assignig LB to non-source Nat ip address 

status 7292: resolved fixed
This commit is contained in:
alena 2010-11-22 20:53:27 -08:00
parent b9fadd923b
commit 10fb2a0f39
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -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<IPAddressVO> ipAddrs = listPublicIpAddressesInVirtualNetwork(accountId, ipAddr.getDataCenterId(), null);