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 33DF318E62 for ; Sun, 13 Dec 2015 17:44:00 +0000 (UTC) Received: (qmail 99559 invoked by uid 500); 13 Dec 2015 17:44:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 99413 invoked by uid 500); 13 Dec 2015 17:44:00 -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 99392 invoked by uid 99); 13 Dec 2015 17:44:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Dec 2015 17:44:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D15BCDFB87; Sun, 13 Dec 2015 17:43:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Sun, 13 Dec 2015 17:44:00 -0000 Message-Id: <6cdcdacd0cf14a82866786426648e747@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.6 to 5774b96 Merge pull request #1209 from ustcweizhou/free-deviceid CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count when we restart vpc tiers, the old nics will be removed, and create a new nic. however, the device_id was set to the nic count, which may be already used. this commit get the first device_id not in use as the device_id of new nic. This issue also happen when we add multiple networks to a vm and remove them. * pr/1209: CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count Signed-off-by: Daan Hoogland Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5774b965 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5774b965 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5774b965 Branch: refs/heads/4.6 Commit: 5774b965f35fcfea645c25a9cc0be9f3e603dfa1 Parents: d7b7171 acfc19d Author: Daan Hoogland Authored: Sun Dec 13 18:43:29 2015 +0100 Committer: Daan Hoogland Committed: Sun Dec 13 18:43:30 2015 +0100 ---------------------------------------------------------------------- .../orchestration/NetworkOrchestrator.java | 2 +- engine/schema/src/com/cloud/vm/dao/NicDao.java | 2 +- .../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 31 +++++++++++++------- 3 files changed, 22 insertions(+), 13 deletions(-) ----------------------------------------------------------------------