X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FListResources.py;h=795594be5cb6dd0dad6aa3629c2da7f42070d8a8;hb=796d35d54ab31e209ddf76b4584b6508b309c6c1;hp=b7ac0b72c1e53e5ce80e6ac60c4e9c59243463c2;hpb=9fe1cc1bbb72921e1fe94e9a7997cd387073d863;p=sfa.git diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py index b7ac0b72..795594be 100644 --- a/sfa/methods/ListResources.py +++ b/sfa/methods/ListResources.py @@ -32,9 +32,9 @@ class ListResources(Method): options['geni_rspec_version'] = options['rspec_version'] else: raise SfaInvalidArgument('Must specify an rspec version option. geni_rspec_version cannot be null') - + # Find the valid credentials - valid_creds = self.api.auth.checkCredentials(creds, 'listnodes') + valid_creds = self.api.auth.checkCredentialsSpeaksFor(creds, 'listnodes', options=options) # get hrn of the original caller origin_hrn = options.get('origin_hrn', None) @@ -50,7 +50,7 @@ class ListResources(Method): self.api.logger.debug("ListResources: sfatables on chain %s"%chain_name) filtered_rspec = run_sfatables(chain_name, '', origin_hrn, rspec) - if options.has_key('geni_compressed') and options['geni_compressed'] == True: + if 'geni_compressed' in options and options['geni_compressed'] == True: filtered_rspec = zlib.compress(filtered_rspec).encode('base64') return filtered_rspec