X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=cmdline%2Fsfi.py;h=c1d117418072bcb622e4541f48317d99b8fe5987;hb=b5961c6762fe1d8bc350b4aff85fc3cc68791e05;hp=64a0b618f9e09d58b40de8807d8e9963cf78e186;hpb=59e00c6db6a02d849c216bf2c617ae831c4640c3;p=sfa.git

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index 64a0b618..c1d11741 100755
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -5,10 +5,15 @@ from __future__ import with_statement
 
 import sys
 import os, os.path
+import tempfile
 from optparse import OptionParser
-from util.cert import Keypair, Certificate
-from util.credential import Credential
-from util.geniclient import GeniClient
+from geni.util.cert import Keypair, Certificate
+from geni.util.credential import Credential
+from geni.util.geniclient import GeniClient, ServerException
+from geni.util.gid import create_uuid
+from geni.util.record import GeniRecord
+from geni.util.rspec import Rspec
+from types import StringTypes, ListType
 
 sfi_dir = os.path.expanduser("~/.sfi/")
 slicemgr = None
@@ -46,7 +51,7 @@ def set_servers(options):
 
    if options.verbose :
       print "Contacting Slice Manager at:", sm_url
-      print "Contacting Registry at:", registry_url
+      print "Contacting Registry at:", reg_url
 
    # Set user HRN
    if (options.user is not None):
@@ -65,13 +70,13 @@ def set_servers(options):
    else:
       authority = None
 
-   # Get key and certificate   
+   # Get key and certificate
    key_file = get_key_file()
    cert_file = get_cert_file(key_file)
 
    # Establish connection to server(s)
    slicemgr = GeniClient(sm_url, key_file, cert_file)
-   registry = GeniClient(registry_url, key_file, cert_file)
+   registry = GeniClient(reg_url, key_file, cert_file)
    return
 
 #
@@ -126,7 +131,7 @@ def get_user_cred():
       return user_cred
    else:
       # bootstrap user credential
-      user_cred = get_credential(None, "user", user)
+      user_cred = registry.get_credential(None, "user", user)
       if user_cred:
          user_cred.save_to_file(file, save_parents=True)
          if verbose:
@@ -139,14 +144,18 @@ def get_user_cred():
 def get_auth_cred():
    global authority
 
-   file = os.path.join(sfi_dir, "authority.cred")
+   if not authority:
+      print "no authority specified. Use -a or set SF_AUTH"
+      sys.exit(-1)
+
+   file = os.path.join(sfi_dir, get_leaf("authority") +".cred")
    if (os.path.isfile(file)):
       auth_cred = Credential(filename=file)
       return auth_cred
    else:
       # bootstrap authority credential from user credential
       user_cred = get_user_cred()
-      auth_cred = get_credential(user_cred, "sa", authority)
+      auth_cred = registry.get_credential(user_cred, "sa", authority)
       if auth_cred:
          auth_cred.save_to_file(file, save_parents=True)
          if verbose:
@@ -164,7 +173,7 @@ def get_slice_cred(name):
    else:
       # bootstrap slice credential from user credential
       user_cred = get_user_cred()
-      slice_cred = get_credential(user_cred, "slice", name)
+      slice_cred = registry.get_credential(user_cred, "slice", name)
       if slice_cred:
          slice_cred.save_to_file(file, save_parents=True)
          if verbose:
@@ -182,7 +191,7 @@ def get_rspec_file(rspec):
    if (os.path.isfile(file)):
       return file
    else:
-      print "No such rspec file"
+      print "No such rspec file", rspec
       sys.exit(1)
 
 def get_record_file(record):
@@ -193,54 +202,70 @@ def get_record_file(record):
    if (os.path.isfile(file)):
       return file
    else:
-      print "No such registry record file"
+      print "No such registry record file", record
       sys.exit(1)
 
+def load_publickey_string(fn):
+   f = file(fn,"r")
+   key_string = f.read()
+
+   # if the filename is a private key file, then extract the public key
+   if "PRIVATE KEY" in key_string:
+       outfn = tempfile.mktemp()
+       cmd = "openssl rsa -in " + fn + " -pubout -outform PEM -out " + outfn
+       os.system(cmd)
+       f = file(outfn, "r")
+       key_string = f.read()
+       os.remove(outfn)
+
+   return key_string
+
 #
 # Generate sub-command parser
 #
-def create_cmd_parser(command):
+def create_cmd_parser(command, additional_cmdargs = None):
    cmdargs = {"list": "name",
               "show": "name",
               "remove": "name",
-              "add": "name record",
-              "update": "name record",
-              "nodes": "[name]",
+              "add": "record",
+              "update": "record",
               "slices": "",
-              "resources": "name",
+              "resources": "[name]",
               "create": "name rspec",
               "delete": "name",
               "reset": "name",
               "start": "name",
               "stop": "name"
              }
+
+   if additional_cmdargs:
+      cmdargs.update(additional_cmdargs)
+
    if command not in cmdargs:
       print "Invalid command\n"
-      print "Commands:list,show,remove,add,update,nodes,slices,resources,create,delete,start,stop,reset"
+      print "Commands: ",
+      for key in cmdargs.keys():
+          print key+",",
+      print ""
       sys.exit(2)
 
    parser = OptionParser(usage="sfi [sfi_options] %s [options] %s" \
       % (command, cmdargs[command]))
-   if command in ("nodes", "resources"):
+   if command in ("resources"):
       parser.add_option("-f", "--format", dest="format",type="choice",
-           help="display format (dns|ip|hrn|rspec)",default="rspec",
-           choices=("dns","ip","hrn","rspec"))
+           help="display format (dns|ip|rspec)",default="rspec",
+           choices=("dns","ip","rspec"))
    if command in ("list", "show", "remove"):
       parser.add_option("-t", "--type", dest="type",type="choice",
-           help="type filter (user|slice|sa|ma|node|aggregate)", 
+           help="type filter (user|slice|sa|ma|node|aggregate)",
            choices=("user","slice","sa","ma","node","aggregate", "all"),
            default="all")
-   if command in ("show", "nodes", "resources"):
+   if command in ("show", "list", "resources"):
       parser.add_option("-o", "--output", dest="file",
            help="output XML to file", metavar="FILE", default=None)
    return parser
 
-#
-# Main: parse arguments and dispatch to command
-#
-def main():
-   global verbose
-
+def create_parser():
    # Generate command line parser
    parser = OptionParser(usage="sfi [options] command [command_options] [command_args]",
         description="Commands: list,show,remove,add,update,nodes,slices,resources,create,delete,start,stop,reset")
@@ -258,28 +283,49 @@ def main():
         action="store_true", dest="verbose", default=False,
         help="verbose mode")
    parser.disable_interspersed_args()
+
+   return parser
+
+def dispatch(command, cmd_opts, cmd_args):
+   globals()[command](cmd_opts, cmd_args)
+
+#
+# Main: parse arguments and dispatch to command
+#
+def main():
+   global verbose
+
+   parser = create_parser()
    (options, args) = parser.parse_args()
+
+   if len(args) <= 0:
+        print "No command given. Use -h for help."
+        return -1
+
    command = args[0]
    (cmd_opts, cmd_args) = create_cmd_parser(command).parse_args(args[1:])
    verbose = options.verbose
    if verbose :
-      print options.registry, options.sm, options.dir, options.verbose,\
-         options.user, options.auth
-      print command
-      if command in ("nodes", "resources"):
-         print cmd_opts.format
+      print "Resgistry %s, sm %s, dir %s, user %s, auth %s" % (options.registry, 
+                                            options.sm, 
+                                            options.dir,
+                                            options.user, 
+                                            options.auth)
+      print "Command %s" %command
+      if command in ("resources"):
+         print "resources cmd_opts %s" %cmd_opts.format
       elif command in ("list","show","remove"):
-         print cmd_opts.type
-      print cmd_args 
+         print "cmd_opts.type %s" %cmd_opts.type
+      print "cmd_args %s" %cmd_args
 
    set_servers(options)
 
-   # Dispatch to selected command
    try:
-      globals()[command](cmd_opts, cmd_args)
+      dispatch(command, cmd_opts, cmd_args)
    except KeyError:
       print "Command not found:", command
       sys.exit(1)
+
    return
 
 #
@@ -292,79 +338,124 @@ def main():
 def list(opts, args):
    global registry
    user_cred = get_user_cred()
-   result = registry.list(user_cred, args[0])
-   display_record(opts.type, results)
+   list = registry.list(user_cred, args[0])
+   # filter on person, slice, site, node, etc.  
+   # THis really should be in the filter_records funct def comment...
+   list = filter_records(opts.type, list)
+   display_records(list)
+   if opts.file:
+       save_records_to_file(opts.file, list)
    return
 
 # show named registry record
 def show(opts, args):
    global registry
-   user_cred = get_user_cred() 
-   result = reg_chan.resolve(user_cred, args[0])
-   display_record(opts.type, results)
-   if (opts.file is not None):
-      save_record_to_file(opts.file, result)
+   user_cred = get_user_cred()
+   records = registry.resolve(user_cred, args[0])
+   records = filter_records(opts.type, records)
+   if not records:
+      print "No record of type", opts.type
+   display_records(records, True)
+   if opts.file:
+       save_records_to_file(opts.file, records)
    return
 
 # removed named registry record
 #   - have to first retrieve the record to be removed
 def remove(opts, args):
    global registry
-   auth_cred = get_auth_cred() 
-   results = registry.resolve(auth_cred, args[0])
-   record = filter_record(opts.type, results)
-   return registry.remove(auth_cred, record)
+   auth_cred = get_auth_cred()
+   return registry.remove(auth_cred, opts.type, args[0])
 
 # add named registry record
 def add(opts, args):
    global registry
-   auth_cred = get_auth_cred() 
-   rec_file = get_record_file(args[1])
-   with open(rec_file) as f:
-      record = f.read()
+   auth_cred = get_auth_cred()
+   rec_file = get_record_file(args[0])
+   record = load_record_from_file(rec_file)
+
+   # check and see if we need to create a gid for this record. The creator
+   # of the record signals this by filling in the create_gid, create_gid_hrn,
+   # and create_gid_key members.
+   # (note: we'd use an unsigned GID in the record instead, but pyOpenSSL is
+   #   broken and has no way for us to get the key back out of the gid)
+   geni_info = record.get_geni_info()
+   if "create_gid" in geni_info:
+       gid = registry.create_gid(auth_cred, geni_info["create_gid_hrn"], create_uuid(), geni_info["create_gid_key"])
+       record.set_gid(gid)
+
+       del geni_info["create_gid"]
+       del geni_info["create_gid_hrn"]
+       del geni_info["create_gid_key"]
+
    return registry.register(auth_cred, record)
 
 # update named registry entry
 def update(opts, args):
    global registry
-   user_cred = get_user_cred() 
-   rec_file = get_record_file(args[1])
-   with open(rec_file) as f:
-      record = f.read()
-   return registry.update(user_cred, record)
+   user_cred = get_user_cred()
+   rec_file = get_record_file(args[0])
+   record = load_record_from_file(rec_file)
+   if record.get_type() == "user":
+       if record.get_name() == user_cred.get_gid_object().get_hrn():
+          cred = user_cred
+       else:
+          create = get_auth_cred()
+   elif record.get_type() in ["slice"]:
+       try:
+           cred = get_slice_cred(record.get_name())
+       except ServerException, e:
+           if "PermissionError" in e.args[0]:
+               cred = get_auth_cred()
+           else:
+               raise
+   elif record.get_type() in ["sa", "ma", "node"]:
+       cred = get_auth_cred()
+   else:
+       raise "unknown record type" + record.get_type()
+   return registry.update(cred, record)
 
 #
 # Slice-related commands
 #
 
-# list available nodes
-def nodes(opts, args):
-   global slicemgr
-   user_cred = get_user_cred() 
-   if (len(args) == 0):
-      context = None
-   else:
-      context = args[0]
-   result = slicemgr.list_nodes(user_cred, context)
-   display_rspec(opts.format, result)
-   if (opts.file is not None):
-      save_rspec_to_file(opts.file, result)
-   return
+# list available nodes -- now use 'resources' w/ no argument instead
+#def nodes(opts, args):
+#   global slicemgr
+#   user_cred = get_user_cred() 
+#   if not opts.format:
+#      context = None
+#   else:
+#      context = opts.format
+#   results = slicemgr.list_nodes(user_cred)
+#   if opts.format in ['rspec']:     
+#      display_rspec(results)
+#   else:
+#      display_list(results)
+#   if (opts.file is not None):
+#      rspec = slicemgr.list_nodes(user_cred)
+#      save_rspec_to_file(rspec, opts.file)
+#   return
 
 # list instantiated slices
 def slices(opts, args):
    global slicemgr
    user_cred = get_user_cred() 
-   result = slicemgr.list_slices(user_cred)
-   display_rspec(opts.format, results)
+   results = slicemgr.get_slices(user_cred)
+   display_list(results)
    return
 
 # show rspec for named slice
 def resources(opts, args):
    global slicemgr
-   slice_cred = get_slice_cred(args[0]) 
-   result = slicemgr.get_slice_resources(slice_cred, args[0])
-   display_rspec(opts.format, result)
+   if args: 
+       slice_cred = get_slice_cred(args[0])
+       result = slicemgr.get_resources(slice_cred, args[0])
+   else:
+       user_cred = get_user_cred()
+       result = slicemgr.get_resources(user_cred)
+   format = opts.format      
+   display_rspec(result, format)
    if (opts.file is not None):
       save_rspec_to_file(opts.file, result)
    return
@@ -372,34 +463,37 @@ def resources(opts, args):
 # created named slice with given rspec
 def create(opts, args):
    global slicemgr
-   slice_cred = get_slice_cred(args[0]) 
+   slice_hrn = args[0]
+   slice_cred = get_slice_cred(slice_hrn)
    rspec_file = get_rspec_file(args[1])
    with open(rspec_file) as f:
       rspec = f.read()
-   return slicemgr.create_slice(slice_cred, rspec)
+   return slicemgr.create_slice(slice_cred, slice_hrn, rspec)
 
 # delete named slice
 def delete(opts, args):
    global slicemgr
-   slice_cred = get_slice_cred(args[0]) 
-   return slicemgr.delete_slice(slice_cred)
+   slice_hrn = args[0]
+   slice_cred = get_slice_cred(slice_hrn)
+   
+   return slicemgr.delete_slice(slice_cred, slice_hrn)
 
 # start named slice
 def start(opts, args):
    global slicemgr
-   slice_cred = get_slice_cred(args[0]) 
+   slice_cred = get_slice_cred(args[0])
    return slicemgr.start_slice(slice_cred)
 
 # stop named slice
 def stop(opts, args):
    global slicemgr
-   slice_cred = get_slice_cred(args[0]) 
+   slice_cred = get_slice_cred(args[0])
    return slicemgr.stop_slice(slice_cred)
 
 # reset named slice
 def reset(opts, args):
    global slicemgr
-   slice_cred = get_slice_cred(args[0]) 
+   slice_cred = get_slice_cred(args[0])
    return slicemgr.reset_slice(slice_cred)
 
 #
@@ -409,27 +503,89 @@ def reset(opts, args):
 #
 #
 
-def display_rspec(format, rspec):
-   print "display rspec"
+def display_rspec(rspec, format = 'rspec'):
+    if format in ['dns']:
+        spec = Rspec()
+        spec.parseString(rspec)
+        hostnames = []
+        nodespecs = spec.getDictsByTagName('NodeSpec')
+        for nodespec in nodespecs:
+            if nodespec.has_key('name') and nodespec['name']:
+                if isinstance(nodespec['name'], ListType):
+                    hostnames.extend(nodespec['name'])
+                elif isinstance(nodespec['name'], StringTypes):
+                    hostnames.append(nodespec['name'])
+        result = hostnames
+    elif format in ['ip']:
+        spec = Rspec()
+        spec.parseString(rspec)
+        ips = []
+        ifspecs = spec.getDictsByTagName('IfSpec')
+        for ifspec in ifspecs:
+            if ifspec.has_key('addr') and ifspec['addr']:
+                ips.append(ifspec['addr'])
+        result = ips 
+    else:     
+        result = rspec
+
+    print result
+    return
+
+def display_list(results):
+    for result in results:
+        print result
+
+def save_rspec_to_file(rspec, filename):
+   if not filename.startswith(os.sep):
+       filename = sfi_dir + filename
+   if not filename.endswith(".rspec"):
+       filename = filename + ".rspec"
+
+   f = open(filename, 'w')
+   f.write(rspec)
+   f.close()
    return
 
-def save_rspec_to_file(file, rspec):
-   print "save rspec"
-   return
+def display_records(recordList, dump = False):
+   ''' Print all fields in the record'''
+   for record in recordList:
+      display_record(record, dump)
 
-def display_record(type, record):
-   rec = filter_record(type, record)
-   print "display record"
-   return
-
-def filter_record(type, record):
-   print "filter record"
+def display_record(record, dump = False):
+   if dump:
+       record.dump()
+   else:
+       info = record.getdict()
+       print "%s (%s)" % (info['hrn'], info['type'])
    return
 
-def save_record_to_file(file, record):
-   print "save record"
+def filter_records(type, records):
+   filtered_records = []
+   for record in records:
+       if (record.get_type() == type) or (type == "all"):
+           filtered_records.append(record)
+   return filtered_records
+
+def save_records_to_file(filename, recordList):
+   index = 0
+   for record in recordList:
+       if index>0:
+           save_record_to_file(filename + "." + str(index), record)
+       else:
+           save_record_to_file(filename, record)
+       index = index + 1
+
+def save_record_to_file(filename, record):
+   if not filename.startswith(os.sep):
+       filename = sfi_dir + filename
+   str = record.save_to_string()
+   file(filename, "w").write(str)
    return
 
+def load_record_from_file(filename):
+   str = file(filename, "r").read()
+   record = GeniRecord(string=str)
+   return record
 
 if __name__=="__main__":
    main()