X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=cmdline%2Fsfi.py;h=31f4972814b0617efd28b3bdd34782126da46ae4;hb=208792d64b1166e32d04698aa442ea6cdabd7613;hp=dfd0c57c53a32001df9b0c66c730fec241fb5df5;hpb=aac14f77a843a8798d808ab9850cf74e858cccc9;p=sfa.git

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index dfd0c57c..31f49728 100755
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -5,86 +5,183 @@ from __future__ import with_statement
 
 import sys
 import os, os.path
-#from cert import Keypair, Certificate
+import tempfile
 from optparse import OptionParser
-#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
 
 sfi_dir = os.path.expanduser("~/.sfi/")
-sm_chan = None
-reg_chan = None
+slicemgr = None
+registry = None
+user = None
+authority = None
+verbose = False
 
 #
 # Establish Connection to SliceMgr and Registry Servers
 #
 def set_servers(options):
-   global sm_chan
-   global reg_chan
+   global slicemgr
+   global registry
+   global user
+   global authority
 
-   # Set SliceMgr and Registry URLs
+   # Set SliceMgr URL
    if (options.sm is not None):
-      sm = options.sm
-   elif ("SM" in os.environ):
-      sm = os.environ["SM"]
+      sm_url = options.sm
+   elif ("SFI_SM" in os.environ):
+      sm_url = os.environ["SFI_SM"]
    else:
       print "No Known Slice Manager"
       sys.exit(1)
+
+   # Set Registry URL
    if (options.registry is not None):
-      registry = options.registry
-   elif ("REGISTRY" in os.environ):
-      registry = os.environ["REGISTRY"]
+      reg_url = options.registry
+   elif ("SFI_REGISTRY" in os.environ):
+      reg_url = os.environ["SFI_REGISTRY"]
+   else:
+      print "No Known Registry Server"
+      sys.exit(1)
+
+   if options.verbose :
+      print "Contacting Slice Manager at:", sm_url
+      print "Contacting Registry at:", reg_url
+
+   # Set user HRN
+   if (options.user is not None):
+      user = options.user
+   elif ("SFI_USER" in os.environ):
+      user = os.environ["SFI_USER"]
    else:
-      print "No Known Registry"
+      print "No Known User Name"
       sys.exit(1)
-   if options.verbose:
-      print "Contacting Slice Manager at:", sm
-      print "Contacting Registry at:", registry
-
-   # SliceMgr and Registry may be available on the same server
-#   if (sm == registry):
-#      sm_chan = GeniClient(sm, key_file, cert_file)
-#      reg_chan = sm_chan
-#   else:
-#      sm_chan = GeniClient(sm, key_file, cert_file)
-#      reg_chan = GeniClient(registry, key_file, cert_file)
+
+   # Set authority HRN
+   if (options.auth is not None):
+      authority = options.auth
+   elif ("SFI_AUTH" in os.environ):
+      authority = os.environ["SFI_AUTH"]
+   else:
+      authority = None
+
+   # 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(reg_url, key_file, cert_file)
    return
 
 #
-# Get file names for various credentials and specs
+# Get various credential and spec files
 #
 # Establishes limiting conventions
 #   - conflates MAs and SAs
-#   - assumes a single user per working directory
 #   - assumes last token in slice name is unique
 #
-# Bootstraps credentials (not done yet)
+# Bootstraps credentials
+#   - bootstrap user credential from self-signed certificate
+#   - bootstrap authority credential from user credential
+#   - bootstrap slice credential from user credential
 #
 
 def get_leaf(name):
    parts = name.split(".")
    return parts[-1]
 
-def get_user_cred_fn():
-   file = os.path.join(sfi_dir, os.environ["USER"] + ".cred")
+def get_key_file():
+   file = os.path.join(sfi_dir, get_leaf(user) + ".pkey")
    if (os.path.isfile(file)):
       return file
    else:
-      print "bootstrap user credential here"
+      print "Key file", file, "does not exist"
+      sys.exit(-1)
+   return
+
+def get_cert_file(key_file):
+   global verbose
 
-def get_auth_cred_fn():
-   file = os.path.join(sfi_dir, "auth.cred")
+   file = os.path.join(sfi_dir, get_leaf(user) + ".cert")
    if (os.path.isfile(file)):
       return file
    else:
-      print "bootstrap authority credential here"
+      k = Keypair(filename = key_file)
+      cert = Certificate(subject=user)
+      cert.set_pubkey(k)
+      cert.set_issuer(k, user)
+      cert.sign()
+      if verbose :
+         print "Writing self-signed certificate to", file
+      cert.save_to_file(file)
+      return file
+
+def get_user_cred():
+   global user
 
-def get_slice_cred_fn(name):
+   file = os.path.join(sfi_dir, get_leaf(user) + ".cred")
+   if (os.path.isfile(file)):
+      user_cred = Credential(filename=file)
+      return user_cred
+   else:
+      # bootstrap user credential
+      user_cred = registry.get_credential(None, "user", user)
+      if user_cred:
+         user_cred.save_to_file(file, save_parents=True)
+         if verbose:
+            print "Writing user credential to", file
+         return user_cred
+      else:
+         print "Failed to get user credential"
+         sys.exit(-1)
+
+def get_auth_cred():
+   global authority
+
+   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 = registry.get_credential(user_cred, "sa", authority)
+      if auth_cred:
+         auth_cred.save_to_file(file, save_parents=True)
+         if verbose:
+            print "Writing authority credential to", file
+         return auth_cred
+      else:
+         print "Failed to get authority credential"
+         sys.exit(-1)
+
+def get_slice_cred(name):
    file = os.path.join(sfi_dir, "slice_" + get_leaf(name) + ".cred")
    if (os.path.isfile(file)):
-      return file
+      slice_cred = Credential(filename=file)
+      return slice_cred
    else:
-      print "bootstrap slice credential here"
-
-def get_rspec_fn(rspec):
+      # bootstrap slice credential from user credential
+      user_cred = get_user_cred()
+      slice_cred = registry.get_credential(user_cred, "slice", name)
+      if slice_cred:
+         slice_cred.save_to_file(file, save_parents=True)
+         if verbose:
+            print "Writing slice credential to", file
+         return slice_cred
+      else:
+         print "Failed to get slice credential"
+         sys.exit(-1)
+
+def get_rspec_file(rspec):
    if (os.path.isabs(rspec)):
       file = rspec
    else:
@@ -92,10 +189,10 @@ def get_rspec_fn(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_fn(record):
+def get_record_file(record):
    if (os.path.isabs(record)):
       file = record
    else:
@@ -103,18 +200,33 @@ def get_record_fn(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",
+              "add": "record",
+              "update": "record",
               "nodes": "[name]",
               "slices": "",
               "resources": "name",
@@ -124,31 +236,35 @@ def create_cmd_parser(command):
               "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"):
       parser.add_option("-f", "--format", dest="format",type="choice",
-           help="output format (dns|ip|hrn|rspec)",default="rspec",
-           choices=("dns","ip","hrn","rspec"))
-   elif command in ("list", "show", "remove"):
+           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", "list", "nodes", "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 sm_chan
-   global reg_chan
-
+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")
@@ -158,195 +274,286 @@ def main():
         help="slice manager", metavar="URL", default=None)
    parser.add_option("-d", "--dir", dest="dir",
         help="working directory", metavar="PATH", default = sfi_dir)
+   parser.add_option("-u", "--user", dest="user",
+        help="user name", metavar="HRN", default=None)
+   parser.add_option("-a", "--auth", dest="auth",
+        help="authority name", metavar="HRN", default=None)
    parser.add_option("-v", "--verbose",
         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:])
-   if options.verbose :
-      print options.registry,options.sm,options.dir,options.verbose
+   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
       elif command in ("list","show","remove"):
          print cmd_opts.type
-      print cmd_args 
+      print 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
 
 #
 # Following functions implement the commands
-#   todo: make sure args exist
 #
-# First, the Registry-related commands
+# Registry-related commands
 #
 
 # list entires in named authority registry
 def list(opts, args):
-   global reg_chan
-   cred_file = get_user_cred_fn() 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "list:", opts.type, args[0], reg_chan, credential
-#   result = reg_chan.list(credential, args[0])
-#   ...filter output based on opts.type...
+   global registry
+   user_cred = get_user_cred()
+   list = registry.list(user_cred, args[0])
+   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):
-# pretty print or return record xml?
-   global reg_chan
-   cred_file = get_user_cred_fn() 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "show:", opts.type, args[0], reg_chan, credential
-#   result = reg_chan.resolve(credential, args[0])
-#   ...filter output based on opts.type...
+   global registry
+   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 reg_chan
-   cred_file = get_auth_cred_fn() 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "remove:", opts.type, args[0], reg_chan, credential
-#   ...first retrieve named record...
-#   results = reg_chan.resolve(credential, args[0])
-#   ...filter desired record from result using opts.type
-#   ...use that record to call remove...
-#   result = reg_chan.remove(credential, record)
-   return
+   global registry
+   auth_cred = get_auth_cred()
+   return registry.remove(auth_cred, opts.type, args[0])
 
 # add named registry record
 def add(opts, args):
-   global reg_chan
-   cred_file = get_auth_cred_fn() 
-   with open(cred_file) as f:
-      credential = f.read()
-   rec_file = get_record_fn(args[1])
-   with open(rec_file) as g:
-      record = g.read()
-   print "add:", record, reg_chan, credential
-#   result = reg_chan.register(credential, record)
-   return
+   global registry
+   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 reg_chan
-   cred_file = get_auth_cred_fn() 
-   with open(cred_file) as f:
-      credential = f.read()
-   rec_file = get_record_fn(args[1])
-   with open(rec_file) as g:
-      record = g.read()
-   print "update:", record, reg_chan, credential
-#   result = reg_chan.update(credential, record)
-   return
+   global registry
+   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)
 
 #
-# Second, the Slice-related commands
+# Slice-related commands
 #
 
 # list available nodes
 def nodes(opts, args):
-   global sm_chan
-   cred_file = get_user_cred_fn() 
-   with open(cred_file) as f:
-      credential = f.read()
-   if (args[0] is None):
-      context = "root"
+   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:
-      context = args[0]
-   print "nodes:", opts.format, context, sm_chan, credential
-#   result = sm_chan.list_nodes(credential, context)
-#   ...format output based on opts.format...
+      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 sm_chan
-   cred_file = get_user_cred_fn() 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "slices:", sm_chan, credential
-#   result = sm_chan.list_slices(credential)
+   global slicemgr
+   user_cred = get_user_cred() 
+   results = slicemgr.list_slices(user_cred)
+   display_list(results)
    return
 
 # show rspec for named slice
 def resources(opts, args):
-   global sm_chan
-   cred_file = get_slice_cred_fn(args[0]) 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "resources:", opts.format, args[0], sm_chan, credential
-#   result = sm_chan.get_resources(credential, args[0])
-#   ...format output based on opts.format...
+   global slicemgr
+   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)   
+   display_rspec(result)
+   if (opts.file is not None):
+      save_rspec_to_file(opts.file, result)
    return
 
 # created named slice with given rspec
 def create(opts, args):
-   global sm_chan
-   cred_file = get_slice_cred_fn(args[0]) 
-   with open(cred_file) as f:
-      credential = f.read()
-   rspec_file = get_rspec_fn(args[1])
-   with open(rspec_file) as g:
-      rspec = g.read()
-   print "create:", args[0], rspec, sm_chan, credential
-#   result = sm_chan.instantiate(credential, rspec)
-   return
+   global slicemgr
+   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, slice_hrn, rspec)
 
 # delete named slice
 def delete(opts, args):
-   global sm_chan
-   cred_file = get_slice_cred_fn(args[0]) 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "delete:", args[0], sm_chan, credential
-#   result = sm_chan.delete_slice(credential)
-   return
+   global slicemgr
+   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 sm_chan
-   cred_file = get_slice_cred_fn(args[0]) 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "start:", args[0], sm_chan, credential
-#   result = sm_chan.start_slice(credential)
-   return
+   global slicemgr
+   slice_cred = get_slice_cred(args[0])
+   return slicemgr.start_slice(slice_cred)
 
 # stop named slice
 def stop(opts, args):
-   global sm_chan
-   cred_file = get_slice_cred_fn(args[0]) 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "stop:", args[0], sm_chan, credential
-#   result = sm_chan.stop_slice(credential)
-   return
+   global slicemgr
+   slice_cred = get_slice_cred(args[0])
+   return slicemgr.stop_slice(slice_cred)
 
 # reset named slice
 def reset(opts, args):
-   global sm_chan
-   cred_file = get_slice_cred_fn(args[0]) 
-   with open(cred_file) as f:
-      credential = f.read()
-   print "reset:", args[0], sm_chan, credential
-#   result = sm_chan.reset_slice(credential)
+   global slicemgr
+   slice_cred = get_slice_cred(args[0])
+   return slicemgr.reset_slice(slice_cred)
+
+#
+#
+# Display, Save, and Filter RSpecs and Records
+#   - to be replace by EMF-generated routines
+#
+#
+
+def display_rspec(rspec):
+   print rspec
+   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 display_records(recordList, dump = False):
+   for record in recordList:
+      display_record(record, dump)
+
+def display_record(record, dump = False):
+   if dump:
+       record.dump(False)
+   else:
+       info = record.getdict()
+       print "%s (%s)" % (info['hrn'], info['type'])
+   return
+
+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()