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

handle release of ip on deletion of loadbalancer rule

This commit is contained in:
Chiradeep Vittal 2011-08-02 20:31:37 -07:00
parent e725c8ffeb
commit 8ccfdc08de
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/network/lb/ElasticLoadBalancerManager.java
View File

@ -37,5 +37,6 @@ public interface ElasticLoadBalancerManager {
throws ResourceUnavailableException;
public LoadBalancer handleCreateLoadBalancerRule(CreateLoadBalancerRuleCmd lb, Account caller) throws InsufficientAddressCapacityException, NetworkRuleConflictException;
public void handleDeleteLoadBalancerRule(LoadBalancer lb, long callerUserId, Account caller);
}

19
server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
View File

@ -206,20 +206,19 @@ public class ElasticLoadBalancerManagerImpl implements
params.put(VirtualMachineProfile.Param.RestartNetwork, true);
Account owner = _accountService.getActiveAccount("system", new Long(1));
DeployDestination dest = new DeployDestination(dc, pod, null, null);
s_logger.debug("About to deploy elastic LB vm ");
s_logger.debug("About to deploy ELB vm ");
try {
DomainRouterVO elbVm = deployELBVm(network, dest, owner, params);
s_logger.debug("ELB vm = " + elbVm);
if (elbVm == null) {
throw new InvalidParameterValueException("Could not deploy or find existing ELB VM");
}
s_logger.debug("Deployed ELB vm = " + elbVm);
return elbVm;
} catch (Throwable t) {
String errorMsg = "Error while deploying Loadbalancer VM: " + t;
s_logger.warn(errorMsg);
s_logger.warn("Error while deploying ELB VM: " + t);
return null;
}
@ -563,7 +562,11 @@ public class ElasticLoadBalancerManagerImpl implements
public void releaseIp(long ipId, long userId, Account caller) {
s_logger.info("Release public IP for loadbalancing " + ipId);
IPAddressVO ipvo = _ipAddressDao.findById(ipId);
ipvo.setAssociatedWithNetworkId(null);
_ipAddressDao.update(ipvo.getId(), ipvo);
_networkMgr.releasePublicIpAddress(ipId, userId, caller);
_ipAddressDao.unassignIpAddress(ipId);
}
@Override
@ -714,4 +717,10 @@ public class ElasticLoadBalancerManagerImpl implements
}
}
@Override
public void handleDeleteLoadBalancerRule(LoadBalancer lb, long userId, Account caller) {
s_logger.debug("ELB mgr: releasing ip " + lb.getSourceIpAddressId() + " since the LB rule is deleted");
releaseIp(lb.getSourceIpAddressId(), userId, caller);
}
}

1
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -345,6 +345,7 @@ public class LoadBalancingRulesManagerImpl implements LoadBalancingRulesManager,
}
_rulesDao.remove(lb.getId());
_elbMgr.handleDeleteLoadBalancerRule(lb, callerUserId, caller);
s_logger.debug("Load balancer with id " + lb.getId() + " is removed successfully");
return true;
}