From 2b7ec3f4a871fb08bdca74cdbf173c9d4dc1d84a Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Fri, 20 Jul 2012 14:08:00 -0700
Subject: [PATCH] VPC: one more fix for multiple public nic case for the VPC VR

Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
---
 .../src/com/cloud/network/NetworkManager.java |  4 +--
 .../com/cloud/network/NetworkManagerImpl.java |  5 ++-
 .../cloud/vm/VirtualMachineManagerImpl.java   |  2 +-
 .../cloud/network/MockNetworkManagerImpl.java | 36 +++++++++----------
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java
index 25011e80640..427429529c1 100755
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@ -386,9 +386,9 @@ public interface NetworkManager extends NetworkService {
 
     /**
      * @param vm
-     * @param network
+     * @param nic TODO
      */
-    void removeNic(VirtualMachineProfile<? extends VMInstanceVO> vm, Network network);
+    void removeNic(VirtualMachineProfile<? extends VMInstanceVO> vm, Nic nic);
 
 
     /**
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 02f19efb646..8b7b056e71d 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2501,9 +2501,8 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
     }
     
     @Override
-    public void removeNic(VirtualMachineProfile<? extends VMInstanceVO> vm, Network network) {
-        NicVO nic = _nicDao.findByInstanceIdAndNetworkId(network.getId(), vm.getVirtualMachine().getId());
-        removeNic(vm, nic);
+    public void removeNic(VirtualMachineProfile<? extends VMInstanceVO> vm, Nic nic) {
+        removeNic(vm, _nicDao.findById(nic.getId()));
     }
 
     protected void removeNic(VirtualMachineProfile<? extends VMInstanceVO> vm, NicVO nic) {
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index e0bed24c584..82a3f5704e7 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2552,7 +2552,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
         s_logger.debug("Successfully released nic " + nic +  "for vm " + vm);
         
         //3) Remove the nic
-        _networkMgr.removeNic(vmProfile, network);
+        _networkMgr.removeNic(vmProfile, nic);
         return result;
     }
    
diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java
index 6f48bed3a83..841d4a6fc49 100755
--- a/server/test/com/cloud/network/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java
@@ -803,15 +803,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see com.cloud.network.NetworkManager#removeNic(com.cloud.vm.VirtualMachineProfile, com.cloud.network.Network)
-     */
-    @Override
-    public void removeNic(VirtualMachineProfile<? extends VMInstanceVO> vm, Network network) {
-        // TODO Auto-generated method stub
-        
-    }
-
     /* (non-Javadoc)
      * @see com.cloud.network.NetworkManager#listPublicIpsAssignedToAccount(long, long, java.lang.Boolean)
      */
@@ -921,15 +912,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see com.cloud.network.NetworkManager#handleSystemIpRelease(com.cloud.network.IpAddress)
-     */
-    @Override
-    public boolean handleSystemIpRelease(IpAddress ip) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
     /* (non-Javadoc)
      * @see com.cloud.network.NetworkManager#checkNetworkPermissions(com.cloud.user.Account, com.cloud.network.Network)
      */
@@ -1138,4 +1120,22 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
         // TODO Auto-generated method stub
         return false;
     }
+
+    /* (non-Javadoc)
+     * @see com.cloud.network.NetworkManager#handleSystemIpRelease(com.cloud.network.IpAddress)
+     */
+    @Override
+    public boolean handleSystemIpRelease(IpAddress ip) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see com.cloud.network.NetworkManager#removeNic(com.cloud.vm.VirtualMachineProfile, com.cloud.vm.Nic)
+     */
+    @Override
+    public void removeNic(VirtualMachineProfile<? extends VMInstanceVO> vm, Nic nic) {
+        // TODO Auto-generated method stub
+        
+    }
 }