diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 9eddf6dabd9..dd7e817aaea 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2046,6 +2046,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir return false; } try { + + releaseNetworkResourcesOnExpunge(vm.getId()); + List rootVol = _volsDao.findByInstanceAndType(vm.getId(), Volume.Type.ROOT); // expunge the vm _itMgr.advanceExpunge(vm.getUuid()); @@ -2086,6 +2089,23 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } } + /** + * Release network resources, it was done on vm stop previously. + * @param id vm id + * @throws ConcurrentOperationException + * @throws ResourceUnavailableException + */ + private void releaseNetworkResourcesOnExpunge(long id) throws ConcurrentOperationException, ResourceUnavailableException { + final VMInstanceVO vmInstance = _vmDao.findById(id); + if (vmInstance != null){ + final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vmInstance); + _networkMgr.release(profile, false); + } + else { + s_logger.error("Couldn't find vm with id = " + id + ", unable to release network resources"); + } + } + private boolean cleanupVmResources(long vmId) { boolean success = true; // Remove vm from security groups