cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [22/35] git commit: updated refs/heads/marvin_refactor to 4abd929
Date Fri, 19 Apr 2013 11:28:36 GMT
CLOUDSTACK-2083 router never comes to running state when addNicToVirtualMachine api is called
with network id which is only allocated


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4fd92126
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4fd92126
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4fd92126

Branch: refs/heads/marvin_refactor
Commit: 4fd921269bdce3ea55bb63ac5226ff52e6a82e9d
Parents: f8d4a23
Author: Mice Xia <mice_xia@tcloudcomputing.com>
Authored: Fri Apr 19 10:45:43 2013 +0800
Committer: Mice Xia <mice_xia@tcloudcomputing.com>
Committed: Fri Apr 19 10:52:00 2013 +0800

----------------------------------------------------------------------
 .../src/com/cloud/network/NetworkManagerImpl.java  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4fd92126/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 114402b..72ccac0 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -3636,8 +3636,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
                 
                 //2) prepare nic
                 if (prepare) {
-                    NetworkVO networkVO = _networksDao.findById(network.getId());
-                    nic = prepareNic(vmProfile, dest, context, nic.getId(), networkVO);
+                    Pair<NetworkGuru, NetworkVO> implemented = implementNetwork(nic.getNetworkId(),
dest, context);
+                    nic = prepareNic(vmProfile, dest, context, nic.getId(), implemented.second());
                     s_logger.debug("Nic is prepared successfully for vm " + vm + " in network
" + network);
                 }
                 


Mime
View raw message