X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/3b6cfced7d42c772e09b5f6a8148756adc1c2641..4ce0edc046482af00c58171cb63064da34561e79:/code/controls.py

diff --git a/code/controls.py b/code/controls.py
index b946666..b4740d4 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -97,7 +97,7 @@ def bootMachine(machine, cdtype):
     else:
         out, err = remctl('control', machine.name, 'create',
                           err=True)
-    if 'already exists' in out:
+    if 'already running' in err:
         raise InvalidInput('action', 'create',
                            'VM %s is already on' % machine.name)
     elif err:
@@ -242,7 +242,7 @@ def commandResult(username, state, fields):
             out, err = remctl('control', machine.name, 'reboot',
                               err=True)
         if err:
-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):
                 raise InvalidInput("action", "reboot", 
                                    "Machine is not on")
             else:
@@ -259,7 +259,7 @@ def commandResult(username, state, fields):
     elif action == 'Power off':
         out, err = remctl('control', machine.name, 'destroy', err=True)
         if err:
-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):
                 raise InvalidInput("action", "Power off", 
                                    "Machine is not on.")
             else:
@@ -269,7 +269,7 @@ def commandResult(username, state, fields):
     elif action == 'Shutdown':
         out, err = remctl('control', machine.name, 'shutdown', err=True)
         if err:
-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):
                 raise InvalidInput("action", "Shutdown", 
                                    "Machine is not on.")
             else: