git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't resolve user records if there aren't any users
[sfa.git]
/
sfa
/
client
/
sfi.py
diff --git
a/sfa/client/sfi.py
b/sfa/client/sfi.py
old mode 100755
(executable)
new mode 100644
(file)
index
6388348
..
726138f
--- a/
sfa/client/sfi.py
+++ b/
sfa/client/sfi.py
@@
-83,7
+83,6
@@
def filter_records(type, records):
def save_rspec_to_file(rspec, filename):
if not filename.endswith(".rspec"):
filename = filename + ".rspec"
def save_rspec_to_file(rspec, filename):
if not filename.endswith(".rspec"):
filename = filename + ".rspec"
-
f = open(filename, 'w')
f.write(rspec)
f.close()
f = open(filename, 'w')
f.write(rspec)
f.close()
@@
-689,10
+688,7
@@
class Sfi:
for record in list:
print "%s (%s)" % (record['hrn'], record['type'])
if opts.file:
for record in list:
print "%s (%s)" % (record['hrn'], record['type'])
if opts.file:
- file = opts.file
- if not file.startswith(os.sep):
- file = os.path.join(self.options.sfi_dir, file)
- save_records_to_file(file, list)
+ save_records_to_file(opts.file, list)
return
# show named registry record
return
# show named registry record
@@
-723,10
+719,7
@@
class Sfi:
else:
print record.save_to_string()
if opts.file:
else:
print record.save_to_string()
if opts.file:
- file = opts.file
- if not file.startswith(os.sep):
- file = os.path.join(self.options.sfi_dir, file)
- save_records_to_file(file, records)
+ save_records_to_file(opts.file, records)
return
def delegate(self, opts, args):
return
def delegate(self, opts, args):
@@
-939,14
+932,10
@@
class Sfi:
if self.server_supports_call_id_arg(server):
call_args.append(unique_call_id())
result = server.ListResources(*call_args)
if self.server_supports_call_id_arg(server):
call_args.append(unique_call_id())
result = server.ListResources(*call_args)
- format = opts.format
if opts.file is None:
if opts.file is None:
- display_rspec(result, format)
+ display_rspec(result,
opts.
format)
else:
else:
- file = opts.file
- if not file.startswith(os.sep):
- file = os.path.join(self.options.sfi_dir, file)
- save_rspec_to_file(result, file)
+ save_rspec_to_file(result, opts.file)
return
# created named slice with given rspec
return
# created named slice with given rspec
@@
-973,7
+962,7
@@
class Sfi:
all_keys = []
all_key_ids = []
slice_records = self.registry.Resolve(slice_urn, [user_cred.save_to_string(save_parents=True)])
all_keys = []
all_key_ids = []
slice_records = self.registry.Resolve(slice_urn, [user_cred.save_to_string(save_parents=True)])
- if slice_records and 'researcher' in slice_records[0]:
+ if slice_records and 'researcher' in slice_records[0]
and slice_records[0]['researcher']!=[]
:
slice_record = slice_records[0]
user_hrns = slice_record['researcher']
user_urns = [hrn_to_urn(hrn, 'user') for hrn in user_hrns]
slice_record = slice_records[0]
user_hrns = slice_record['researcher']
user_urns = [hrn_to_urn(hrn, 'user') for hrn in user_hrns]