diff --git a/QA/QA_Service/lib/qa_service.py b/QA/QA_Service/lib/qa_service.py index 321bcfd56b7751a9f5dc3220e9ba115ca93d3a53..c538ddba93e30a41a50f89746944517fdd7d9883 100644 --- a/QA/QA_Service/lib/qa_service.py +++ b/QA/QA_Service/lib/qa_service.py @@ -79,11 +79,11 @@ class QAFilteringTMSSSubTaskBusListener(TMSSSubTaskBusListener): def onSubTaskScheduled(self, subtask_id: int, old_state: str, new_state:str): with TMSSsession.create_from_dbcreds_for_ldap() as tmsssession: - tmsssession.set_tmss_subtask_status(subtask_id, 'queing') + tmsssession.set_subtask_status(subtask_id, 'queing') self._send_qa_command_message(subtask_id, DEFAULT_DO_QAFILE_CONVERSION_AND_PLOTS_SUBJECT) - tmsssession.set_tmss_subtask_status(subtask_id, 'queued') + tmsssession.set_subtask_status(subtask_id, 'queued') def __init__(self, exchange: str = DEFAULT_BUSNAME, broker: str = DEFAULT_BROKER): super().__init__(handler_type=QAFilteringTMSSSubTaskBusListener.QAFilteringTMSSSubTaskEventMessageHandler, @@ -172,14 +172,14 @@ class QAService: convert a MS or BeamFormed observation to a qa h5 file, and create plots. ''' if subtask_id: - self.tmsssession.set_tmss_subtask_status(subtask_id, 'starting') - self.tmsssession.set_tmss_subtask_status(subtask_id, 'started') + self.tmsssession.set_subtask_status(subtask_id, 'starting') + self.tmsssession.set_subtask_status(subtask_id, 'started') if self.do_qafile_conversion(otdb_id=otdb_id, subtask_id=subtask_id): self.do_qaplots(otdb_id=otdb_id, subtask_id=subtask_id) - self.tmsssession.set_tmss_subtask_status(subtask_id, 'finishing') - self.tmsssession.set_tmss_subtask_status(subtask_id, 'finished') + self.tmsssession.set_subtask_status(subtask_id, 'finishing') + self.tmsssession.set_subtask_status(subtask_id, 'finished') def do_qafile_conversion(self, otdb_id=None, subtask_id=None): ''' diff --git a/QA/QA_Service/test/t_qa_service.py b/QA/QA_Service/test/t_qa_service.py index 60c89054d1b28e288f04d70a8cd257a6a9e0ab69..618aa84f68632767606eefa3b24ae98e485bf295 100755 --- a/QA/QA_Service/test/t_qa_service.py +++ b/QA/QA_Service/test/t_qa_service.py @@ -551,7 +551,7 @@ class TestQAService(unittest.TestCase): # trigger a qa process by setting the tmss subtask to scheduled # this will result in the QAService actually doing its magic with self.tmss_test_env.create_tmss_client() as client: - client.set_tmss_subtask_status(self.TEST_TMSS_ID, 'scheduled') + client.set_subtask_status(self.TEST_TMSS_ID, 'scheduled') # start waiting until ConvertedMS2Hdf5 event message received (or timeout) qa_listener.converted_event.wait(30)