diff --git a/SAS/ResourceAssignment/Common/test/test_specification.py b/SAS/ResourceAssignment/Common/test/test_specification.py index 4b24a9c317502f42d57c12477f1aafab3957b3c1..d78da20042ee9f83122582f36204556f1959321b 100755 --- a/SAS/ResourceAssignment/Common/test/test_specification.py +++ b/SAS/ResourceAssignment/Common/test/test_specification.py @@ -42,7 +42,7 @@ class General(unittest.TestCase): self.radbrpc_mock = mock.MagicMock() self.logger_mock = mock.MagicMock() - self.specification = Specification(self.logger_mock, self.otdbrpc_mock, + self.specification = Specification(self.otdbrpc_mock, self.momrpc_mock, self.radbrpc_mock) # ---------------------------------------------------------------------------------------------- @@ -792,7 +792,7 @@ class UpdateStartEndTimesOnNonMoveableTasks(unittest.TestCase): self.radbrpc_mock = mock.MagicMock() self.logger_mock = mock.MagicMock() - self.specification = Specification(self.logger_mock, self.otdbrpc_mock, + self.specification = Specification(self.otdbrpc_mock, self.momrpc_mock, self.radbrpc_mock) def test_maintenance_tasks_raise_value_error_without_fixed_time(self): @@ -937,7 +937,7 @@ class UpdateStartEndTimesOnNonMoveableTasks(unittest.TestCase): self.radbrpc_mock = mock.MagicMock() self.logger_mock = mock.MagicMock() - self.specification = Specification(self.logger_mock, self.otdbrpc_mock, + self.specification = Specification(self.otdbrpc_mock, self.momrpc_mock, self.radbrpc_mock) @mock.patch("lofar.sas.resourceassignment.common.specification.datetime") @@ -1186,7 +1186,7 @@ class UpdateStartEndTimesOnNonMoveableTasks(unittest.TestCase): now = datetime.utcnow() datetime_mock.utcnow = mock.Mock(return_value = now) - predesessor = Specification(self.logger_mock, self.otdbrpc_mock, + predesessor = Specification(self.otdbrpc_mock, self.momrpc_mock, self.radbrpc_mock) predesessor.endtime = now + timedelta(minutes = 10) @@ -1212,7 +1212,7 @@ class CalculateDwellValues(unittest.TestCase): self.radbrpc_mock = mock.MagicMock() self.logger_mock = mock.MagicMock() - self.specification = Specification(self.logger_mock, self.otdbrpc_mock, + self.specification = Specification(self.otdbrpc_mock, self.momrpc_mock, self.radbrpc_mock) def test_raises_ValueError_on_missing_arguments(self): @@ -1350,7 +1350,7 @@ class ReadFromRadb(unittest.TestCase): self.radbrpc_mock = mock.MagicMock() self.logger_mock = mock.MagicMock() - self.specification = Specification(self.logger_mock, self.otdbrpc_mock, self.momrpc_mock, + self.specification = Specification(self.otdbrpc_mock, self.momrpc_mock, self.radbrpc_mock) def test_read_from_radb(self): diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_translator.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_translator.py index 4e5c23895d315da7a6a2c5a604e21d6292f95cb9..ee6d464dd1cc455408aac474d67ba84b26d2d1cf 100644 --- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_translator.py +++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_translator.py @@ -22,7 +22,7 @@ class RAtoOTDBPropagatorTest(unittest.TestCase): project_name = "myproject" storagemanager = "d.y.s.c.o." - mom_info = Specification(None, None, None, None) + mom_info = Specification(None, None, None) mom_info.storagemanager = storagemanager # trigger action: diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py b/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py index e8b6a8425cb6005ee56fd96f9d07d7d7930be47a..1caf7f74af2be7ed565115c62bd46e38b18b1d5e 100755 --- a/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py +++ b/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py @@ -142,7 +142,7 @@ class ResourceAssigner(object): logger.info(('do_assignment: otdb_id=%s specification_tree=%s' % (otdb_id, specification_tree))) - spec = Specification(logger, self.otdbrpc, self.momrpc, self.radbrpc) + spec = Specification(self.otdbrpc, self.momrpc, self.radbrpc) spec.from_dict(specification_tree) spec.insert_into_radb() # TODO Move this to TaskSpecified? diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py b/SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py index 0fff4356e6ebad5a5dfdca98aa7b142db553fe1a..a760cac6651880028c4a7b5f878848442473ac93 100644 --- a/SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py +++ b/SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py @@ -512,7 +512,7 @@ class PriorityScheduler(StationScheduler): # _send_task_status_notification in resourceassigner expects an object (of type Specification) # It seems easier to create a Specification than creating a custom object/class just for this # and adapting the resourceassigner code - spec = Specification(None, None, None, None) + spec = Specification(None, None, None) spec.radb_id = t["id"] spec.mom_id = t["mom_id"] spec.otdb_id = t["otdb_id"] diff --git a/SAS/ResourceAssignment/ResourceAssigner/test/t_resourceassigner.py b/SAS/ResourceAssignment/ResourceAssigner/test/t_resourceassigner.py index cb5a9f71938235391a624a1067bc1da7616eafbe..54ec83545d3d6f2ae92d74ac26654e640b4da801 100755 --- a/SAS/ResourceAssignment/ResourceAssigner/test/t_resourceassigner.py +++ b/SAS/ResourceAssignment/ResourceAssigner/test/t_resourceassigner.py @@ -2013,7 +2013,7 @@ class ResourceAssignerTest(unittest.TestCase): self.logger_mock.error.assert_any_call(exception_msg) def test_kill_task(self): - spec = Specification(None, None, None, None) # Easier than creating a custom object instance + spec = Specification(None, None, None) # Easier than creating a custom object instance spec.radb_id = 1 spec.mom_id = 2 spec.otdb_id = 3