Changeset 2095 for trunk

Timestamp:

Feb 5, 2009, 3:19:30 AM (16 years ago)

Author:

broder

Message:

Get rid of confusing err=True option to invirt.remctl.remctl.

Location:

trunk/packages

Files:

• invirt-base/debian/changelog (modified) (1 diff)
• invirt-base/python/invirt/common.py (modified) (1 diff)
• invirt-base/python/invirt/remctl.py (modified) (1 diff)
• invirt-web/code/controls.py (modified) (7 diffs)

trunk/packages/invirt-base/debian/changelog

@@ +1 @@
+invirt-base (0.0.21) unstable; urgency=low
+
+  * Get rid of confusing err=True option to invirt.remctl.remctl
+
+ -- Evan Broder <broder@mit.edu>  Fri, 30 Jan 2009 19:49:46 -0500
+
 invirt-base (0.0.20) unstable; urgency=low
 

trunk/packages/invirt-base/python/invirt/common.py

@@ -76 +76 @@
 class CodeError(Exception):
     """Exception for internal errors or bad faith input."""
-    pass
+    def __init__(self, message, code=None):
+        Exception.__init__(self, message)
+        self.code = code
 
 #

trunk/packages/invirt-base/python/invirt/remctl.py

@@ -37 +37 @@
                          stderr=subprocess.PIPE)
     v = p.wait()
-    if kws.get('err'):
-        return p.stdout.read(), p.stderr.read()
     if v:
-        print >> sys.stderr, 'Error', v, 'on remctl', args, ':'
-        print >> sys.stderr, p.stderr.read()
-        raise CodeError('ERROR on remctl')
+        raise CodeError('ERROR on remctl %s:\n%s' % (args, p.stderr.read()), v)
     return p.stdout.read()

trunk/packages/invirt-web/code/controls.py

@@ -65 +65 @@
     id of the CD (e.g. 'gutsy_i386')
     """
-    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:
+    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:
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
@@ -157 +158 @@
     Gets and parses xm list --long
     """
-    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))
+    try:
+        value_string = remctl('control', machine.name, 'list-long')
+    except CodeError, e:
+        if 'is not on' in e.message:
+            return None
+        else:
+            raise
     status = parseStatus(value_string)
     return status
@@ -172 +170 @@
 def listHost(machine):
     """Return the host a machine is running on"""
-    out, err = remctl('control', machine.name, 'listhost', err=True)
-    if err:
+    try:
+        out = remctl('control', machine.name, 'listhost')
+    except CodeError, e:
         return None
     return out.strip()
@@ -179 +178 @@
 def vnctoken(machine):
     """Return a time-stamped VNC token"""
-    out, err = remctl('control', machine.name, 'vnctoken', err=True)
-    if err:
+    try:
+        out = remctl('control', machine.name, 'vnctoken')
+    except CodeError, e:
         return None
     return out.strip()
@@ -186 +186 @@
 def deleteVM(machine):
     """Delete a VM."""
-    remctl('control', machine.name, 'destroy', err=True)
+    try:
+        remctl('control', machine.name, 'destroy')
+    except CodeError:
+        pass
     session.begin()
     delete_disk_pairs = [(machine.name, d.guest_device_name) 
@@ -216 +219 @@
         raise CodeError("Invalid action '%s'" % action)
     if action == 'Reboot':
-        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):
+        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):
                 raise InvalidInput("action", "reboot", 
                                    "Machine is not on")
             else:
-                print >> sys.stderr, 'Error on reboot:'
-                print >> sys.stderr, err
-                raise CodeError('ERROR on remctl')
+                raise
                 
     elif action == 'Power on':
@@ -238 +238 @@
         bootMachine(machine, cdrom)
     elif action == 'Power off':
-        out, err = remctl('control', machine.name, 'destroy', err=True)
-        if err:
-            if re.match("machine '.*' is not on", err):
+        try:
+            out = remctl('control', machine.name, 'destroy')
+        except CodeError, e:
+            if re.match("machine '.*' is not on", e.message):
                 raise InvalidInput("action", "Power off", 
                                    "Machine is not on.")
             else:
-                print >> sys.stderr, 'Error on power off:'
-                print >> sys.stderr, err
-                raise CodeError('ERROR on remctl')
+                raise
     elif action == 'Shutdown':
-        out, err = remctl('control', machine.name, 'shutdown', err=True)
-        if err:
-            if re.match("machine '.*' is not on", err):
+        try:
+            out = remctl('control', machine.name, 'shutdown')
+        except CodeError, e:
+            if re.match("machine '.*' is not on", e.message):
                 raise InvalidInput("action", "Shutdown", 
                                    "Machine is not on.")
             else:
-                print >> sys.stderr, 'Error on Shutdown:'
-                print >> sys.stderr, err
-                raise CodeError('ERROR on remctl')
+                raise
     elif action == 'Delete VM':
         deleteVM(machine)