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

bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release 

status 11021: resolved fixed
This commit is contained in:
Sheng Yang 2011-08-10 12:50:14 -07:00
parent 7e324b099d
commit e1de9f5bec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/vm/Nic.java
View File

@ -83,7 +83,7 @@ public interface Nic {
}
public enum ReservationStrategy {
PlaceHolder, Create, Start;
PlaceHolder, Create, Start, Managed;
}
/**

4
server/src/com/cloud/network/guru/PublicNetworkGuru.java
View File

@ -155,7 +155,7 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
if (nic.getIp4Address() == null) {
nic.setStrategy(ReservationStrategy.Start);
} else {
nic.setStrategy(ReservationStrategy.Create);
nic.setStrategy(ReservationStrategy.Managed);
}
return nic;
@ -182,7 +182,7 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
@Override
public void deallocate(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm) {
IPAddressVO ip = _ipAddressDao.findByIpAndSourceNetworkId(nic.getNetworkId(), nic.getIp4Address());
if (ip != null) {
if (ip != null && nic.getReservationStrategy() != ReservationStrategy.Managed) {
_networkMgr.markIpAsUnavailable(ip.getId());
_ipAddressDao.unassignIpAddress(ip.getId());
}