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 (from parent 1:
e38bf20
)
fix bug
author
Tony Mack
<tmack@cs.princeton.edu>
Fri, 10 Apr 2009 01:09:31 +0000
(
01:09
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Fri, 10 Apr 2009 01:09:31 +0000
(
01:09
+0000)
geni/methods/resolve.py
patch
|
blob
|
history
diff --git
a/geni/methods/resolve.py
b/geni/methods/resolve.py
index
7fbb1e2
..
a782478
100644
(file)
--- a/
geni/methods/resolve.py
+++ b/
geni/methods/resolve.py
@@
-1,9
+1,13
@@
+
+
+
from geni.util.faults import *
from geni.util.excep import *
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.util.faults import *
from geni.util.excep import *
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
from geni.util.debug import log
class resolve(Method):
from geni.util.debug import log
class resolve(Method):
@@
-30,9
+34,11
@@
class resolve(Method):
# is this a foreign record
if not hrn.startswith(self.api.hrn):
# is this a foreign record
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):
if hrn.startswith(registry):
- records =
self.api.registries[registry].resolve(self.api.
credential, name)
+ records =
registries[registry].resolve(
credential, name)
good_records = records
else:
auth_hrn = self.api.auth.get_authority(hrn)
good_records = records
else:
auth_hrn = self.api.auth.get_authority(hrn)