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/master to 5350e61
Date Sat, 20 Sep 2014 13:35:58 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 7cdb67dcf -> 5350e6118


CLOUDSTACK-7494. Migration of a vm fails on Hyper-V. In an earlier commit as part of
cleaning up vmsync changes, checkvirtualmachine command was updated to return the
power state of the vm. The change was missed for Hyper-V. This caused migration to
fail on cloudstack even though it used to succeed on the hypervisor. Updated the
hyper-v agent code to return the cloudstack equivalent power state for check virtual
machine answer.


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

Branch: refs/heads/master
Commit: 5350e61187d5b2f9fdc997dcc9fea34ff68148f7
Parents: 7cdb67d
Author: Devdeep Singh <devdeep@gmail.com>
Authored: Fri Sep 19 16:56:05 2014 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Sat Sep 20 19:06:11 2014 +0530

----------------------------------------------------------------------
 .../ServerResource/HypervResource/HypervResourceController.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5350e611/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 6c6ec56..76f56d9 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -873,7 +873,7 @@ namespace HypervResource
                 string details = null;
                 bool result = false;
                 string vmName = cmd.vmName;
-                string state = null;
+                string powerState = null;
 
                 // TODO: Look up the VM, convert Hyper-V state to CloudStack version.
                 var sys = wmiCallsV2.GetComputerSystem(vmName);
@@ -884,7 +884,7 @@ namespace HypervResource
                 }
                 else
                 {
-                    state = EnabledState.ToCloudStackState(sys.EnabledState); // TODO: V2
changes?
+                    powerState = EnabledState.ToCloudStackPowerState(sys.EnabledState);
                     result = true;
                 }
 
@@ -892,7 +892,7 @@ namespace HypervResource
                 {
                     result = result,
                     details = details,
-                    state = state,
+                    powerstate = powerState,
                     contextMap = contextMap
                 };
                 return ReturnCloudStackTypedJArray(ansContent, CloudStackTypes.CheckVirtualMachineAnswer);


Mime
View raw message