X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfa_component_setup.py;h=f75f1ca728ab8e5709e18aef09765ed480e3fd72;hb=58edd1cb7f56a14de9ed77c833d6f0c8da33ee56;hp=ed1ee30ea046558082d2c6eefaffc9c75580db51;hpb=de46e2cf9793a28dcf5e5d9b128da3e9abc1755d;p=sfa.git diff --git a/sfa/server/sfa_component_setup.py b/sfa/server/sfa_component_setup.py index ed1ee30e..f75f1ca7 100755 --- a/sfa/server/sfa_component_setup.py +++ b/sfa/server/sfa_component_setup.py @@ -6,14 +6,16 @@ from optparse import OptionParser from sfa.util.faults import ConnectionKeyGIDMismatch from sfa.util.config import Config -import sfa.client.xmlrpcprotocol as xmlrpcprotocol -from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn from sfa.trust.certificate import Keypair, Certificate from sfa.trust.credential import Credential from sfa.trust.gid import GID from sfa.trust.hierarchy import Hierarchy +from sfa.client.sfaserverproxy import SfaServerProxy + +from sfa.planetlab.plxrn import hrn_to_pl_slicename, slicename_to_hrn + KEYDIR = "/var/lib/sfa/" CONFDIR = "/etc/sfa/" @@ -48,7 +50,7 @@ def server_proxy(url=None, port=None, keyfile=None, certfile=None,verbose=False) if verbose: print "Contacting registry at: %(url)s" % locals() - server = xmlrpcprotocol.server_proxy(url, keyfile, certfile) + server = SfaServerProxy(url, keyfile, certfile) return server @@ -98,7 +100,7 @@ def get_node_key(registry=None, verbose=False): cert.save_to_file(certfile) registry = server_proxy(url = registry, keyfile=keyfile, certfile=certfile) - registry.get_key() + registry.get_key_from_incoming_ip() def create_server_keypair(keyfile=None, certfile=None, hrn="component", verbose=False): """