git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
31641b6
)
bug in loadCredential(), commented out for now
author
Tony Mack
<tmack@cs.princeton.edu>
Mon, 23 Mar 2009 13:32:00 +0000
(13:32 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Mon, 23 Mar 2009 13:32:00 +0000
(13:32 +0000)
geni/registry.py
patch
|
blob
|
history
diff --git
a/geni/registry.py
b/geni/registry.py
index
e792c55
..
b33f3b8
100644
(file)
--- a/
geni/registry.py
+++ b/
geni/registry.py
@@
-113,7
+113,7
@@
class Registry(GeniServer):
self.registry_info = XmlStorage(registries_file, {'registries': {'registry': [connection_dict]}})
self.registry_info.load()
self.connectRegistry()
self.registry_info = XmlStorage(registries_file, {'registries': {'registry': [connection_dict]}})
self.registry_info.load()
self.connectRegistry()
- self.loadCredential()
+
#
self.loadCredential()
self.connectRegistries()
self.connectRegistries()
@@
-765,8
+765,15
@@
class Registry(GeniServer):
def resolve(self, cred, name):
self.decode_authentication(cred, "resolve")
def resolve(self, cred, name):
self.decode_authentication(cred, "resolve")
-
- records = self.resolve_raw("*", name)
+
+ try:
+ records = self.resolve_raw("*", name)
+ except RecordNotFound:
+ records = []
+ for registry in self.registries:
+ if name.startswith(registry):
+ records = self.registries[registry].resolve(cred, name)
+
dicts = []
for record in records:
dicts.append(record.as_dict())
dicts = []
for record in records:
dicts.append(record.as_dict())