added command-line record editer, a few SFI demo scripts

[sfa.git] / cmdline / genicli.py

diff --git a/cmdline/genicli.py b/cmdline/genicli.py
index caaf084..40c9ff9 100644 (file)
--- a/cmdline/genicli.py
+++ b/cmdline/genicli.py
@@ -7,7 +7,9 @@ from cert import *
 from geniclient import *
 from geniticket import *
 
-long_opts = ["keyfile=", "help", "outfile=", "credfile=", "ticketfile=", "username=", "email=", "ip=", "dns=", "dump_parents", "server="]
+long_opts = ["keyfile=", "help", "outfile=", "credfile=", "ticketfile=",
+             "username=", "email=", "ip=", "dns=", "dump_parents", "server=",
+             "filter=", "short"]
 
 # default command line options
 username = "client"
@@ -21,12 +23,16 @@ cert_file = None
 out_file = None
 ticket_file = None
 
+short = False
 ip = None
 dns = None
 email = None
 uuid = None
 gid_pkey_fn = None
 gid_fn = None
+filter = None
+
+dump_fn = None
 
 dump_parents = False
 
@@ -50,10 +56,14 @@ def showhelp():
    print "    --dns            ... DNS address (for registering nodes)"
    print "    --dump_parents   ... dump parents"
    print "    --server         ... geni server (registry/component) to connect to"
+   print "    --filter <type>  ... filter the results of a list operation (user | slice | node ...)"
+   print "    --short          ... list records in short format (name only)"
    print "commands:"
    print "    resolve <hrn>"
-   print "    dumpCredential"
+   print "    dumpCredential <filename>"
+   print "    dumpGid <filename>"
    print "    getCredential <type> <hrn>"
+   print "    list <hrn>"
    print "    start <hrn>"
    print "    createKey <filename>"
    print "    createGid <hrn> <uuid|None> <pubkey_fn>"
@@ -73,6 +83,9 @@ def process_options():
    global uuid, pkey_fn, gid_fn, email, gid_pkey_fn, ip, dns
    global dump_parents
    global server_url
+   global filter
+   global short
+   global dump_fn
 
    (options, args) = getopt.getopt(sys.argv[1:], '', long_opts)
    for opt in options:
@@ -104,6 +117,10 @@ def process_options():
            dump_parents = True
        elif name == "--server":
            server_url = val
+       elif name == "--filter":
+           filter = val
+       elif name == "--short":
+           short = True
 
    if not args:
        print "no operation specified"
@@ -124,6 +141,13 @@ def process_options():
        type = args[1]
        hrn = args[2]
 
+   elif opname == "list":
+       if len(args) < 2:
+           print "syntax: list <hrn>"
+           sys.exit(-1)
+       hrn = args[1]
+
+
    elif opname == "createGid":
        if len(args) < 4:
            print "syntax: createGid <hrn> <uuid|None> <pubkey_fn>"
@@ -159,6 +183,12 @@ def process_options():
            sys.exit(-1)
        hrn = args[1]
 
+   elif opname == "dumpGid":
+       if len(args) < 2:
+           print "syntax: dumpGid <filename>"
+           sys.exit(-1)
+       dump_fn = args[1]
+
    leaf_name = get_leaf(username)
 
    if cert_file == None:
@@ -188,6 +218,10 @@ def get_authority(x):
 def dumpCredential():
    pass
 
+def dumpGid():
+   gid = GID(filename = dump_fn)
+   gid.dump()
+
 # creates a self-signed certificate and private key
 def createKey():
    k = Keypair(create=True)
@@ -233,7 +267,7 @@ def main():
 
    # if the operation is not a local operation, then create a geniclient to
    # talk to the server
-   if (opname != "dumpCredential") and (opname != "help") and (opname != "createKey"):
+   if (opname != "dumpCredential") and (opname != "help") and (opname != "createKey") and (opname != "dumpGid"):
        if not os.path.exists(key_file):
            print "key file", key_file, "does not exist"
            sys.exit(-1)
@@ -249,7 +283,7 @@ def main():
 
    # if a cred_file was specified, then load the credential
    if (cred_file=="None") or (opname == "help") or (opname == "createKey") or \
-      (opname == "redeemTicket"):
+      (opname == "redeemTicket") or (opname == "dumpCredential") or (opname == "dumpGid"):
       cred = None
    else:
       cred = Credential(filename = cred_file)
@@ -257,6 +291,9 @@ def main():
    if opname == "dumpCredential":
       dumpCredential()
 
+   elif opname == "dumpGid":
+      dumpGid()
+
    elif opname == "help":
       showhelp()
 
@@ -283,11 +320,16 @@ def main():
           print "NO RESULT"
 
    elif (opname == "list"):
-      result = client.list(cred)
+      result = client.list(cred, hrn)
       if result:
+          if filter:
+              result = [r for r in result if r.type==filter]
+          print "RESULT:"
           for record in result:
-              print "RESULT:"
-              record.dump(dump_parents=dump_parents)
+              if short:
+                  print "  ", record.get_name()
+              else:
+                  record.dump(dump_parents=dump_parents)
       else:
           print "NO RESULT"
 
@@ -326,20 +368,7 @@ def main():
        result = client.register(cred, record)
 
    elif (opname == "remove"):
-       record_list = client.resolve(cred, hrn)
-       if not record_list:
-           print "no records match hrn"
-
-       matching_records = []
-       for record in record_list:
-           if record.get_type() == type:
-               matching_records.append(record)
-
-       if not matching_records:
-           print "records match hrn, but no records match type"
-
-       for record in matching_records:
-           client.remove(cred,record)
+       client.remove(cred, type, hrn)
 
    elif (opname == "update"):
        record_list = client.resolve(cred, hrn)