X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fplcomponentdriver.py;h=5e74612746426767dace46c6d3a13a4f1263b553;hb=d40b9aa4b75edb62273b2d0705945342468d69d6;hp=c991bd6794583b8b918d781b2c458d3662bee1aa;hpb=89d0fa4efde57cb62445af75c16bdc42bc03693a;p=sfa.git diff --git a/sfa/plc/plcomponentdriver.py b/sfa/plc/plcomponentdriver.py index c991bd67..5e746127 100644 --- a/sfa/plc/plcomponentdriver.py +++ b/sfa/plc/plcomponentdriver.py @@ -1,7 +1,7 @@ import os import tempfile -import sfa.client.xmlrpcprotocol as xmlrpcprotocol +import sfa.client.sfaprotocol as sfaprotocol from sfa.plc.nodemanager import NodeManager from sfa.trust.credential import Credential @@ -33,7 +33,7 @@ class PlComponentDriver: addr, port = self.config.SFA_REGISTRY_HOST, self.config.SFA_REGISTRY_PORT url = "http://%(addr)s:%(port)s" % locals() ### xxx this would require access to the api... - server = xmlrpcprotocol.server_proxy(url, self.key_file, self.cert_file) + server = sfaprotocol.server_proxy(url, self.key_file, self.cert_file) return server def get_node_key(self): @@ -51,7 +51,7 @@ class PlComponentDriver: cert.save_to_file(certfile) registry = self.get_registry() # the registry will scp the key onto the node - registry.get_key() + registry.get_key_from_incoming_ip() # override the method in SfaApi def getCredential(self):