X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fmethods%2Fget_registries.py;h=65d944496f79fd53df9af8a47555c5eb2033784b;hb=e494b36a8d4b0924e8591d52662450c32a20615d;hp=082c5df8914acc4282e065ce4a966752095abfe3;hpb=f3eea46aa8ab4c40de09ee4b33010828df9c86d0;p=sfa.git diff --git a/sfa/methods/get_registries.py b/sfa/methods/get_registries.py index 082c5df8..65d94449 100644 --- a/sfa/methods/get_registries.py +++ b/sfa/methods/get_registries.py @@ -1,11 +1,6 @@ -### $Id: get_slices.py 14387 2009-07-08 18:19:11Z faiyaza $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/get_registries.py $ -from types import StringTypes -from sfa.util.faults import * -from sfa.util.namespace import * +from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method from sfa.util.parameter import Parameter, Mixed -from sfa.trust.auth import Auth from sfa.server.registry import Registries class get_registries(Method): @@ -30,17 +25,7 @@ class get_registries(Method): def call(self, cred, xrn = None): hrn, type = urn_to_hrn(xrn) self.api.auth.check(cred, 'list') - registries = Registries(self.api) - hrn_list = [] + registries = Registries(self.api).values() if hrn: - if isinstance(hrn, StringTypes): - hrn_list = [hrn] - elif isinstance(hrn, list): - hrn_list = hrn - - if not hrn_list: - interfaces = registries.interfaces.keys() - else: - interfaces = [interface for interface in registries.interfaces if interface in hrn_list] - - return interfaces + registries = [reg for reg in registries if reg['hrn'] == hrn] + return registries