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:
0112c1e
)
interfaces is a list of dicts, not a dict
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 6 Apr 2010 15:01:08 +0000
(15:01 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 6 Apr 2010 15:01:08 +0000
(15:01 +0000)
sfa/server/registry.py
patch
|
blob
|
history
diff --git
a/sfa/server/registry.py
b/sfa/server/registry.py
index
fbe0964
..
6a219f2
100644
(file)
--- a/
sfa/server/registry.py
+++ b/
sfa/server/registry.py
@@
-72,13
+72,13
@@
class Registries(dict):
# are any missing gids, request a new one from the peer registry.
gids_current = self.api.auth.trusted_cert_list.get_list()
hrns_current = [gid.get_hrn() for gid in gids_found]
# are any missing gids, request a new one from the peer registry.
gids_current = self.api.auth.trusted_cert_list.get_list()
hrns_current = [gid.get_hrn() for gid in gids_found]
- hrns_expected =
self.interfaces.keys()
+ hrns_expected =
[interface['hrn'] for interfaces in self.interfaces]
new_hrns = set(hrns_current).difference(hrns_expected)
self.get_peer_gids(new_hrns)
# update the local db records for these registries
new_hrns = set(hrns_current).difference(hrns_expected)
self.get_peer_gids(new_hrns)
# update the local db records for these registries
- self.update_db_records()
+ self.update_db_records(
'sa'
)
# create connections to the registries
self.update(self.get_connections(interfaces))
# create connections to the registries
self.update(self.get_connections(interfaces))
@@
-117,7
+117,7
@@
class Registries(dict):
# reload the trusted certs list
self.api.auth.load_trusted_certs()
# reload the trusted certs list
self.api.auth.load_trusted_certs()
- def update_db_records(self):
+ def update_db_records(self
, type
):
"""
Make sure there is a record in the local db for allowed registries
defined in the config file (registries.xml). Removes old records from
"""
Make sure there is a record in the local db for allowed registries
defined in the config file (registries.xml). Removes old records from