From 620466d393e374da85cdd909e3f15db0a04f4c8c Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 28 Jan 2011 10:05:07 -0800
Subject: [PATCH] Network destroy: when release ip addresses assigned to the
 network, no need to send applyIpAssociations command to the network elements
 as they are already shutdown.

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 9 ++-------
 server/src/com/cloud/user/AccountManagerImpl.java    | 3 ---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 1cc61d6be60..a0e5867eb23 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1656,15 +1656,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         List<IPAddressVO> ipsToRelease = _ipAddressDao.listByAssociatedNetwork(networkId);
         if (ipsToRelease != null && !ipsToRelease.isEmpty()) {
             for (IPAddressVO ip : ipsToRelease) {
-                if (!releasePublicIpAddress(ip.getAddress(), ip.getAccountId(), callerUserId)) {
-                    s_logger.warn("Failed to deallocate ip address as a part of network id=" + networkId + " destroy");
-                    success = false;
-                }
+                _ipAddressDao.unassignIpAddress(ip.getAddress());
             }
             
-            if (success) {
-                s_logger.debug("Ip addresses are deallocated successfully as a part of network id=" + networkId + " destroy");
-            }
+            s_logger.debug("Ip addresses are unassigned successfully as a part of network id=" + networkId + " destroy");
         }
         
         for (NetworkElement element : _networkElements) {
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index d7f1f9fbc1f..1d251dffbec 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -58,9 +58,6 @@ import com.cloud.configuration.dao.ResourceLimitDao;
 import com.cloud.domain.Domain;
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
-import com.cloud.event.EventTypes;
-import com.cloud.event.EventUtils;
-import com.cloud.event.EventVO;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InvalidParameterValueException;