Fix Nelson's other request - make both "list-host" and "listhost"

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-remote-create

diff --git a/files/usr/sbin/sipb-xen-remote-create b/files/usr/sbin/sipb-xen-remote-create
index 32e875a..f957a59 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-create
+++ b/files/usr/sbin/sipb-xen-remote-create
@@ -20,11 +20,22 @@ def choose_host():
     return max((int(o['free_memory']), s) for (s, o) in results)[1]
 
 def main(argv):
-    if len(argv) < 2:
-        print >> sys.stderr, "usage: sipb-xen-remote-create <machine> [<other args...>]"
+    if len(argv) < 3:
+        print >> sys.stderr, "usage: sipb-xen-remote-create <operation> <machine> [<other args...>]"
         return 2
-    machine_name = argv[1]
-    args = argv[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]
@@ -43,7 +54,7 @@ def main(argv):
     print 'Creating on host %s...' % host
     sys.stdout.flush()
     return call(['remctl', host, 'remote', 'control',
-                 machine_name, 'create'] + args)
+                 machine_name, operation] + args)
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))