[lnst] nettestslave: Pass config to the RPC methods

[Jiří Pírko]

commit 3131bfe33c3535f3c2025ee0d7d7e0499f0cc4c9
Author: Radek Pazdera <rpazdera(a)redhat.com&gt;
Date:   Thu Nov 8 16:17:51 2012 +0100

    nettestslave: Pass config to the RPC methods
    
    Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com&gt;

 NetTest/NetTestSlave.py |    6 +++---
 nettestslave.py         |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/NetTest/NetTestSlave.py b/NetTest/NetTestSlave.py
index 7f0b035..2d15dfa 100644
--- a/NetTest/NetTestSlave.py
+++ b/NetTest/NetTestSlave.py
@@ -33,7 +33,7 @@ class NetTestSlaveXMLRPC:
     '''
     Exported xmlrpc methods
     '''
-    def __init__(self, command_context):
+    def __init__(self, command_context, config):
         self._netconfig = None
         self._packet_captures = {}
         self._netconfig = NetConfig()
@@ -225,7 +225,7 @@ class MySimpleXMLRPCServer(Server):
                 pass
 
 class NetTestSlave:
-    def __init__(self, port = DefaultRPCPort):
+    def __init__(self, config, port = DefaultRPCPort):
         die_when_parent_die()
 
         command_context = NetTestCommandContext()
@@ -235,7 +235,7 @@ class NetTestSlave:
         server.register_die_signal(signal.SIGHUP)
         server.register_die_signal(signal.SIGINT)
         server.register_die_signal(signal.SIGTERM)
-        server.register_instance(NetTestSlaveXMLRPC(command_context))
+        server.register_instance(NetTestSlaveXMLRPC(command_context, config))
         self._server = server
 
     def run(self):
diff --git a/nettestslave.py b/nettestslave.py
index c9cb0c9..6367d73 100755
--- a/nettestslave.py
+++ b/nettestslave.py
@@ -76,9 +76,10 @@ def main():
     logging.info("Started")
 
     if port:
-        nettestslave = NetTestSlave(port=port)
+        nettestslave = NetTestSlave(config, port=port)
     else:
-        nettestslave = NetTestSlave()
+        nettestslave = NetTestSlave(config)
+
     if daemon:
         daemon = Daemon(pidfile)
         daemon.daemonize()