Update to beat.backend.python v1.1.8 (InputGroup refactoring)

beat/core/execution.py

@@ -290,10 +290,9 @@ class Executor(object):
         # Synchronization bits
         group = self.input_list.group(details['channel'])
         if group is None:
-          group = inputs.RemoteInputGroup(
+          group = inputs.InputGroup(
                     details['channel'],
-                    restricted_access=(details['channel'] == self.data['channel']),
-                    socket=self.db_socket
+                    restricted_access=(details['channel'] == self.data['channel'])
                   )
           self.input_list.add(group)
 

beat/core/inputs.py

@@ -30,5 +30,4 @@ from beat.backend.python.inputs import InputList
 from beat.backend.python.inputs import Input
 from beat.backend.python.inputs import InputGroup
 from beat.backend.python.inputs import RemoteInput
-from beat.backend.python.inputs import RemoteInputGroup
 from beat.backend.python.inputs import RemoteException

beat/core/test/test_dbexecution.py

@@ -46,7 +46,7 @@ import zmq.green as zmq
 
 from ..dbexecution import DBExecutor
 from ..inputs import RemoteInput
-from ..inputs import RemoteInputGroup
+from ..inputs import InputGroup
 from ..database import Database
 
 from . import prefix
@@ -116,7 +116,7 @@ class HostSide(object):
     dataformat_name_b = database.set(input_b_conf['protocol'], input_b_conf['set'])['outputs']['b']
     self.input_b = RemoteInput('b', database.dataformats[dataformat_name_b], self.socket)
 
-    self.group = RemoteInputGroup('integers', False, self.socket)
+    self.group = InputGroup('integers', restricted_access=False)
     self.group.add(self.input_a)
     self.group.add(self.input_b)
 

beat/core/test/test_message_handler.py

@@ -48,7 +48,6 @@ import nose.tools
 from ..agent import MessageHandler
 from ..dataformat import DataFormat
 from ..inputs import RemoteInput
-from ..inputs import RemoteInputGroup
 from ..inputs import RemoteException
 from ..inputs import Input
 from ..inputs import InputGroup
@@ -114,7 +113,7 @@ class TestMessageHandler(unittest.TestCase):
     self.remote_input_a = RemoteInput('a', dataformat, client_socket)
     self.remote_input_b = RemoteInput('b', dataformat, client_socket)
 
-    self.remote_group = RemoteInputGroup('channel', False, client_socket)
+    self.remote_group = InputGroup('channel', restricted_access=False)
     self.remote_group.add(self.remote_input_a)
     self.remote_group.add(self.remote_input_b)
 
@@ -203,7 +202,7 @@ class TestMessageHandlerErrorHandling(unittest.TestCase):
 
     self.remote_input = RemoteInput('in', dataformat, client_socket)
 
-    self.remote_group = RemoteInputGroup('channel', False, client_socket)
+    self.remote_group = InputGroup('channel', restricted_access=False)
     self.remote_group.add(self.remote_input)
 
     self.remote_input_list = InputList()