cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajeshbatt...@apache.org
Subject git commit: updated refs/heads/hyperv to cce0a27
Date Wed, 30 Oct 2013 12:31:17 GMT
Updated Branches:
  refs/heads/hyperv a134a9bb1 -> cce0a27e2


Fixed VM state changes w.r.t wmi version 2 changes


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cce0a27e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cce0a27e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cce0a27e

Branch: refs/heads/hyperv
Commit: cce0a27e2bc01dbb2c18b6bdbedb24737e41c0e7
Parents: a134a9b
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Wed Oct 30 17:55:20 2013 +0530
Committer: Rajesh Battala <rajesh.battala@citrix.com>
Committed: Wed Oct 30 17:59:28 2013 +0530

----------------------------------------------------------------------
 .../ServerResource/HypervResource/WmiCallsV2.cs      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cce0a27e/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
index 6914ff3..4b44a23 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -411,7 +411,7 @@ namespace HypervResource
             if (vmName.StartsWith("r-") || vmName.StartsWith("s-") || vmName.StartsWith("v-"))
             {
                 System.Threading.Thread.Sleep(90000);
-                SetState(newVm, RequiredState.Reboot);
+                SetState(newVm, RequiredState.Reset);
                 // wait for the second boot and then return with sucesss
                 pingResource(publicIpAddress);
             }
@@ -1947,13 +1947,13 @@ namespace HypervResource
         public const UInt16 Disabled = 3;       // Turns the VM off.
         public const UInt16 ShutDown = 4;
         public const UInt16 Offline = 6;
-        public const UInt16 Test = 7;
+        //public const UInt16 Test = 7;
         public const UInt16 Defer = 8;
-        public const UInt16 Quiesce = 9;
-        public const UInt16 Reboot = 10;        // A hard reset of the VM.
+        // public const UInt16 Quiesce = 9;
+        // public const UInt16 Reboot = 10;        // A hard reset of the VM.
         public const UInt16 Reset = 11;         // For future use.
-        public const UInt16 Paused = 32768;     // Pauses the VM.
-        public const UInt16 Suspended = 32769;  // Saves the state of the VM.
+        public const UInt16 Paused = 9;     // Pauses the VM.
+        public const UInt16 Suspended = 32779;  // Saves the state of the VM.
 
         public static string ToString(UInt16 value)
         {
@@ -1964,10 +1964,7 @@ namespace HypervResource
                 case Disabled: result = "Disabled"; break;
                 case ShutDown: result = "ShutDown"; break;
                 case Offline: result = "Offline"; break;
-                case Test: result = "Test"; break;
                 case Defer: result = "Defer"; break;
-                case Quiesce: result = "Quiesce"; break;
-                case Reboot: result = "Reboot"; break;
                 case Reset: result = "Reset"; break;
             }
             return result;


Mime
View raw message