Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remconffs
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remconffs	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remconffs	(revision 1176)
@@ -0,0 +1,87 @@
+#!/usr/bin/python
+
+import routefs
+from routes import Mapper
+
+from syslog import *
+from time import time
+
+from invirt import database
+from invirt.config import structs as config
+
+class RemConfFS(routefs.RouteFS):
+	"""
+	RemConfFS creates a filesytem for configuring remctl, like this:
+	/
+	|-- acl
+	|   |-- machine1
+	|   ...
+	|   `-- machinen
+	`-- conf
+        
+	The machine list and the acls are drawn from a database.
+	"""
+	
+	def __init__(self, *args, **kw):
+		"""Initialize the filesystem and set it to allow_other access besides
+		the user who mounts the filesystem (i.e. root)
+		"""
+		super(RemConfFS, self).__init__(*args, **kw)
+		self.lasttime = time()
+		self.fuse_args.add("allow_other", True)
+		
+		openlog('invirt-remconffs ', LOG_PID, LOG_DAEMON)
+		
+		syslog(LOG_DEBUG, 'Init complete.')
+        
+        def make_map(self):
+                m = Mapper()
+                m.connect('', controller='getroot')
+                m.connect('acl', controller='getmachines')
+                m.connect('acl/:machine', controller='getacl')
+                m.connect('conf', controller='getconf')
+                return m
+        
+        def getroot(self, **kw):
+                return ['acl', 'conf']
+        
+	def getacl(self, machine, **kw):
+		"""Build the ACL file for a machine
+		"""
+		machine = database.Machine.query().filter_by(name=machine).one()
+		users = [acl.user for acl in machine.acl]
+		return "\n".join(map(self.userToPrinc, users)
+				 + ['include /etc/remctl/acl/web',
+				    ''])
+        
+	def getconf(self, **kw):
+		"""Build the master conf file, with all machines
+		"""
+		return '\n'.join("control %s /usr/sbin/invirt-remote-proxy-control"
+				 " /etc/remctl/remconffs/acl/%s"
+				 % (machine_name, machine_name)
+				 for machine_name in self.getmachines())+'\n'
+	
+	def getmachines(self, **kw):
+		"""Get the list of VMs in the database, clearing the cache if it's 
+		older than 15 seconds"""
+		if time() - self.lasttime > 15:
+			self.lasttime = time()
+			database.clear_cache()
+		return [machine.name for machine in database.session.query(database.Machine).all()]
+        
+	def userToPrinc(self, user):
+		"""Convert Kerberos v4-style names to v5-style and append a default
+		realm if none is specified
+		"""
+		if '@' in user:
+			(princ, realm) = user.split('@')
+		else:
+			princ = user
+			realm = config.authn[0].realm
+		
+		return princ.replace('.', '/') + '@' + realm
+
+if __name__ == '__main__':
+	database.connect()
+        routefs.main(RemConfFS)
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remctl-help
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remctl-help	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remctl-help	(revision 1176)
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+"""
+Help on using the Invirt remctl functions.
+"""
+import sys
+from invirt.config import structs as config
+
+help = [
+    ('list',      'show your VM\'s state (with xm list)'),
+    ('list-host',  'show on what host, if any, your VM is running'),
+    ('list-long', 'show your VM\'s state as an sexp (with xm list --long)'),
+    ('vcpu-list', 'show your VM\'s state (with xm vcpu-list)'),
+    ('uptime',    'show your VM\'s state (with xm uptime)'),
+    ('destroy',   'shut down your VM, hard (with xm destroy)'),
+    ('shutdown',  'shut down your VM, softly if paravm (with xm shutdown)'),
+    ('create',    'start up your VM (with xm create)'),
+    ('reboot',    'reboot your VM (with xm destroy and xm create)'),
+    ('install',   'autoinstall your VM (takes a series of key=value pairs; \n\t\tvalid arguments include mirror, dist, arch, imagesize,\n\t\tand noinstall)'),
+    #also CD images on create/reboot
+]
+helpdict = dict(help)
+
+
+def print_help(name, text):
+    print '  %-9s : %s' % (name, text)
+
+def main(args):
+    args = [n for n in args if n in helpdict]
+    print 'remctl %s control <machine> <command>' % config.remote.hostname
+    if args:
+        for name in args:
+            print_help(name, helpdict[name])
+    else:
+        for name, text in help:
+            print_help(name, text)
+        
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))
+
+# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-control
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-control	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-control	(revision 1176)
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+"""
+Sends remctl commands about a running VM to the host it's running on.
+"""
+
+from subprocess import PIPE, Popen, call
+import sys
+import yaml
+
+def main(argv):
+    if len(argv) < 3:
+        print >>sys.stderr, "usage: invirt-remote-control <machine> <command>"
+        return 2
+    machine_name = argv[1]
+    command = argv[2]
+
+    p = Popen(['/usr/sbin/invirt-remote-proxy-web', 'listvms'], stdout=PIPE)
+    output = p.communicate()[0]
+    if p.returncode != 0:
+        raise RuntimeError("Command '%s' returned non-zero exit status %d"
+                           % ('invirt-remote-proxy-web', p.returncode)) 
+    vms = yaml.load(output, yaml.CSafeLoader)
+
+    if machine_name not in vms:
+        print >>sys.stderr, "machine '%s' is not on" % machine_name
+        return 1
+    host = vms[machine_name]['host']
+
+    p = Popen(['remctl', host, 'remote', 'control'] + argv[1:],
+              stdout=PIPE, stderr=PIPE)
+    (out, err) = p.communicate()
+    if p.returncode == 1:
+        print >>sys.stderr, "machine '%s' is not on" % machine_name
+        return 1
+    elif p.returncode == 34:
+        print >>sys.stderr, "ERROR: invalid command"
+        return 34
+    sys.stderr.write(err)
+    sys.stdout.write(out)
+    return p.returncode
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
+
+# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-create
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-create	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-create	(revision 1176)
@@ -0,0 +1,62 @@
+#!/usr/bin/python
+
+"""
+Picks a host to "create" (boot) a VM on, and does so.
+
+Current load-balancing algorithm: wherever there's more free RAM.
+
+TODO: use a lock to avoid creating the same VM twice in a race
+"""
+
+from invirt.remote import bcast
+from subprocess import PIPE, Popen, call
+import sys
+import yaml
+
+def choose_host():
+    # Query each of the hosts.
+    # XXX will the output of 'xm info' always be parseable YAML?
+    results = bcast('info')
+    return max((int(o['free_memory']), s) for (s, o) in results)[1]
+
+def main(argv):
+    if len(argv) < 3:
+        print >> sys.stderr, "usage: invirt-remote-create <operation> <machine> [<other args...>]"
+        return 2
+    operation = argv[1]
+    machine_name = argv[2]
+    args = argv[3:]
+    
+    if operation == 'install':
+        options = dict(arg.split('=', 1) for arg in args)
+        valid_keys = set(('mirror', 'dist', 'arch', 'imagesize', 'noinstall'))
+        if not set(options.keys()).issubset(valid_keys):
+            print >> sys.stderr, "Invalid argument. Use the help command to see valid arguments to install"
+            return 1
+        if any(' ' in val for val in options.values()):
+            print >> sys.stderr, "Arguments to the autoinstaller cannot contain spaces"
+            return 1
+
+    p = Popen(['/usr/sbin/invirt-remote-proxy-web', 'listvms'], stdout=PIPE)
+    output = p.communicate()[0]
+    if p.returncode != 0:
+        raise RuntimeError("Command '%s' returned non-zero exit status %d"
+                           % ('invirt-remote-proxy-web', p.returncode)) 
+    vms = yaml.load(output, yaml.CSafeLoader)
+
+    if machine_name in vms:
+        host = vms[machine_name]['host']
+        print >> sys.stderr, ("machine '%s' is already running on host %s"
+                              % (machine_name, host))
+        return 1
+
+    host = choose_host()
+    print 'Creating on host %s...' % host
+    sys.stdout.flush()
+    return call(['remctl', host, 'remote', 'control',
+                 machine_name, operation] + args)
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
+
+# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listhost
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listhost	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listhost	(revision 1176)
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+"""
+Say what host a running VM is on.
+"""
+
+from subprocess import PIPE, Popen, call
+import sys
+import yaml
+
+def main(argv):
+    if len(argv) < 2:
+        print >>sys.stderr, "usage: invirt-remote-listhost <machine>"
+        return 2
+    machine_name = argv[1]
+
+    p = Popen(['/usr/sbin/invirt-remote-proxy-web', 'listvms'], stdout=PIPE)
+    output = p.communicate()[0]
+    if p.returncode != 0:
+        raise RuntimeError("Command '%s' returned non-zero exit status %d"
+                           % ('invirt-remote-proxy-web', p.returncode)) 
+    vms = yaml.load(output, yaml.CSafeLoader)
+
+    if machine_name not in vms:
+        print >>sys.stderr, "machine '%s' is not on" % machine_name
+        return 2
+
+    print vms[machine_name]['host']
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
+
+# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listvms
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listvms	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listvms	(revision 1176)
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+"""
+Collates the results of listvms from multiple VM servers.  Part of the xvm
+suite.
+"""
+
+from invirt.remote import bcast
+import sys
+import yaml
+
+def main(argv):
+    # Query each of the hosts.
+    results = filter(lambda (_, x): x is not None, bcast('listvms'))
+
+    # Merge the results and print.
+    merged = {}
+    for server, result in results:
+        for data in result.itervalues():
+            data['host'] = server
+        merged.update(result)
+
+    print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
+
+# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listvmsd
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listvmsd	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-listvmsd	(revision 1176)
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+# NOTE: In development; not actually used yet.
+
+#Collates the results of listvms from multiple VM servers.  Part of the xvm
+#suite.
+
+use Net::Remctl ();
+use JSON;
+
+our @servers = qw/black-mesa.mit.edu sx-blade-2.mit.edu/;
+
+our %connections;
+
+sub openConnections() {
+    foreach (@servers) { openConnection($_); }
+}
+
+sub openConnection($) {
+    my ($server) = @_;
+    my $remctl = Net::Remctl->new;
+    $remctl->open($server)
+        or die "Cannot connect to $server: ", $remctl->error, "\n";
+    $connections{$server} = $remctl;
+}
+
+sub doListVMs() {
+    foreach my $remctl (values %connections) {
+	$remctl->command("remote", "web", "listvms", "--json");
+    }
+    my %vmstate;
+    foreach my $server (keys %connections) {
+	my $remctl = $connections{$server};
+	my $jsonData = '';
+	do {
+	    $output = $remctl->output;
+	    if ($output->type eq 'output') {
+		if ($output->stream == 1) {
+		    $jsonData .= $output->data;
+		} elsif ($output->stream == 2) {
+		    print STDERR $output->data;
+		}
+	    } elsif ($output->type eq 'error') {
+		warn $output->error, "\n";
+	    } elsif ($output->type eq 'status') {
+		if ($output->status != 0) {
+		    warn "Exit status was ".$output->status;
+		}
+	    } elsif ($output->type eq 'done') {
+		#next;
+	    } else {
+		die "Unknown output token from library: ", $output->type, "\n";
+	    }
+	} while ($output->type ne 'done');
+	my $vmlist = jsonToObj($jsonData);
+	foreach my $key (keys %$vmlist) {
+	    $vmstate{$key} = $vmlist->{$key};
+	    $vmstate{$key}{"host"} = $server;
+	}
+    }
+    return %vmstate;
+}
+
+openConnections();
+
+use Data::Dumper;
+use Benchmark;
+print Dumper({doListVMs()});
+timethis(100, sub {doListVMs()});
+
+# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy	(revision 1176)
@@ -0,0 +1,26 @@
+#!/bin/bash
+# invoke as invirt-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
+
+klist -s || kinit -k
+
+TYPE="${0##*-}"
+case "$TYPE" in
+    control )
+	MACHINE="$1"; SERVICE="$2"; shift; shift ;;
+    * )
+	SERVICE="$1"; shift ;;
+esac
+
+case "$TYPE/$SERVICE" in
+    web/listvms )
+	invirt-remote-listvms "$@" ;;
+    control/create|control/install )
+	invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;
+    control/listhost|control/list-host )
+	invirt-remote-listhost "$MACHINE" "$@" ;;
+    control/* )
+	# Everything but create must go where the VM is already running.
+	invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;
+    * )
+	remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
+esac
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy-control
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy-control	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy-control	(revision 1176)
@@ -0,0 +1,1 @@
+link invirt-remote-proxy
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy-web
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy-web	(revision 1176)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remote-proxy-web	(revision 1176)
@@ -0,0 +1,1 @@
+link invirt-remote-proxy
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remconffs
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs	(revision 1163)
+++ 	(revision )
@@ -1,87 +1,0 @@
-#!/usr/bin/python
-
-import routefs
-from routes import Mapper
-
-from syslog import *
-from time import time
-
-from invirt import database
-from invirt.config import structs as config
-
-class RemConfFS(routefs.RouteFS):
-	"""
-	RemConfFS creates a filesytem for configuring remctl, like this:
-	/
-	|-- acl
-	|   |-- machine1
-	|   ...
-	|   `-- machinen
-	`-- conf
-        
-	The machine list and the acls are drawn from a database.
-	"""
-	
-	def __init__(self, *args, **kw):
-		"""Initialize the filesystem and set it to allow_other access besides
-		the user who mounts the filesystem (i.e. root)
-		"""
-		super(RemConfFS, self).__init__(*args, **kw)
-		self.lasttime = time()
-		self.fuse_args.add("allow_other", True)
-		
-		openlog('sipb-xen-remconffs ', LOG_PID, LOG_DAEMON)
-		
-		syslog(LOG_DEBUG, 'Init complete.')
-        
-        def make_map(self):
-                m = Mapper()
-                m.connect('', controller='getroot')
-                m.connect('acl', controller='getmachines')
-                m.connect('acl/:machine', controller='getacl')
-                m.connect('conf', controller='getconf')
-                return m
-        
-        def getroot(self, **kw):
-                return ['acl', 'conf']
-        
-	def getacl(self, machine, **kw):
-		"""Build the ACL file for a machine
-		"""
-		machine = database.Machine.query().filter_by(name=machine).one()
-		users = [acl.user for acl in machine.acl]
-		return "\n".join(map(self.userToPrinc, users)
-				 + ['include /etc/remctl/acl/web',
-				    ''])
-        
-	def getconf(self, **kw):
-		"""Build the master conf file, with all machines
-		"""
-		return '\n'.join("control %s /usr/sbin/sipb-xen-remote-proxy-control"
-				 " /etc/remctl/remconffs/acl/%s"
-				 % (machine_name, machine_name)
-				 for machine_name in self.getmachines())+'\n'
-	
-	def getmachines(self, **kw):
-		"""Get the list of VMs in the database, clearing the cache if it's 
-		older than 15 seconds"""
-		if time() - self.lasttime > 15:
-			self.lasttime = time()
-			database.clear_cache()
-		return [machine.name for machine in database.session.query(database.Machine).all()]
-        
-	def userToPrinc(self, user):
-		"""Convert Kerberos v4-style names to v5-style and append a default
-		realm if none is specified
-		"""
-		if '@' in user:
-			(princ, realm) = user.split('@')
-		else:
-			princ = user
-			realm = config.authn[0].realm
-		
-		return princ.replace('.', '/') + '@' + realm
-
-if __name__ == '__main__':
-	database.connect()
-        routefs.main(RemConfFS)
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remctl-help
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remctl-help	(revision 1163)
+++ 	(revision )
@@ -1,42 +1,0 @@
-#!/usr/bin/python
-"""
-Help on using the Invirt remctl functions.
-"""
-import sys
-from invirt.config import structs as config
-
-help = [
-    ('list',      'show your VM\'s state (with xm list)'),
-    ('list-host',  'show on what host, if any, your VM is running'),
-    ('list-long', 'show your VM\'s state as an sexp (with xm list --long)'),
-    ('vcpu-list', 'show your VM\'s state (with xm vcpu-list)'),
-    ('uptime',    'show your VM\'s state (with xm uptime)'),
-    ('destroy',   'shut down your VM, hard (with xm destroy)'),
-    ('shutdown',  'shut down your VM, softly if paravm (with xm shutdown)'),
-    ('create',    'start up your VM (with xm create)'),
-    ('reboot',    'reboot your VM (with xm destroy and xm create)'),
-    ('install',   'autoinstall your VM (takes a series of key=value pairs; \n\t\tvalid arguments include mirror, dist, arch, imagesize,\n\t\tand noinstall)'),
-    #also CD images on create/reboot
-]
-helpdict = dict(help)
-
-
-def print_help(name, text):
-    print '  %-9s : %s' % (name, text)
-
-def main(args):
-    args = [n for n in args if n in helpdict]
-    print 'remctl %s control <machine> <command>' % config.remote.hostname
-    if args:
-        for name in args:
-            print_help(name, helpdict[name])
-    else:
-        for name, text in help:
-            print_help(name, text)
-        
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
-
-# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remote-control
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-control	(revision 1163)
+++ 	(revision )
@@ -1,45 +1,0 @@
-#!/usr/bin/python
-"""
-Sends remctl commands about a running VM to the host it's running on.
-"""
-
-from subprocess import PIPE, Popen, call
-import sys
-import yaml
-
-def main(argv):
-    if len(argv) < 3:
-        print >>sys.stderr, "usage: sipb-xen-remote-control <machine> <command>"
-        return 2
-    machine_name = argv[1]
-    command = argv[2]
-
-    p = Popen(['/usr/sbin/sipb-xen-remote-proxy-web', 'listvms'], stdout=PIPE)
-    output = p.communicate()[0]
-    if p.returncode != 0:
-        raise RuntimeError("Command '%s' returned non-zero exit status %d"
-                           % ('sipb-xen-remote-proxy-web', p.returncode)) 
-    vms = yaml.load(output, yaml.CSafeLoader)
-
-    if machine_name not in vms:
-        print >>sys.stderr, "machine '%s' is not on" % machine_name
-        return 1
-    host = vms[machine_name]['host']
-
-    p = Popen(['remctl', host, 'remote', 'control'] + argv[1:],
-              stdout=PIPE, stderr=PIPE)
-    (out, err) = p.communicate()
-    if p.returncode == 1:
-        print >>sys.stderr, "machine '%s' is not on" % machine_name
-        return 1
-    elif p.returncode == 34:
-        print >>sys.stderr, "ERROR: invalid command"
-        return 34
-    sys.stderr.write(err)
-    sys.stdout.write(out)
-    return p.returncode
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
-
-# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remote-create
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-create	(revision 1163)
+++ 	(revision )
@@ -1,62 +1,0 @@
-#!/usr/bin/python
-
-"""
-Picks a host to "create" (boot) a VM on, and does so.
-
-Current load-balancing algorithm: wherever there's more free RAM.
-
-TODO: use a lock to avoid creating the same VM twice in a race
-"""
-
-from invirt.remote import bcast
-from subprocess import PIPE, Popen, call
-import sys
-import yaml
-
-def choose_host():
-    # Query each of the hosts.
-    # XXX will the output of 'xm info' always be parseable YAML?
-    results = bcast('info')
-    return max((int(o['free_memory']), s) for (s, o) in results)[1]
-
-def main(argv):
-    if len(argv) < 3:
-        print >> sys.stderr, "usage: sipb-xen-remote-create <operation> <machine> [<other args...>]"
-        return 2
-    operation = argv[1]
-    machine_name = argv[2]
-    args = argv[3:]
-    
-    if operation == 'install':
-        options = dict(arg.split('=', 1) for arg in args)
-        valid_keys = set(('mirror', 'dist', 'arch', 'imagesize', 'noinstall'))
-        if not set(options.keys()).issubset(valid_keys):
-            print >> sys.stderr, "Invalid argument. Use the help command to see valid arguments to install"
-            return 1
-        if any(' ' in val for val in options.values()):
-            print >> sys.stderr, "Arguments to the autoinstaller cannot contain spaces"
-            return 1
-
-    p = Popen(['/usr/sbin/sipb-xen-remote-proxy-web', 'listvms'], stdout=PIPE)
-    output = p.communicate()[0]
-    if p.returncode != 0:
-        raise RuntimeError("Command '%s' returned non-zero exit status %d"
-                           % ('sipb-xen-remote-proxy-web', p.returncode)) 
-    vms = yaml.load(output, yaml.CSafeLoader)
-
-    if machine_name in vms:
-        host = vms[machine_name]['host']
-        print >> sys.stderr, ("machine '%s' is already running on host %s"
-                              % (machine_name, host))
-        return 1
-
-    host = choose_host()
-    print 'Creating on host %s...' % host
-    sys.stdout.flush()
-    return call(['remctl', host, 'remote', 'control',
-                 machine_name, operation] + args)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
-
-# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remote-listhost
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listhost	(revision 1163)
+++ 	(revision )
@@ -1,33 +1,0 @@
-#!/usr/bin/python
-"""
-Say what host a running VM is on.
-"""
-
-from subprocess import PIPE, Popen, call
-import sys
-import yaml
-
-def main(argv):
-    if len(argv) < 2:
-        print >>sys.stderr, "usage: sipb-xen-remote-listhost <machine>"
-        return 2
-    machine_name = argv[1]
-
-    p = Popen(['/usr/sbin/sipb-xen-remote-proxy-web', 'listvms'], stdout=PIPE)
-    output = p.communicate()[0]
-    if p.returncode != 0:
-        raise RuntimeError("Command '%s' returned non-zero exit status %d"
-                           % ('sipb-xen-remote-proxy-web', p.returncode)) 
-    vms = yaml.load(output, yaml.CSafeLoader)
-
-    if machine_name not in vms:
-        print >>sys.stderr, "machine '%s' is not on" % machine_name
-        return 2
-
-    print vms[machine_name]['host']
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
-
-# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remote-listvms
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms	(revision 1163)
+++ 	(revision )
@@ -1,28 +1,0 @@
-#!/usr/bin/python
-
-"""
-Collates the results of listvms from multiple VM servers.  Part of the xvm
-suite.
-"""
-
-from invirt.remote import bcast
-import sys
-import yaml
-
-def main(argv):
-    # Query each of the hosts.
-    results = filter(lambda (_, x): x is not None, bcast('listvms'))
-
-    # Merge the results and print.
-    merged = {}
-    for server, result in results:
-        for data in result.itervalues():
-            data['host'] = server
-        merged.update(result)
-
-    print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
-
-# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remote-listvmsd
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvmsd	(revision 1163)
+++ 	(revision )
@@ -1,71 +1,0 @@
-#!/usr/bin/perl
-
-# NOTE: In development; not actually used yet.
-
-#Collates the results of listvms from multiple VM servers.  Part of the xvm
-#suite.
-
-use Net::Remctl ();
-use JSON;
-
-our @servers = qw/black-mesa.mit.edu sx-blade-2.mit.edu/;
-
-our %connections;
-
-sub openConnections() {
-    foreach (@servers) { openConnection($_); }
-}
-
-sub openConnection($) {
-    my ($server) = @_;
-    my $remctl = Net::Remctl->new;
-    $remctl->open($server)
-        or die "Cannot connect to $server: ", $remctl->error, "\n";
-    $connections{$server} = $remctl;
-}
-
-sub doListVMs() {
-    foreach my $remctl (values %connections) {
-	$remctl->command("remote", "web", "listvms", "--json");
-    }
-    my %vmstate;
-    foreach my $server (keys %connections) {
-	my $remctl = $connections{$server};
-	my $jsonData = '';
-	do {
-	    $output = $remctl->output;
-	    if ($output->type eq 'output') {
-		if ($output->stream == 1) {
-		    $jsonData .= $output->data;
-		} elsif ($output->stream == 2) {
-		    print STDERR $output->data;
-		}
-	    } elsif ($output->type eq 'error') {
-		warn $output->error, "\n";
-	    } elsif ($output->type eq 'status') {
-		if ($output->status != 0) {
-		    warn "Exit status was ".$output->status;
-		}
-	    } elsif ($output->type eq 'done') {
-		#next;
-	    } else {
-		die "Unknown output token from library: ", $output->type, "\n";
-	    }
-	} while ($output->type ne 'done');
-	my $vmlist = jsonToObj($jsonData);
-	foreach my $key (keys %$vmlist) {
-	    $vmstate{$key} = $vmlist->{$key};
-	    $vmstate{$key}{"host"} = $server;
-	}
-    }
-    return %vmstate;
-}
-
-openConnections();
-
-use Data::Dumper;
-use Benchmark;
-print Dumper({doListVMs()});
-timethis(100, sub {doListVMs()});
-
-# vim:et:sw=4:ts=4
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remote-proxy
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy	(revision 1163)
+++ 	(revision )
@@ -1,26 +1,0 @@
-#!/bin/bash
-# invoke as sipb-xen-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
-
-klist -s || kinit -k
-
-TYPE="${0##*-}"
-case "$TYPE" in
-    control )
-	MACHINE="$1"; SERVICE="$2"; shift; shift ;;
-    * )
-	SERVICE="$1"; shift ;;
-esac
-
-case "$TYPE/$SERVICE" in
-    web/listvms )
-	sipb-xen-remote-listvms "$@" ;;
-    control/create|control/install )
-	sipb-xen-remote-create "$SERVICE" "$MACHINE" "$@" ;;
-    control/listhost|control/list-host )
-	sipb-xen-remote-listhost "$MACHINE" "$@" ;;
-    control/* )
-	# Everything but create must go where the VM is already running.
-	sipb-xen-remote-control "$MACHINE" "$SERVICE" "$@" ;;
-    * )
-	remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
-esac
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remote-proxy-control
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy-control	(revision 1163)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link sipb-xen-remote-proxy
Index: trunk/packages/invirt-remote-server/files/usr/sbin/sipb-xen-remote-proxy-web
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy-web	(revision 1163)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link sipb-xen-remote-proxy