X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FListResources.py;h=6b1e785048c63ce09bddddd954866551bbe26816;hb=a665d295716a0f85228d4990ac05397d1b4ffffe;hp=fb831170f9a1c2ab8eb46105ee24cd9b75ad6519;hpb=5f4f788db1dd59e8a5968e9118ff1feda89389dc;p=sfa.git diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py index fb831170..6b1e7850 100644 --- a/sfa/methods/ListResources.py +++ b/sfa/methods/ListResources.py @@ -1,7 +1,5 @@ -import sys import zlib -from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method from sfa.util.parameter import Parameter, Mixed @@ -19,12 +17,11 @@ class ListResources(Method): accepts = [ Mixed(Parameter(str, "Credential string"), Parameter(type([str]), "List of credentials")), - Parameter(dict, "Options"), - Parameter(str, "call_id"), + Parameter(dict, "Options") ] returns = Parameter(str, "List of resources") - def call(self, creds, options, call_id=""): + def call(self, creds, options={}): self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name)) # get slice's hrn from options @@ -38,9 +35,7 @@ class ListResources(Method): origin_hrn = options.get('origin_hrn', None) if not origin_hrn: origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() - # get manager for this interface - manager = self.api.get_interface_manager() - rspec = manager.ListResources(self.api, creds, options, call_id) + rspec = self.api.manager.ListResources(self.api, creds, options) # filter rspec through sfatables if self.api.interface in ['aggregate']: