From a56ecfce798a6e9da4357116134458111a98f508 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 2 Jun 2015 14:15:51 +0200 Subject: [PATCH] sfi list -v will now show user's email and authority's name as well --- sfa/client/common.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sfa/client/common.py b/sfa/client/common.py index 43a5b054..52ae3eef 100644 --- a/sfa/client/common.py +++ b/sfa/client/common.py @@ -44,8 +44,12 @@ def terminal_render_default (record,options): print "%s (%s)" % (record['hrn'], record['type']) def terminal_render_user (record, options): print "%s (User)"%record['hrn'], - if record.get('reg-pi-authorities',None): print " [PI at %s]"%(" and ".join(record['reg-pi-authorities'])), - if record.get('reg-slices',None): print " [IN slices %s]"%(" and ".join(record['reg-slices'])), + if options.verbose and record.get('email', None): + print "email='{}'".format(record['email']), + if record.get('reg-pi-authorities', None): + print " [PI at %s]"%(" and ".join(record['reg-pi-authorities'])), + if record.get('reg-slices', None): + print " [IN slices %s]"%(" and ".join(record['reg-slices'])), user_keys=record.get('reg-keys',[]) if not options.verbose: print " [has %s]"%(terminal_render_plural(len(user_keys),"key")) @@ -55,12 +59,16 @@ def terminal_render_user (record, options): def terminal_render_slice (record, options): print "%s (Slice)"%record['hrn'], - if record.get('reg-researchers',None): print " [USERS %s]"%(" and ".join(record['reg-researchers'])), + if record.get('reg-researchers', None): + print " [USERS %s]"%(" and ".join(record['reg-researchers'])), # print record.keys() print "" def terminal_render_authority (record, options): print "%s (Authority)"%record['hrn'], - if record.get('reg-pis',None): print " [PIS %s]"%(" and ".join(record['reg-pis'])), + if options.verbose and record.get('name'): + print "name='{}'".format(record['name']) + if record.get('reg-pis', None): + print " [PIS %s]"%(" and ".join(record['reg-pis'])), print "" def terminal_render_node (record, options): print "%s (Node)"%record['hrn'] -- 2.43.0