You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/21 02:09:34 UTC
[1/5] git commit: VPC: one more fix for multiple public nic case for
the VPC VR
Updated Branches:
refs/heads/vpc 8712812ca -> 394f55d9e
VPC: one more fix for multiple public nic case for the VPC VR
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2b7ec3f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2b7ec3f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2b7ec3f4
Branch: refs/heads/vpc
Commit: 2b7ec3f4a871fb08bdca74cdbf173c9d4dc1d84a
Parents: 5a64d4f
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Fri Jul 20 14:08:00 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 20 17:12:34 2012 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkManager.java | 4 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 5 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 36 +++++++-------
4 files changed, 23 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b7ec3f4/server/src/com/cloud/network/NetworkManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java
index 25011e8..4274295 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);
/**
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b7ec3f4/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 02f19ef..8b7b056 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) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b7ec3f4/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index e0bed24..82a3f57 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;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b7ec3f4/server/test/com/cloud/network/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java
index 6f48bed..841d4a6 100755
--- a/server/test/com/cloud/network/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java
@@ -804,15 +804,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
}
/* (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)
*/
@Override
@@ -922,15 +913,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
}
/* (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)
*/
@Override
@@ -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
+
+ }
}