Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0705F10EE6 for ; Fri, 19 Apr 2013 11:28:25 +0000 (UTC) Received: (qmail 56005 invoked by uid 500); 19 Apr 2013 11:28:21 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 55960 invoked by uid 500); 19 Apr 2013 11:28:21 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 52706 invoked by uid 99); 19 Apr 2013 11:28:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Apr 2013 11:28:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D395E3248D3; Fri, 19 Apr 2013 11:28:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Fri, 19 Apr 2013 11:28:36 -0000 Message-Id: <9ffa9e68c8ca471d88944b0d205d2aad@git.apache.org> In-Reply-To: <92333337c91046f4b7601ac7d3a64bd4@git.apache.org> References: <92333337c91046f4b7601ac7d3a64bd4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/35] git commit: updated refs/heads/marvin_refactor to 4abd929 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 Authored: Fri Apr 19 10:45:43 2013 +0800 Committer: Mice Xia 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 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); }