Changeset 2107 for trunk/packages/invirt-remote/host/usr

Timestamp:

Feb 12, 2009, 11:26:48 PM (16 years ago)

Author:

iannucci

Message:

Clean-up suggestions from price. Whitespace fixes.

Location:

trunk/packages/invirt-remote/host/usr/sbin

Files:

• invirt-availability (modified) (2 diffs)
• invirt-remote (modified) (2 diffs)

trunk/packages/invirt-remote/host/usr/sbin/invirt-availability

@@ -14 +14 @@
 
 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 +38 @@
     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)
 

trunk/packages/invirt-remote/host/usr/sbin/invirt-remote

@@ -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 +32 @@
                 ;;
         esac
-        ;;
+    ;;
     *)
         echo "ERROR: invalid command"