X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FListResources.py;h=04359a046be630f472d660ef0f0f8cb3ffec4942;hb=f2282434e40e06365e0fdd3f9bc273a793f41235;hp=65fd819ff829918130c5e9d5c5c550d148c52f14;hpb=cf630d87d633f3861e3ac8a50433fa29ca46a74e;p=sfa.git diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py index 65fd819f..04359a04 100644 --- a/sfa/methods/ListResources.py +++ b/sfa/methods/ListResources.py @@ -3,7 +3,7 @@ import zlib from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method from sfa.util.sfatablesRuntime import run_sfatables - +from sfa.util.faults import SfaInvalidArgument from sfa.trust.credential import Credential from sfa.storage.parameter import Parameter, Mixed @@ -23,9 +23,16 @@ class ListResources(Method): ] returns = Parameter(str, "List of resources") - def call(self, creds, options={}): + def call(self, creds, options): self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name)) - + + # client must specify a version + if not options.get('geni_rspec_version'): + if options.get('rspec_version'): + options['geni_rspec_version'] = options['rspec_version'] + else: + raise SfaInvalidArgument('Must specify an rspec version option. geni_rspec_version cannot be null') + # get slice's hrn from options xrn = options.get('geni_slice_urn', '') (hrn, _) = urn_to_hrn(xrn)