X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_registries.py;h=a2a65a5744d7bb51d3b6176fa09f04caddd8ceed;hb=06b330f0ee047bdb107e43e82b1d7356c876bc15;hp=9cbba3916e1543df024c4d02b6970b4ffea8945e;hpb=11d02cbfd5e91784119bb9377fceb4fa6adae621;p=sfa.git diff --git a/sfa/methods/get_registries.py b/sfa/methods/get_registries.py index 9cbba391..a2a65a57 100644 --- a/sfa/methods/get_registries.py +++ b/sfa/methods/get_registries.py @@ -2,7 +2,7 @@ ### $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 @@ -30,17 +30,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).interfaces.values() if hrn: - if isinstance(hrn, StringTypes): - hrn_list = [hrn] - elif isinstance(hrn, list): - hrn_list = hrn - - if not hrn_list: - interfaces = registries.interfaces - else: - interfaces = [interface for interface in registries.interfaces if interface['hrn'] in hrn_list] - - return interfaces + registries = [reg for reg in registries if reg['hrn'] == hrn] + return registries