Merge lp:~julian-edwards/maas/vm-pause-state-bug-1394382 into lp:~maas-committers/maas/trunk

[Julian Edwards]

Handle more of the known states in which a virsh machine can be, instead of crashing.

The existing tests cover the functionality, nothing has changed other than adding the lookup table with extra states.

[Graham Binns (gmb)]

It's worth adding a tests that shows that for each VM state in VirshVMState, power_state_virsh() returns a value that makes sense. Other than that, LGTM.

review: Approve

[Julian Edwards (julian-edwards)]

On Tuesday 02 Dec 2014 07:21:07 you wrote:
> Review: Approve
>
> It's worth adding a tests that shows that for each VM state in VirshVMState,
> power_state_virsh() returns a value that makes sense. Other than that,
> LGTM.

Thanks for the review.

I'm not sure what that would be really testing. There are already tests for
the happy path and the unhappy path. The rest of it is just mappings that
I've added.

[Graham Binns (gmb)]

On 2 December 2014 at 08:03, Julian Edwards <email address hidden>
wrote:

>
> I'm not sure what that would be really testing. There are already tests
> for
> the happy path and the unhappy path. The rest of it is just mappings that
> I've added.
>

Ah, so there are. In my morning-brain state I didn't see them. Fair enough.

=== modified file 'src/provisioningserver/drivers/hardware/virsh.py'
--- src/provisioningserver/drivers/hardware/virsh.py	2014-09-15 14:28:28 +0000
+++ src/provisioningserver/drivers/hardware/virsh.py	2014-12-02 05:59:23 +0000
@@ -33,6 +33,24 @@
 class VirshVMState:
     OFF = "shut off"
     ON = "running"
+    NO_STATE = "no state"
+    IDLE = "idle"
+    PAUSED = "paused"
+    IN_SHUTDOWN = "in shutdown"
+    CRASHED = "crashed"
+    PM_SUSPENDED = "pmsuspended"
+
+
+VM_STATE_TO_POWER_STATE = {
+    VirshVMState.OFF: "off",
+    VirshVMState.ON: "on",
+    VirshVMState.NO_STATE: "off",
+    VirshVMState.IDLE: "off",
+    VirshVMState.PAUSED: "off",
+    VirshVMState.IN_SHUTDOWN: "on",
+    VirshVMState.CRASHED: "off",
+    VirshVMState.PM_SUSPENDED: "off",
+    }
 
 
 class VirshError(Exception):
@@ -238,8 +256,7 @@
     if state is None:
         raise VirshError('Failed to get domain: %s' % machine)
 
-    if state == VirshVMState.OFF:
-        return 'off'
-    elif state == VirshVMState.ON:
-        return 'on'
-    raise VirshError('Unknown state: %s' % state)
+    try:
+        return VM_STATE_TO_POWER_STATE[state]
+    except KeyError:
+        raise VirshError('Unknown state: %s' % state)