sfaprotocol is renamed into sfaserverproxy, with class SfaServerProxy

[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 c7aea3c..bcb917b 100644 (file)
--- a/sfa/server/sfa-clean-peer-records.py
+++ b/sfa/server/sfa-clean-peer-records.py
@@ -3,15 +3,20 @@
 import sys
 import os
 import traceback
-from sfa.util.table import SfaTable
+import socket
+
 from sfa.util.prefixTree import prefixTree
-from sfa.plc.api import PlcSfaApi
 from sfa.util.config import Config
+
 from sfa.trust.certificate import Keypair
 from sfa.trust.hierarchy import Hierarchy
 from sfa.server.registry import Registries
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol 
-import socket
+
+from sfa.storage.table import SfaTable
+
+from sfa.client.sfaserverproxy import SfaServerProxy 
+
+from sfa.generic import Generic
 
 def main():
     config = Config()
@@ -30,8 +35,8 @@ def main():
     # 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 = PlcSfaApi(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