From 370d357a3a2d8bb855646cb496dd4d4fc8133fe5 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 10 Apr 2009 02:28:45 +0000 Subject: [PATCH] fix bugs --- geni/methods/list.py | 7 +++++-- geni/methods/resolve.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/geni/methods/list.py b/geni/methods/list.py index 641e4db3..fe61f123 100644 --- a/geni/methods/list.py +++ b/geni/methods/list.py @@ -4,6 +4,7 @@ from geni.util.method import Method from geni.util.parameter import Parameter, Mixed from geni.util.auth import Auth from geni.util.record import GeniRecord +from geni.registry import Registries class list(Method): """ @@ -28,9 +29,11 @@ class list(Method): self.api.auth.check(cred, 'list') # is this a foreign authority if not hrn.startswith(self.api.hrn): - for registry in self.api.registries: + registries = Registries(self.api) + credential = self.api.getCredential() + for registry in registries: if hrn.startswith(registry): - records = self.api.registries[registry].list(self.api.credential, hrn) + records = registries[registry].list(credential, hrn) return records if not self.api.auth.hierarchy.auth_exists(hrn): diff --git a/geni/methods/resolve.py b/geni/methods/resolve.py index a7824780..3987ad7a 100644 --- a/geni/methods/resolve.py +++ b/geni/methods/resolve.py @@ -38,7 +38,7 @@ class resolve(Method): credential = self.api.getCredential() for registry in registries: if hrn.startswith(registry): - records = registries[registry].resolve(credential, name) + records = registries[registry].resolve(credential, hrn) good_records = records else: auth_hrn = self.api.auth.get_authority(hrn) @@ -59,6 +59,7 @@ class resolve(Method): " because pl record does not exist" table.remove(record) + print good_records dicts = [record.as_dict() for record in good_records] return dicts -- 2.43.0