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 SfaAPI
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()
# 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