X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=50b88bc9308250fbf24d73fae43bc5c45b1da84d;hb=f2a4ff047199d94add5e2240b952851e5a04445a;hp=bc6cc60f106bda1fe138581d20149b7ae295817b;hpb=9ba72fe5f76f0415d4b3e9365bf8e14426e272dd;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index bc6cc60f..50b88bc9 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -204,6 +204,8 @@ class Sfi: default="all") # display formats if command in ("resources"): + parser.add_option("-r", "--rspec-version", dest="rspec_version", default="sfa 1", + help="schema type and version of resulting RSpec") parser.add_option("-f", "--format", dest="format", type="choice", help="display format ([xml]|dns|ip)", default="xml", choices=("xml", "dns", "ip")) @@ -818,8 +820,11 @@ class Sfi: creds = [cred] if opts.delegate: delegated_cred = self.delegate_cred(cred, get_authority(self.authority)) - creds.append(delegated_cred) + creds.append(delegated_cred) + if opts.rspec_version: + call_options['rspec_version'] = opts.rspec_version result = server.ListResources(creds, call_options,unique_call_id()) + #result = server.ListResources(creds, call_options) format = opts.format if opts.file is None: display_rspec(result, format)