cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/hyperv to c05758b
Date Mon, 28 Oct 2013 06:08:47 GMT
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 <anshul.gangwar@citrix.com>
Authored: Mon Oct 28 11:38:38 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
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);


Mime
View raw message