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 3D897108C7 for ; Mon, 28 Oct 2013 06:08:53 +0000 (UTC) Received: (qmail 24066 invoked by uid 500); 28 Oct 2013 06:08:50 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 24052 invoked by uid 500); 28 Oct 2013 06:08:49 -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 24044 invoked by uid 99); 28 Oct 2013 06:08:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Oct 2013 06:08:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E9B81882BEE; Mon, 28 Oct 2013 06:08:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devdeep@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/hyperv to c05758b Date: Mon, 28 Oct 2013 06:08:47 +0000 (UTC) Updated Branches: refs/heads/hyperv a27899aae -> c05758b25 Fix to make sure the hyperv agent and the funcitonal tests are working after the unit tests update. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c05758b2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c05758b2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c05758b2 Branch: refs/heads/hyperv Commit: c05758b25f7193d5f27198c56c7b45768f3d5b46 Parents: a27899a Author: Anshul Gangwar Authored: Mon Oct 28 11:38:38 2013 +0530 Committer: Devdeep Singh Committed: Mon Oct 28 11:40:07 2013 +0530 ---------------------------------------------------------------------- .../ServerResource/HypervResource/HypervResourceController.cs | 6 ++++-- .../ServerResource.Tests/HypervResourceController1Test.cs | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c05758b2/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs index bdb0eae..e1c75e3 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs @@ -107,6 +107,8 @@ namespace HypervResource public static void Configure(HypervResourceControllerConfig config) { HypervResourceController.config = config; + wmiCalls = new WmiCalls(); + wmiCallsV2 = new WmiCallsV2(); } public static HypervResourceControllerConfig config = new HypervResourceControllerConfig(); @@ -118,8 +120,8 @@ namespace HypervResource { } - public IWmiCalls wmiCalls { get; set; } - public IWmiCallsV2 wmiCallsV2 { get; set;} + public static IWmiCalls wmiCalls { get; set; } + public static IWmiCallsV2 wmiCallsV2 { get; set;} // GET api/HypervResource public string Get() http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c05758b2/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceController1Test.cs ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceController1Test.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceController1Test.cs index 6f8aa4b..ec91e9f 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceController1Test.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceController1Test.cs @@ -165,7 +165,7 @@ namespace ServerResource.Tests "\"volumeId\":10,\"hyperType\":\"Hyperv\"},\"templateUrl\":" + testSampleTemplateURLJSON + ",\"contextMap\":{},\"wait\":0}"; dynamic jsonCreateCmd = JsonConvert.DeserializeObject(createCmd); HypervResourceController rsrcServer = new HypervResourceController(); - rsrcServer.wmiCalls = wmiCalls; + HypervResourceController.wmiCalls = wmiCalls; Assert.True(Directory.Exists(testLocalStorePath), testLocalStorePath + " does not exist "); string filePath = Path.Combine(testLocalStorePath, (string)JsonConvert.DeserializeObject(testSampleTemplateURLJSON)); @@ -202,7 +202,7 @@ namespace ServerResource.Tests // Arrange HypervResourceController rsrcServer = new HypervResourceController(); - rsrcServer.wmiCalls = wmiCalls; + HypervResourceController.wmiCalls = wmiCalls; String sample = getSampleStartCommand(); @@ -227,7 +227,7 @@ namespace ServerResource.Tests // Arrange HypervResourceController rsrcServer = new HypervResourceController(); - rsrcServer.wmiCalls = wmiCalls; + HypervResourceController.wmiCalls = wmiCalls; String sampleStop = "{\"isProxy\":false,\"vmName\":\"i-2-17-VM\",\"contextMap\":{},\"wait\":0}"; dynamic jsonStopCmd = JsonConvert.DeserializeObject(sampleStop);