From 06b5d31971d4fa3d10c8c282c34e9057692aa8cf Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 13 Feb 2009 13:17:30 +0000 Subject: [PATCH] fix bugs --- cmdline/sfi.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmdline/sfi.py b/cmdline/sfi.py index 4573d7ff..12456217 100755 --- a/cmdline/sfi.py +++ b/cmdline/sfi.py @@ -351,7 +351,7 @@ def show(opts, args): records = filter_records(opts.type, records) if not records: print "No record of type", opts.type - display_records(records) + display_records(records, True) if opts.file: save_records_to_file(opts.file, records) return @@ -433,7 +433,7 @@ def resources(opts, args): global slicemgr slice_cred = get_slice_cred(args[0]) result = slicemgr.list_resources(slice_cred, args[0]) - display_rspec(opts.format, result) + display_rspec(result) if (opts.file is not None): save_rspec_to_file(opts.file, result) return @@ -497,14 +497,16 @@ def save_rspec_to_file(rspec, filename): f.close() return -def display_records(recordList): +def display_records(recordList, dump = False): for record in recordList: - display_record(record) + display_record(record, dump) -def display_record(record): - #record.dump(False) - info = record.getdict() - print "%s (%s)" % (info['hrn'], info['type']) +def display_record(record, dump = False): + if dump: + record.dump(False) + else: + info = record.getdict() + print "%s (%s)" % (info['hrn'], info['type']) return def filter_records(type, records): -- 2.43.0