Merge branch 'master' into sqlalchemy

[sfa.git] / sfa / server / sfa-clean-peer-records.py

diff --git a/sfa/server/sfa-clean-peer-records.py b/sfa/server/sfa-clean-peer-records.py
index 62acb4b..0e04ecd 100644 (file)
--- a/sfa/server/sfa-clean-peer-records.py
+++ b/sfa/server/sfa-clean-peer-records.py
@@ -12,9 +12,10 @@ from sfa.trust.certificate import Keypair
 from sfa.trust.hierarchy import Hierarchy
 from sfa.server.registry import Registries
 
-from sfa.storage.table import SfaTable
+from sfa.storage.alchemy import dbsession
+from sfa.storage.persistentobjs import RegRecord
 
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol 
+from sfa.client.sfaserverproxy import SfaServerProxy 
 
 from sfa.generic import Generic
 
@@ -26,16 +27,16 @@ def main():
     # Get the path to the sfa server key/cert files from 
     # the sfa hierarchy object
     sfa_hierarchy = Hierarchy()
-    sfa_key_path = sfa_hierarchy.basedir
-    key_file = os.path.join(sfa_key_path, "server.key")
-    cert_file = os.path.join(sfa_key_path, "server.cert")
+    auth_info = sfa_hierarchy.get_interface_auth_info()
+    key_file = auth_info.get_privkey_filename()
+    cert_file = auth_info.get_gid_filename()
     key = Keypair(filename=key_file) 
 
     # get a connection to our local sfa registry
     # and a valid credential
     authority = config.SFA_INTERFACE_HRN
     url = 'http://%s:%s/' %(config.SFA_REGISTRY_HOST, config.SFA_REGISTRY_PORT)
-    registry = xmlrpcprotocol.server_proxy(url, key_file, cert_file)
+    registry = SfaServerProxy(url, key_file, cert_file)
     sfa_api = Generic.the_flavour()
     credential = sfa_api.getCredential()
 
@@ -45,15 +46,14 @@ def main():
     tree.load(registries.keys())
     
     # get local peer records
-    table = SfaTable()
-    peer_records = table.find({'~peer_authority': None})
+    peer_records=dbsession.query(RegRecord).filter (RegRecord.peer_authority != None).all()
     found_records = []
     hrn_dict = {}
     for record in peer_records:
-        registry_hrn = tree.best_match(record['hrn'])
+        registry_hrn = tree.best_match(record.hrn)
         if registry_hrn not in hrn_dict:
             hrn_dict[registry_hrn] = []
-        hrn_dict[registry_hrn].append(record['hrn'])
+        hrn_dict[registry_hrn].append(record.hrn)
 
     # attempt to resolve the record at the authoritative interface 
     for registry_hrn in hrn_dict:
@@ -75,8 +75,8 @@ def main():
 
     # remove what wasnt found 
     for peer_record in peer_records:
-        if peer_record['hrn'] not in found_records:
-            registries[sfa_api.hrn].Remove(peer_record['hrn'], credential, peer_record['type'])
+        if peer_record.hrn not in found_records:
+            registries[sfa_api.hrn].Remove(peer_record.hrn, credential, peer_record.type)
                 
 if __name__ == '__main__':
     main()