removed another bunch of references to geni

[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 235ddaf..5c13335 100644 (file)
--- a/sfa/server/sfa-clean-peer-records.py
+++ b/sfa/server/sfa-clean-peer-records.py
@@ -3,16 +3,15 @@
 import sys
 import os
 import traceback
 import sys
 import os
 import traceback

-from sfa.util.misc import *
-from sfa.util.genitable import GeniTable
-from sfa.util.geniclient import GeniClient
-from sfa.plc.api import GeniAPI
+from sfa.util.namespace import *
+from sfa.util.table import SfaTable
+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.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 ServerException
+from sfa.util.xmlrpcprotocol import xmlrpcprotocol, ServerException

 import socket
 
 def main():
 import socket
 
 def main():


@@ -32,15 +31,15 @@ def main():
     # and a valid credential
     authority = config.SFA_INTERFACE_HRN
     url = 'http://%s:%s/' %(config.SFA_REGISTRY_HOST, config.SFA_REGISTRY_PORT)
     # and a valid credential
     authority = config.SFA_INTERFACE_HRN
     url = 'http://%s:%s/' %(config.SFA_REGISTRY_HOST, config.SFA_REGISTRY_PORT)

-    registry = GeniClient(url, key_file, cert_file)
-    sfa_api = GeniAPI(key_file = key_file, cert_file = cert_file, interface='registry')
+    registry = xmlrpcprotocol.get_server((url, key_file, cert_file)
+    sfa_api = SfaAPI(key_file = key_file, cert_file = cert_file, interface='registry')

     credential = sfa_api.getCredential()
 
     # get peer registries
     registries = Registries(sfa_api)
 
     # get local peer records
     credential = sfa_api.getCredential()
 
     # get peer registries
     registries = Registries(sfa_api)
 
     # get local peer records

-    table = GeniTable()
+    table = SfaTable()

     peer_records = table.find({'~peer_authority': None})
     for peer_record in peer_records:
         peer_auth = peer_record['peer_authority']
     peer_records = table.find({'~peer_authority': None})
     for peer_record in peer_records:
         peer_auth = peer_record['peer_authority']