diff --git a/agent/system/rpcapi.py b/agent/system/rpcapi.py index 9c99e25..b321e35 100644 --- a/agent/system/rpcapi.py +++ b/agent/system/rpcapi.py @@ -24,7 +24,7 @@ $Id: rpcapi.py def setup(config): global xmlrpc - if config.transportserver.xmlrpc == 'testing': + if config.transport.remote.server == 'testing': from cybertools.agent.testing.rpcserver import RPCServer, xmlrpc else: from twisted.web import xmlrpc \ No newline at end of file diff --git a/agent/testing/main_transport.py b/agent/testing/main_transport.py index cd4e7a9..b2fdf4c 100644 --- a/agent/testing/main_transport.py +++ b/agent/testing/main_transport.py @@ -70,5 +70,5 @@ if __name__ == '__main__': master = setup() controller = master.controllers[0] controller.createAgent('transport.remote', 'sample03') - controller.enterJob('sample', 'sample03', params=dict(serverURL='', machineName='', method='', userName='', password='')) + controller.enterJob('sample', 'sample03', params=dict(resource='xxx')) startReactor() diff --git a/agent/transport/remote.py b/agent/transport/remote.py index b1fb974..14245f4 100644 --- a/agent/transport/remote.py +++ b/agent/transport/remote.py @@ -53,7 +53,7 @@ class Transporter(QueueableAgent): def __init__(self, master): super(Transporter, self).__init__(master) config = master.config - #self.serverURL = params[serverURL] + self.serverURL = config.transport.remote.url self.server = rpcapi.xmlrpc.Proxy(self.serverURL) #self.method = params[method] #self.machineName = params[machineName] diff --git a/agent/transport/transporter.txt b/agent/transport/transporter.txt index cb97568..5420dfa 100644 --- a/agent/transport/transporter.txt +++ b/agent/transport/transporter.txt @@ -8,7 +8,8 @@ Agents for Job Execution and Communication Tasks ... controller(names=['core.sample']) ... scheduler(name='core') ... logger(name='default', standard=30) - ... transportserver.xmlrpc = 'testing' + ... transport.remote.server = 'testing' + ... transport.remote.url = 'http://localhost:8123' ... ''' >>> from cybertools.agent.main import setup >>> master = setup(config)