For now, revert r2093-2095, which were committed by accident; I'm not

comfortable with them sitting on HEAD when I don't have time to test
them.

svn path=/trunk/packages/invirt-web/; revision=2097

diff --git a/code/controls.py b/code/controls.py
index d03d4f9..4cd0e9c 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -64,17 +64,16 @@ def bootMachine(machine, cdtype):
     If cdtype is None, give no boot cd.  Otherwise, it is the string
     id of the CD (e.g. 'gutsy_i386')
     """
     If cdtype is None, give no boot cd.  Otherwise, it is the string
     id of the CD (e.g. 'gutsy_i386')
     """

-    try:
-        if cdtype is not None:
-            out = remctl('control', machine.name, 'create', 
-                              cdtype)
-        else:
-            out = remctl('control', machine.name, 'create')
-    except CodeError, e:
-        if 'already running' in e.message:
-            raise InvalidInput('action', 'create',
-                               'VM %s is already on' % machine.name)
-        else:
+    if cdtype is not None:
+        out, err = remctl('control', machine.name, 'create', 
+                          cdtype, err=True)
+    else:
+        out, err = remctl('control', machine.name, 'create',
+                          err=True)
+    if 'already running' in err:
+        raise InvalidInput('action', 'create',
+                           'VM %s is already on' % machine.name)
+    elif err:

         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 

@@ -157,38 +156,36 @@ def statusInfo(machine):
 
     Gets and parses xm list --long
     """
 
     Gets and parses xm list --long
     """

-    try:
-        value_string = remctl('control', machine.name, 'list-long')
-    except CodeError, e:
-        if 'is not on' in e.message:
-            return None
-        else:
-            raise
+    value_string, err_string = remctl('control', machine.name, 'list-long', 
+                                      err=True)
+    if 'Unknown command' in err_string:
+        raise CodeError("ERROR in remctl list-long %s is not registered" % 
+                        (machine.name,))
+    elif 'is not on' in err_string:
+        return None
+    elif err_string:
+        raise CodeError("ERROR in remctl list-long %s:  %s" % 
+                        (machine.name, err_string))

     status = parseStatus(value_string)
     return status
 
 def listHost(machine):
     """Return the host a machine is running on"""
     status = parseStatus(value_string)
     return status
 
 def listHost(machine):
     """Return the host a machine is running on"""

-    try:
-        out = remctl('control', machine.name, 'listhost')
-    except CodeError, e:
+    out, err = remctl('control', machine.name, 'listhost', err=True)
+    if err:

         return None
     return out.strip()
 
 def vnctoken(machine):
     """Return a time-stamped VNC token"""
         return None
     return out.strip()
 
 def vnctoken(machine):
     """Return a time-stamped VNC token"""

-    try:
-        out = remctl('control', machine.name, 'vnctoken')
-    except CodeError, e:
+    out, err = remctl('control', machine.name, 'vnctoken', err=True)
+    if err:

         return None
     return out.strip()
 
 def deleteVM(machine):
     """Delete a VM."""
         return None
     return out.strip()
 
 def deleteVM(machine):
     """Delete a VM."""

-    try:
-        remctl('control', machine.name, 'destroy')
-    except CodeError:
-        pass
+    remctl('control', machine.name, 'destroy', err=True)

     session.begin()
     delete_disk_pairs = [(machine.name, d.guest_device_name) 
                          for d in machine.disks]
     session.begin()
     delete_disk_pairs = [(machine.name, d.guest_device_name) 
                          for d in machine.disks]

@@ -218,17 +215,20 @@ def commandResult(username, state, fields):
                       'Delete VM'):
         raise CodeError("Invalid action '%s'" % action)
     if action == 'Reboot':
                       'Delete VM'):
         raise CodeError("Invalid action '%s'" % action)
     if action == 'Reboot':

-        try:
-            if cdrom is not None:
-                out = remctl('control', machine.name, 'reboot', cdrom)
-            else:
-                out = remctl('control', machine.name, 'reboot')
-        except CodeError, e:
-            if re.match("machine '.*' is not on", e.message):
+        if cdrom is not None:
+            out, err = remctl('control', machine.name, 'reboot', cdrom,
+                              err=True)
+        else:
+            out, err = remctl('control', machine.name, 'reboot',
+                              err=True)
+        if err:
+            if re.match("machine '.*' is not on", err):

                 raise InvalidInput("action", "reboot", 
                                    "Machine is not on")
             else:
                 raise InvalidInput("action", "reboot", 
                                    "Machine is not on")
             else:

-                raise
+                print >> sys.stderr, 'Error on reboot:'
+                print >> sys.stderr, err
+                raise CodeError('ERROR on remctl')

                 
     elif action == 'Power on':
         if validation.maxMemory(username, state, machine) < machine.memory:
                 
     elif action == 'Power on':
         if validation.maxMemory(username, state, machine) < machine.memory:

@@ -237,23 +237,25 @@ def commandResult(username, state, fields):
                                "to turn on this machine.")
         bootMachine(machine, cdrom)
     elif action == 'Power off':
                                "to turn on this machine.")
         bootMachine(machine, cdrom)
     elif action == 'Power off':

-        try:
-            out = remctl('control', machine.name, 'destroy')
-        except CodeError, e:
-            if re.match("machine '.*' is not on", e.message):
+        out, err = remctl('control', machine.name, 'destroy', err=True)
+        if err:
+            if re.match("machine '.*' is not on", err):

                 raise InvalidInput("action", "Power off", 
                                    "Machine is not on.")
             else:
                 raise InvalidInput("action", "Power off", 
                                    "Machine is not on.")
             else:

-                raise
+                print >> sys.stderr, 'Error on power off:'
+                print >> sys.stderr, err
+                raise CodeError('ERROR on remctl')

     elif action == 'Shutdown':
     elif action == 'Shutdown':

-        try:
-            out = remctl('control', machine.name, 'shutdown')
-        except CodeError, e:
-            if re.match("machine '.*' is not on", e.message):
+        out, err = remctl('control', machine.name, 'shutdown', err=True)
+        if err:
+            if re.match("machine '.*' is not on", err):

                 raise InvalidInput("action", "Shutdown", 
                                    "Machine is not on.")
             else:
                 raise InvalidInput("action", "Shutdown", 
                                    "Machine is not on.")
             else:

-                raise
+                print >> sys.stderr, 'Error on Shutdown:'
+                print >> sys.stderr, err
+                raise CodeError('ERROR on remctl')

     elif action == 'Delete VM':
         deleteVM(machine)
 
     elif action == 'Delete VM':
         deleteVM(machine)