From 94dea8b7806041d807094c07be99d7b19ccb6196 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Mon, 9 Sep 2019 16:44:01 +0200
Subject: [PATCH] SW-811: adaptations to removed 'queue' parameter
---
QA/QA_Service/lib/QABusListener.py | 2 +-
SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py | 2 +-
SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/QA/QA_Service/lib/QABusListener.py b/QA/QA_Service/lib/QABusListener.py
index a1c77127c18..0c8824514a8 100644
--- a/QA/QA_Service/lib/QABusListener.py
+++ b/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"]
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py b/SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py
index ec8c44fc287..8c06d5ffaec 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py
+++ b/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__':
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py b/SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py
index a5e6341fccb..a39e3075d20 100644
--- a/SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py
+++ b/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 = {}
--
GitLab