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

bug 12747: release ip when no static nat rule existed 

status 12747: resolved fixed
This commit is contained in:
Sheng Yang 2012-02-07 14:16:24 -08:00
parent 58fe40715f
commit 99b7b73d7f
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,9 +670,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
throw new CloudRuntimeException("Multiply generic source NAT IPs provided for network " + ip.getAssociatedWithNetworkId());
}
}
if (ip.isOneToOneNat()) {
services.add(Service.StaticNat);
}
ipToServices.put(ip, services);
// if IP in allocating state then it will not have any rules attached so skip IPAssoc to network service
@ -683,10 +680,23 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
// check if any active rules are applied on the public IP
Set<Purpose> purposes = getPublicIpPurposeInRules(ip, false, includingFirewall);
// Firewall rules didn't cover static NAT
if (ip.isOneToOneNat() && ip.getAssociatedWithVmId() != null) {
if (purposes == null) {
purposes = new HashSet<Purpose>();
}
purposes.add(Purpose.StaticNat);
}
if (purposes == null || purposes.isEmpty()) {
// since no active rules are there check if any rules are applied on the public IP but are in
// revoking state
purposes = getPublicIpPurposeInRules(ip, true, includingFirewall);
if (ip.isOneToOneNat()) {
if (purposes == null) {
purposes = new HashSet<Purpose>();
}
purposes.add(Purpose.StaticNat);
}
if (purposes == null || purposes.isEmpty()) {
// IP is not being used for any purpose so skip IPAssoc to network service provider
continue;
@ -4185,6 +4195,23 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
}
}
// For revoked static nat IP, set the vm_id to null, indicate it should be revoked
for (StaticNat staticNat : staticNats) {
if (staticNat.isForRevoke()) {
for (PublicIp publicIp : publicIps) {
if (publicIp.getId() == staticNat.getSourceIpAddressId()) {
publicIps.remove(publicIp);
IPAddressVO ip = _ipAddressDao.findByIdIncludingRemoved(staticNat.getSourceIpAddressId());
// ip can't be null, otherwise something wrong happened
ip.setAssociatedWithVmId(null);
publicIp = new PublicIp(ip, _vlanDao.findById(ip.getVlanId()), NetUtils.createSequenceBasedMacAddress(ip.getMacAddress()));
publicIps.add(publicIp);
break;
}
}
}
}
// if all the rules configured on public IP are revoked then, dis-associate IP with network service provider
applyIpAssociations(network, true, continueOnError, publicIps);

6
server/src/com/cloud/network/rules/RulesManagerImpl.java
View File

@ -863,8 +863,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
revokeStaticNatRuleInternal(rule.getId(), caller, userId, false);
}
// revoke static nat for the ip address
boolean success = applyStaticNatForIp(ipId, false, caller, true);
boolean success = true;
// revoke all port forwarding rules
success = success && applyPortForwardingRules(ipId, true, caller);
@ -872,6 +871,9 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
// revoke all all static nat rules
success = success && applyStaticNatRules(ipId, true, caller);
// revoke static nat for the ip address
success = success && applyStaticNatForIp(ipId, false, caller, true);
// Now we check again in case more rules have been inserted.
rules.addAll(_portForwardingDao.listByIpAndNotRevoked(ipId));
rules.addAll(_firewallDao.listByIpAndPurposeAndNotRevoked(ipId, Purpose.StaticNat));