X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=c8082dc9dbf0a4cf79cf66e4f835dfd8f1abca1e;hb=a0b08c3177b6273ad22f3882cd62495743ed404c;hp=2ec43fbf34a1fb92127f0e07bdda0b34b2055329;hpb=3afe79f7a3b11cb2154a7e0e48ac14b0d4830590;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 2ec43fbf..c8082dc9 100644 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -1,7 +1,6 @@ # # sfi.py - basic SFA command-line client -# the actual binary in sfa/clientbin essentially runs main() -# this module is used in sfascan +# this module is also used in sfascan # import sys @@ -359,7 +358,7 @@ class Sfi: default="all") if command in ("resources"): # rspec version - parser.add_option("-r", "--rspec-version", dest="rspec_version", default="GENI", + parser.add_option("-r", "--rspec-version", dest="rspec_version", default="SFA 1", help="schema type and version of resulting RSpec") # disable/enable cached rspecs parser.add_option("-c", "--current", dest="current", default=False, @@ -879,7 +878,7 @@ or version information about sfi itself cred = self.my_authority_credential_string() elif record_dict['type'] in ["slice"]: try: - cred = self.slice_credential_string(record.hrn) + cred = self.slice_credential_string(record_dict['hrn']) except ServerException, e: # XXX smbaker -- once we have better error return codes, update this # to do something better than a string compare