apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7104: perform ipassoc for ip when network is implemented after the gc

Browse Source
This commit is contained in:
Jayapal 2014-07-14 17:35:59 +05:30
parent 1ed554650c
commit 778e04cb77
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/network/IpAddressManagerImpl.java
View File

@ -420,6 +420,11 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
// 1.there is at least one public IP associated with the network on which first rule (PF/static NAT/LB) is being applied. // 1.there is at least one public IP associated with the network on which first rule (PF/static NAT/LB) is being applied.
// 2.last rule (PF/static NAT/LB) on the public IP has been revoked. So the public IP should not be associated with any provider // 2.last rule (PF/static NAT/LB) on the public IP has been revoked. So the public IP should not be associated with any provider
boolean checkIfIpAssocRequired(Network network, boolean postApplyRules, List<PublicIp> publicIps) { boolean checkIfIpAssocRequired(Network network, boolean postApplyRules, List<PublicIp> publicIps) {
if (network.getState() == Network.State.Implementing) {
return true;
}
for (PublicIp ip : publicIps) { for (PublicIp ip : publicIps) {
if (ip.isSourceNat()) { if (ip.isSourceNat()) {
continue; continue;

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

@ -1137,7 +1137,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
loadBalancer.setState(backupState); loadBalancer.setState(backupState);
_lbDao.persist(loadBalancer); _lbDao.persist(loadBalancer);
CloudRuntimeException ex = new CloudRuntimeException("Failed to add specified loadbalancerruleid for vms " CloudRuntimeException ex = new CloudRuntimeException("Failed to add specified loadbalancerruleid for vms "
+ instanceIds); + vmInstanceIds);
ex.addProxyObject(loadBalancer.getUuid(), "loadBalancerId"); ex.addProxyObject(loadBalancer.getUuid(), "loadBalancerId");
// TBD: Also pack in the instanceIds in the exception using the // TBD: Also pack in the instanceIds in the exception using the
// right VO object or table name. // right VO object or table name.