Merge lp:~andreserl/maas/backport_rev_3397_lp1394382 into lp:maas/1.7

[Andres Rodriguez]

Backport rev 3395 maas does not know about VM paused state

[Andres Rodriguez (andreserl)]

self approve.

review: Approve

=== modified file 'src/provisioningserver/drivers/hardware/virsh.py'
--- src/provisioningserver/drivers/hardware/virsh.py	2014-12-08 16:50:57 +0000
+++ src/provisioningserver/drivers/hardware/virsh.py	2014-12-10 20:43: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):
@@ -243,8 +261,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)