Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 38A6E200B29 for ; Thu, 26 May 2016 05:05:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 379F8160A2E; Thu, 26 May 2016 03:05:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 86C09160A39 for ; Thu, 26 May 2016 05:05:56 +0200 (CEST) Received: (qmail 69436 invoked by uid 500); 26 May 2016 03:05:48 -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 65755 invoked by uid 99); 26 May 2016 03:05:41 -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; Thu, 26 May 2016 03:05:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2D33DFC13; Thu, 26 May 2016 03:05:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Thu, 26 May 2016 03:06:16 -0000 Message-Id: In-Reply-To: <499c689eb98a479db368b0a82be15974@git.apache.org> References: <499c689eb98a479db368b0a82be15974@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/39] git commit: updated refs/heads/master to 3c800b4 archived-at: Thu, 26 May 2016 03:05:57 -0000 Merge pull request #1360 from greenqloud/pr-refactor-system-vm-network-creation Refactor system VM default network creationTwo small commits which moves the retrieval of the default network for the console proxy and the SSVM into a separate protected method. It's a small change that makes the code more readable/maintainable and also makes the class more suitable for overriding should one want to do this. It's forward-ported from our 4.2 branch. No new tests since this should not change any functionality, and thus should be covered by the existing unit tests. Now on the master branch (#1359 was on the wrong branch). * pr/1360: Refactor ssvm default network retrieval. Refactor console proxy default network retrieval. Signed-off-by: Will Stevens Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a6e1644 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a6e1644 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a6e1644 Branch: refs/heads/master Commit: 6a6e164448c0f7fc4f83e4a51e16d0892522a8f7 Parents: c122f4c 8971875 Author: Will Stevens Authored: Wed May 25 23:03:31 2016 -0400 Committer: Will Stevens Committed: Wed May 25 23:03:32 2016 -0400 ---------------------------------------------------------------------- .../consoleproxy/ConsoleProxyManagerImpl.java | 90 +++++++-- .../consoleproxy/ConsoleProxyManagerTest.java | 159 +++++++++++++++ .../SecondaryStorageManagerImpl.java | 92 +++++++-- .../SecondaryStorageManagerTest.java | 192 +++++++++++++++++++ 4 files changed, 495 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a6e1644/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a6e1644/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java ----------------------------------------------------------------------