Merge branch 'master' into senslab2

[sfa.git] / sfa / client / sfi.py

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 4b5eacb..cc8ef3f 100644 (file)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -218,7 +218,7 @@ def render_plural (how_many, name,names=None):
     if not names: names="%ss"%name
     if how_many<=0: return "No %s"%name
     elif how_many==1: return "1 %s"%name
-    else return "%d %s"%(how_many,names)
+    else: return "%d %s"%(how_many,names)
 
 def terminal_render_default (record,options):
     print "%s (%s)" % (record['hrn'], record['type'])
@@ -228,8 +228,7 @@ def terminal_render_user (record, options):
     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]"%(render_plural(len(user_keys),"name"))
-        print ""
+        print " [has %s]"%(render_plural(len(user_keys),"key"))
     else:
         print ""
         for key in user_keys: print 8*' ',key.strip("\n")
@@ -468,7 +467,7 @@ class Sfi:
            parser.add_option("-r", "--recursive", dest="recursive", action='store_true',
                              help="list all child records", default=False)
            parser.add_option("-v", "--verbose", dest="verbose", action='store_true',
-                             help="more verbose", default=False)
+                             help="gives details, like user keys", default=False)
         if command in ("delegate"):
            parser.add_option("-u", "--user",
                             action="store_true", dest="delegate_user", default=False,
@@ -1155,7 +1154,8 @@ or with an slice hrn, shows currently provisioned resources
         # xxx Thierry 2012 sept. 21
         # contrary to what I was first thinking, calling Resolve with details=False does not yet work properly here
         # I am turning details=True on again on a - hopefully - temporary basis, just to get this whole thing to work again
-        slice_records = self.registry().Resolve(slice_urn, [self.my_credential_string], {'details':True})
+        slice_records = self.registry().Resolve(slice_urn, [self.my_credential_string])
+        # slice_records = self.registry().Resolve(slice_urn, [self.my_credential_string], {'details':True})
         if slice_records and 'reg-researchers' in slice_records[0] and slice_records[0]['reg-researchers']:
             slice_record = slice_records[0]
             user_hrns = slice_record['reg-researchers']
@@ -1168,6 +1168,7 @@ or with an slice hrn, shows currently provisioned resources
                 rspec.filter({'component_manager_id': server_version['urn']})
                 rspec = RSpecConverter.to_pg_rspec(rspec.toxml(), content_type='request')
             else:
+                print >>sys.stderr, "\r\n \r\n \r\n WOOOOOO"
                 users = sfa_users_arg(user_records, slice_record)
 
         # do not append users, keys, or slice tags. Anything