X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=31b8a0530ac144da14d88d080842323ca65769f6;hb=a5fdefe7f034410ab55ba0d739c2b802334418e9;hp=6f5f64df5532085765a0d3f1be8a4061deeb9c28;hpb=a741125cd9223fbd2dc4696eed018945ba8d84cf;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 6f5f64df..31b8a053 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -96,14 +96,14 @@ def filter_records(type, records): def credential_printable (cred): - credential=Credential(cred=cred) + credential = Credential(cred=cred) result="" - result += credential.get_summary_tostring() + result += credential.pretty_cred() result += "\n" rights = credential.get_privileges() result += "type=%s\n" % credential.type result += "version=%s\n" % credential.version - result += "rights=%s\n"%rights + result += "rights=%s\n" % rights return result def show_credentials (cred_s): @@ -208,6 +208,9 @@ def load_record_from_opts(options): record_dict['reg-researchers'] = options.reg_researchers if hasattr(options, 'email') and options.email: record_dict['email'] = options.email + # authorities can have a name for standalone deployment + if hasattr(options, 'name') and options.name: + record_dict['name'] = options.name if hasattr(options, 'reg_pis') and options.reg_pis: record_dict['reg-pis'] = options.reg_pis @@ -423,6 +426,7 @@ class Sfi: parser.add_option('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') parser.add_option('-t', '--type', dest='type', metavar='', help='object type', default=None) parser.add_option('-e', '--email', dest='email', default="", help="email (mandatory for users)") + parser.add_option('-n', '--name', dest='name', default="", help="name (optional for authorities)") parser.add_option('-k', '--key', dest='key', metavar='', help='public key string or file', default=None) parser.add_option('-s', '--slices', dest='slices', metavar='', help='Set/replace slice xrns',