From 5350e61187d5b2f9fdc997dcc9fea34ff68148f7 Mon Sep 17 00:00:00 2001 From: Devdeep Singh Date: Fri, 19 Sep 2014 16:56:05 +0530 Subject: [PATCH] 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. --- .../HypervResource/HypervResourceController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs index 6c6ec56f424..76f56d9b644 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);