Index: trunk/packages/invirt-remote/debian/changelog
===================================================================
--- trunk/packages/invirt-remote/debian/changelog	(revision 2106)
+++ trunk/packages/invirt-remote/debian/changelog	(revision 2107)
@@ -2,6 +2,7 @@
 
   * added remctl web availability to calculate memory available to new VMs
-
- -- Peter A. Iannucci <iannucci@mit.edu>  Thu, 12 Feb 2009 23:10:31 -0500
+  * removed remctl web info
+
+ -- Peter A. Iannucci <iannucci@mit.edu>  Thu, 12 Feb 2009 23:26:24 -0500
 
 invirt-remote (0.3.2) unstable; urgency=low
Index: trunk/packages/invirt-remote/host/usr/sbin/invirt-availability
===================================================================
--- trunk/packages/invirt-remote/host/usr/sbin/invirt-availability	(revision 2106)
+++ trunk/packages/invirt-remote/host/usr/sbin/invirt-availability	(revision 2107)
@@ -14,17 +14,21 @@
 
 def main(argv):
+    """
+    Calculate the amount of memory available for new VMs
+    The numbers returned by xm info and xm info -c are in MB
+    The numbers in /proc/xen/balloon have nice units
+    All math is done in kilobytes for consistency
+    Output is in MB
+    """
     p = Popen(['/usr/sbin/xm', 'info'], stdout=PIPE)
     output = p.communicate()[0]
     if p.returncode != 0:
         raise RuntimeError("Command '%s' returned non-zero exit status %d"
-                           % ('invirt-availability', p.returncode)) 
+                           % ('/usr/sbin/xm info', p.returncode)) 
     xminfo = yaml.load(output, yaml.CSafeLoader)
 
-    # In kilobytes
     free_memory = int(xminfo['free_memory']) * 1024
 
-    f = open('/proc/xen/balloon', 'r')
-    ballooninfo = yaml.load(f.read())
-    f.close()
+    ballooninfo = yaml.load(open('/proc/xen/balloon', 'r').read())
     currentallocation = parseUnits(ballooninfo['Current allocation'])
     minimumtarget = parseUnits(ballooninfo['Minimum target'])
@@ -34,5 +38,5 @@
     if p.returncode != 0:
         raise RuntimeError("Command '%s' returned non-zero exit status %d"
-                           % ('invirt-availability', p.returncode)) 
+                           % ('/usr/sbin/xm info -c', p.returncode)) 
     xminfoc = yaml.load(output, yaml.CSafeLoader)
 
Index: trunk/packages/invirt-remote/host/usr/sbin/invirt-remote
===================================================================
--- trunk/packages/invirt-remote/host/usr/sbin/invirt-remote	(revision 2106)
+++ trunk/packages/invirt-remote/host/usr/sbin/invirt-remote	(revision 2107)
@@ -12,15 +12,12 @@
         # $SERVICE is hostname
         COMMAND=/usr/sbin/invirt-vmcontrol
-	;;
+    ;;
     web)
         case "$SERVICE" in
             lvcreate|lvremove|lvrename|lvresize)
                 COMMAND=/usr/sbin/invirt-lvm
-	        ;;
+            ;;
             listvms)
                 COMMAND=/usr/sbin/invirt-listvms
-	        ;;
-	        info)
-                COMMAND=/usr/sbin/xm
             ;;
             availability)
@@ -35,5 +32,5 @@
                 ;;
         esac
-	;;
+    ;;
     *)
         echo "ERROR: invalid command"