From 05713a20e89b25b3ed84b636b648cfef6e8f26f9 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 12 Aug 2011 19:10:23 -0700
Subject: [PATCH] bug 11114: when release static nat as a part of vm expunge,
 do searchIncludingRemoved in nics table as the nics are marked as Removed
 before static nat is released status 11114: resolved fixed

---
 server/src/com/cloud/network/NetworkManager.java         | 2 ++
 server/src/com/cloud/network/NetworkManagerImpl.java     | 9 ++++++++-
 server/src/com/cloud/network/rules/RulesManagerImpl.java | 9 ++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java
index 09fa13e6c56..59be681a169 100644
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@ -215,4 +215,6 @@ public interface NetworkManager extends NetworkService {
     boolean applyStaticNats(List<? extends StaticNat> staticNats, boolean continueOnError) throws ResourceUnavailableException;
     
     String getIpInNetwork(long vmId, long networkId);
+
+    String getIpInNetworkIncludingRemoved(long vmId, long networkId);
 }
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index fbf06141efd..7ad105007ab 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2641,7 +2641,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
     @Override
     public String getIpInNetwork(long vmId, long networkId) {
         Nic guestNic = getNicInNetwork(vmId, networkId);
-        assert (guestNic != null && guestNic.getIp4Address() != null) : "Vm doesn't belong to network associated with ipAddress or ip4 address is null?";
+        assert (guestNic != null && guestNic.getIp4Address() != null) : "Vm doesn't belong to network associated with ipAddress or ip4 address is null";
+        return guestNic.getIp4Address();
+    }
+    
+    @Override
+    public String getIpInNetworkIncludingRemoved(long vmId, long networkId) {
+        Nic guestNic = getNicInNetworkIncludingRemoved(vmId, networkId);
+        assert (guestNic != null && guestNic.getIp4Address() != null) : "Vm doesn't belong to network associated with ipAddress or ip4 address is null";
         return guestNic.getIp4Address();
     }
 
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 0f9eb2c2036..4449f1bd149 100755
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -1096,7 +1096,14 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
 
         //create new static nat rule
         // Get nic IP4 address
-        String dstIp = _networkMgr.getIpInNetwork(sourceIp.getAssociatedWithVmId(), networkId);
+        
+        String dstIp;
+        if (forRevoke) {
+            dstIp = _networkMgr.getIpInNetworkIncludingRemoved(sourceIp.getAssociatedWithVmId(), networkId);
+        } else {
+            dstIp = _networkMgr.getIpInNetwork(sourceIp.getAssociatedWithVmId(), networkId);
+        }
+        
         StaticNatImpl staticNat = new StaticNatImpl(sourceIp.getAccountId(), sourceIp.getDomainId(), networkId, sourceIpId, dstIp, forRevoke);
         staticNats.add(staticNat);