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 B1C6919932 for ; Mon, 18 Apr 2016 18:42:36 +0000 (UTC) Received: (qmail 58259 invoked by uid 500); 18 Apr 2016 18:42:36 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 58143 invoked by uid 500); 18 Apr 2016 18:42:36 -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 58072 invoked by uid 99); 18 Apr 2016 18:42:36 -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; Mon, 18 Apr 2016 18:42:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D614DFB95; Mon, 18 Apr 2016 18:42:36 +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: Mon, 18 Apr 2016 18:42:38 -0000 Message-Id: <56199bd17ed54a28832ebcaa0de94cc0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: updated refs/heads/master to a3371d2 Merge pull request #1262 from rafaelweingartner/lrg-cs-hackday-015 Removed unnecessary code from getGuestOsType in CitrixResourceBaseConsidering that all mapping of Guest OS Names to their respective hypervisor compatible types is made thorugh accessing a database, we've decided to remove a bit of code in the XcpOssResource class which was doing that same thing for 2 different OS's (both of which ARE in the database). That has led us to a bunch of unused parameters in the getGuestOsType method from its superclass, which we've also decided to remove. Test cases were added for four different possibilities for the platformEmulator String: one for a null String, one for a blank String, one for an empy String and one for a random case with a valid String. * pr/1262: Remove test cases duplicated code. Removed unnecessary code from getGuestOsType in CitrixResourceBase 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/a3371d28 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3371d28 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3371d28 Branch: refs/heads/master Commit: a3371d282f2876feae031569e5df2ef38492e6f1 Parents: a957821 8355b58 Author: Will Stevens Authored: Mon Apr 18 14:41:35 2016 -0400 Committer: Will Stevens Committed: Mon Apr 18 14:41:35 2016 -0400 ---------------------------------------------------------------------- .../xenserver/resource/CitrixResourceBase.java | 10 ++-- .../xenserver/resource/XcpOssResource.java | 16 ------- .../resource/CitrixResourceBaseTest.java | 49 ++++++++++++++++++-- .../xenserver/resource/XcpOssResourceTest.java | 12 +++-- .../resource/XcpServerResourceTest.java | 12 +++-- .../resource/XenServer56FP1ResourceTest.java | 15 ++++-- .../resource/XenServer56ResourceTest.java | 13 ++++-- .../resource/XenServer56SP2ResourceTest.java | 14 ++++-- .../resource/XenServer600ResourceTest.java | 15 ++++-- .../resource/XenServer625ResourceTest.java | 25 ++++++---- .../resource/XenServer650ResourceTest.java | 13 ++++-- 11 files changed, 132 insertions(+), 62 deletions(-) ----------------------------------------------------------------------