apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 11:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5466:Fixed freeing ip address in removeIpFromNic

Browse Source
This commit is contained in:
Jayapal 2013-12-18 14:49:47 +05:30
parent d810ab46fe
commit 961834661c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -756,12 +756,12 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// Verify input parameters // Verify input parameters
NicSecondaryIpVO secIpVO = _nicSecondaryIpDao.findById(ipAddressId); NicSecondaryIpVO secIpVO = _nicSecondaryIpDao.findById(ipAddressId);
if (secIpVO == null) { if (secIpVO == null) {
throw new InvalidParameterValueException("Unable to find ip address by id"); throw new InvalidParameterValueException("Unable to find secondary ip address by id");
} }
VirtualMachine vm = _userVmDao.findById(secIpVO.getVmId()); VirtualMachine vm = _userVmDao.findById(secIpVO.getVmId());
if (vm == null) { if (vm == null) {
throw new InvalidParameterValueException("There is no vm with the nic"); throw new InvalidParameterValueException("There is no vm with the given secondary ip");
} }
// verify permissions // verify permissions
_accountMgr.checkAccess(caller, null, true, vm); _accountMgr.checkAccess(caller, null, true, vm);
@ -790,7 +790,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
throw new InvalidParameterValueException("Invalid zone Id is given"); throw new InvalidParameterValueException("Invalid zone Id is given");
} }
s_logger.debug("Calling the ip allocation ..."); s_logger.debug("Calling secondary ip "+ secIpVO.getIp4Address() + " release ");
if (dc.getNetworkType() == NetworkType.Advanced && network.getGuestType() == Network.GuestType.Isolated) { if (dc.getNetworkType() == NetworkType.Advanced && network.getGuestType() == Network.GuestType.Isolated) {
//check PF or static NAT is configured on this ip address //check PF or static NAT is configured on this ip address
String secondaryIp = secIpVO.getIp4Address(); String secondaryIp = secIpVO.getIp4Address();
@ -812,7 +812,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
publicIpVO.getId()); publicIpVO.getId());
} }
} else if (dc.getNetworkType() == NetworkType.Basic || ntwkOff.getGuestType() == Network.GuestType.Shared) { } else if (dc.getNetworkType() == NetworkType.Basic || ntwkOff.getGuestType() == Network.GuestType.Shared) {
final IPAddressVO ip = _ipAddressDao.findByIpAndNetworkId(secIpVO.getNetworkId(), secIpVO.getIp4Address()); final IPAddressVO ip = _ipAddressDao.findByIpAndSourceNetworkId(secIpVO.getNetworkId(), secIpVO.getIp4Address());
if (ip != null) { if (ip != null) {
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@Override @Override