SW-811: adaptations to removed 'queue' parameter

QA/QA_Service/lib/QABusListener.py

@@ -92,7 +92,7 @@ class QABusListener(BusListener):
         if not issubclass(handler_type, QAEventMessageHandler):
             raise TypeError("handler_type should be a QAEventMessageHandler subclass")
 
-        super().__init__(handler_type, handler_kwargs, exchange, routing_key, None, num_threads, broker)
+        super().__init__(handler_type, handler_kwargs, exchange, routing_key, num_threads, broker)
 
 
 __all__ = ["QABusListener", "QAEventMessageHandler"]

SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py

@@ -91,7 +91,7 @@ class RABusListener(BusListener):
         RABusListener listens on the lofar notification message bus and calls (empty) on<SomeMessage> methods when such a message is received.
         Typical usage is to derive your own subclass from RABusListener and implement the specific on<SomeMessage> methods that you are interested in.
         """
-        super().__init__(handler_type, handler_kwargs, exchange, routing_key, None, num_threads, broker)
+        super().__init__(handler_type, handler_kwargs, exchange, routing_key, num_threads, broker)
 
 
 if __name__ == '__main__':

SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py

@@ -72,8 +72,8 @@ def calculateCobaltSettings(spec):
     constraints = BlockConstraints(corr, coherent, incoherent, clock)
     calculator = BlockSize(constraints)
 
-    return {'nrSubblocks': calculator.nrSubblocks, 'blockSize': calculator.blockSize,
-            'nrBlocks': calculator.nrBlocks, 'integrationTime': calculator.integrationTime}
+    return {'nrSubblocks': int(calculator.nrSubblocks), 'blockSize': int(calculator.blockSize),
+            'nrBlocks': int(calculator.nrBlocks), 'integrationTime': calculator.integrationTime}
 
 def cobaltOTDBsettings(cobalt_values):
     otdb_info = {}