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 18e13e3..0e04ecd 100644 (file)
--- a/sfa/server/sfa-clean-peer-records.py
+++ b/sfa/server/sfa-clean-peer-records.py
@@ -3,17 +3,21 @@
 import sys
 import os
 import traceback
-from sfa.util.namespace import *
-from sfa.util.table import SfaTable
+import socket
+
 from sfa.util.prefixTree import prefixTree
-from sfa.plc.api import SfaAPI
 from sfa.util.config import Config
+
 from sfa.trust.certificate import Keypair
 from sfa.trust.hierarchy import Hierarchy
-from sfa.util.report import trace, error
 from sfa.server.registry import Registries
-from sfa.util.xmlrpcprotocol import *
-import socket
+
+from sfa.storage.alchemy import dbsession
+from sfa.storage.persistentobjs import RegRecord
+
+from sfa.client.sfaserverproxy import SfaServerProxy 
+
+from sfa.generic import Generic
 
 def main():
     config = Config()
@@ -23,17 +27,17 @@ 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.get_server(url, key_file, cert_file)
-    sfa_api = SfaAPI(key_file = key_file, cert_file = cert_file, interface='registry')
+    registry = SfaServerProxy(url, key_file, cert_file)
+    sfa_api = Generic.the_flavour()
     credential = sfa_api.getCredential()
 
     # get peer registries
@@ -42,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:
@@ -58,15 +61,22 @@ def main():
             records = []
             target_hrns = hrn_dict[registry_hrn]    
             try:
-                records = registries[registry_hrn].resolve(credential, target_hrns)
+                records = registries[registry_hrn].Resolve(target_hrns, credential)
                 found_records.extend([record['hrn'] for record in records])
+            except ServerException:
+                # an exception will be thrown if the record doenst exist
+                # if so remove the record from the local registry
+                continue
             except:
+                # this deosnt necessarily mean the records dont exist
+                # lets give them the benefit of the doubt here (for now)
+                found_records.extend(target_hrns)
                 traceback.print_exc()
 
     # remove what wasnt found 
     for peer_record in peer_records:
-        if peer_record['hrn'] not in found_records:
-            registries[sfa_api.hrn].remove(credential, peer_record)
+        if peer_record.hrn not in found_records:
+            registries[sfa_api.hrn].Remove(peer_record.hrn, credential, peer_record.type)
                 
 if __name__ == '__main__':
     main()