You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/18 20:42:38 UTC

[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 <wi...@gmail.com>


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 <wi...@gmail.com>
Authored: Mon Apr 18 14:41:35 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
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(-)
----------------------------------------------------------------------