self.authority = None
self.logger = sfi_logger
self.logger.enable_console()
+ ### various auxiliary material that we keep at hand
self.command=None
+ self.config=None
+ self.config_file=None
+ self.client_bootstrap=None
### suitable if no reasonable command has been provided
def print_commands_help (self, options):
else:
print line
self.create_parser().print_help()
- for (command, (doc, args_string, example)) in commands_dict.iteritems():
+ # preserve order from the code
+ for command in commands_list:
+ (doc, args_string, example) = commands_dict[command]
if verbose:
print line
doc=doc.replace("\n","\n"+35*' ')
print "\n==================== Specific usage for %s"%self.command
self.command_parser.print_help()
if example:
- print "\n==================== %s example"%self.command
+ print "\n==================== %s example(s)"%self.command
print example
def create_command_parser(self, command):
metavar="slice_hrn", help="delegate cred. for slice HRN")
parser.add_option("-a", "--auths", dest='delegate_auths',action='append',default=[],
metavar='auth_hrn', help="delegate cred for auth HRN")
- # this primarily is a shorthand for -a my_hrn^
+ # this primarily is a shorthand for -a my_hrn
parser.add_option("-p", "--pi", dest='delegate_pi', default=None, action='store_true',
help="delegate your PI credentials, so s.t. like -a your_hrn^")
parser.add_option("-A","--to-authority",dest='delegate_to_authority',action='store_true',default=False,
config.add_section('sfi')
# sface users should be able to use this same file to configure their stuff
config.add_section('sface')
- # manifold users should be able to specify their backend server here for sfi delegate
+ # manifold users should be able to specify the details
+ # of their backend server here for 'sfi myslice'
config.add_section('myslice')
config.load(config_file)
# back up old config
self.logger.log_exc("Could not read config file %s"%config_file)
sys.exit(1)
+ self.config=config
errors = 0
# Set SliceMgr URL
if (self.options.sm is not None):
# Registry-related commands
#==========================================================================
+ @register_command("","")
+ def config (self, options, args):
+ "Display contents of current config"
+ self.show_config()
+
@register_command("","")
def version(self, options, args):
"""
display an SFA server version (GetVersion)
-or version information about sfi itself
+ or version information about sfi itself
"""
if options.version_local:
version=version_core()
save_records_to_file(options.file, record_dicts, options.fileformat)
return
- @register_command("[record]","")
+ @register_command("[xml-filename]","")
def add(self, options, args):
- "add record into registry by using the command options (Recommended) or from xml file (Register)"
+ """add record into registry (Register)
+ from command line options (recommended)
+ old-school method involving an xml file still supported"""
+
auth_cred = self.my_authority_credential_string()
if options.show_credential:
show_credentials(auth_cred)
record_dict['last_name'] = record_dict['hrn']
return self.registry().Register(record_dict, auth_cred)
- @register_command("[record]","")
+ @register_command("[xml-filename]","")
def update(self, options, args):
- "update record into registry by using the command options (Recommended) or from xml file (Update)"
+ """update record into registry (Update)
+ from command line options (recommended)
+ old-school method involving an xml file still supported"""
record_dict = {}
if len(args) > 0:
record_filepath = args[0]
return
# show rspec for named slice
- @register_command("[slice_hrn]","")
+ @register_command("","")
def resources(self, options, args):
"""
discover available resources (ListResources)
@register_command("slice_hrn","")
def describe(self, options, args):
"""
- shows currently allocated/provisioned resources of the named slice or set of slivers (Describe)
+ shows currently allocated/provisioned resources
+ of the named slice or set of slivers (Describe)
"""
server = self.sliceapi()
self.logger.info("writing %s gid to %s" % (target_hrn, filename))
GID(string=gid).save_to_file(filename)
-
- @register_command("to_hrn","")
+ ####################
+ @register_command("to_hrn","""$ sfi delegate -u -p -s ple.inria.heartbeat -s ple.inria.omftest ple.upmc.slicebrowser
+
+ will locally create a set of delegated credentials for the benefit of ple.upmc.slicebrowser
+ the set of credentials in the scope for this call would be
+ (*) ple.inria.thierry_parmentelat.user_for_ple.upmc.slicebrowser.user.cred
+ as per -u/--user
+ (*) ple.inria.pi_for_ple.upmc.slicebrowser.user.cred
+ as per -p/--pi
+ (*) ple.inria.heartbeat.slice_for_ple.upmc.slicebrowser.user.cred
+ (*) ple.inria.omftest.slice_for_ple.upmc.slicebrowser.user.cred
+ because of the two -s options
+
+""")
def delegate (self, options, args):
"""
(locally) create delegate credential for use by given hrn
+ make sure to check for 'sfi myslice' instead if you plan
+ on using MySlice
"""
if len(args) != 1:
self.print_help()
self.logger.info("delegated credential for %s to %s and wrote to %s"%(message,to_hrn,filename))
####################
- @register_command("","""$ less +/myslice myslice sfi_config
+ @register_command("","""$ less +/myslice sfi_config
[myslice]
-backend = 'http://manifold.pl.sophia.inria.fr:7080'
-delegate = 'ple.upmc.slicebrowser'
-user = 'thierry'
+backend = http://manifold.pl.sophia.inria.fr:7080
+# the HRN that myslice uses, so that we are delegating to
+delegate = ple.upmc.slicebrowser
+# platform - this is a myslice concept
+platform = ple
+# username - as of this writing (May 2013) a simple login name
+username = thierry
$ sfi myslice
-
will first collect the slices that you are part of, then make sure
- all your credentials are up-to-date (that is: refresh expired ones)
+ all your credentials are up-to-date (read: refresh expired ones)
then compute delegated credentials for user 'ple.upmc.slicebrowser'
- and upload them all on myslice backend, using manifold id as
- specified in 'user'
+ and upload them all on myslice backend, using 'platform' and 'user'.
+ A password will be prompted for the upload part.
+
+$ sfi -v myslice -- or sfi -vv myslice
+ same but with more and more verbosity
+
+$ sfi m
+ is synonym to sfi myslice as no other command starts with an 'm'
"""
-)
+) # register_command
def myslice (self, options, args):
""" This helper is for refreshing your credentials at myslice; it will
if len(args)>0:
self.print_help()
sys.exit(1)
- # ManifoldUploader
- pass
- @register_command("cred","")
+ ### the rough sketch goes like this
+ # (a) rain check for sufficient config in sfi_config
+ # we don't allow to override these settings for now
+ myslice_dict={}
+ myslice_keys=['backend', 'delegate', 'platform', 'username']
+ for key in myslice_keys:
+ full_key="MYSLICE_" + key.upper()
+ value=getattr(self.config,full_key,None)
+ if value: myslice_dict[key]=value
+ else: print "Unsufficient config, missing key %s in [myslice] section of sfi_config"%key
+ if len(myslice_dict) != len(myslice_keys):
+ sys.exit(1)
+
+ # (b) figure whether we are PI for the authority where we belong
+ sfi_logger.info("Resolving our own id")
+ my_records=self.registry().Resolve(self.user,self.my_credential_string)
+ if len(my_records)!=1: print "Cannot Resolve %s -- exiting"%self.user; sys.exit(1)
+ my_record=my_records[0]
+ sfi_logger.info("Checking for authorities that we are PI for")
+ my_auths = my_record['reg-pi-authorities']
+ sfi_logger.debug("Found %d authorities: %s"%(len(my_auths),my_auths))
+
+ # (c) get the set of slices that we are in
+ sfi_logger.info("Checking for slices that we are member of")
+ my_slices=my_record['reg-slices']
+ sfi_logger.debug("Found %d slices: %s"%(len(my_slices),my_slices))
+
+ # (d) make sure we have *valid* credentials for all these
+ hrn_credentials=[]
+ hrn_credentials.append ( (self.user, 'user', self.my_credential_string,) )
+ for auth_hrn in my_auths:
+ hrn_credentials.append ( (auth_hrn, 'auth', self.authority_credential_string(auth_hrn),) )
+ for slice_hrn in my_slices:
+ hrn_credentials.append ( (slice_hrn, 'slice', self.slice_credential_string (slice_hrn),) )
+
+ # (e) check for the delegated version of these
+ # xxx todo add an option -a/-A? like for 'sfi delegate' for when we ever
+ # switch to myslice using an authority instead of a user
+ delegatee_type='user'
+ delegatee_hrn=myslice_dict['delegate']
+ hrn_delegated_credentials = [
+ (hrn, htype, self.client_bootstrap.delegate_credential_string (credential, delegatee_hrn, delegatee_type),)
+ for (hrn, htype, credential) in hrn_credentials ]
+
+ # (f) and finally upload them to manifold server
+ # xxx todo add an option so the password can be set on the command line
+ # (but *NOT* in the config file) so other apps can leverage this
+ uploader = ManifoldUploader (logger=sfi_logger,
+ url=myslice_dict['backend'],
+ platform=myslice_dict['platform'],
+ username=myslice_dict['username'])
+ for (hrn,htype,delegated_credential) in hrn_delegated_credentials:
+ sfi_logger.info("Uploading delegated credential for %s (%s)"%(hrn,htype))
+ uploader.upload(delegated_credential,message=hrn)
+ # at first I thought we would want to save these,
+ # like 'sfi delegate does' but on second thought
+ # it is probably not helpful as people would not
+ # need to run 'sfi delegate' at all anymore
+ return
+
+# Thierry: I'm turning this off as a command, no idea what it's used for
+# @register_command("cred","")
def trusted(self, options, args):
"""
return the trusted certs at this interface (get_trusted_certs)
self.logger.debug('Sfi.trusted -> %r'%cert.get_subject())
return
- @register_command("","")
- def config (self, options, args):
- "Display contents of current config"
- self.show_config()
git://git.onelab.eu / sfa.git / blobdiff