diff --git a/SAS/ResourceAssignment/Common/lib/specification.py b/SAS/ResourceAssignment/Common/lib/specification.py index da8ed2655143532eca4b3475b48ddea6afe902c2..611a04a1062822f00afe15ebc34e91cadb281d7c 100644 --- a/SAS/ResourceAssignment/Common/lib/specification.py +++ b/SAS/ResourceAssignment/Common/lib/specification.py @@ -255,11 +255,11 @@ class Specification: storagemanager = self.momquery.get_storagemanager(self.mom_id) if storagemanager: self.storagemanager = storagemanager - self.logger.info("Found a task mom_id=%s with storagemanager=%s from MoM: %s", + self.logger.info("Found a task mom_id=%s with storagemanager=%s from MoM", self.mom_id, self.storagemanager) except KeyError as ke: # set default - self.logger.exception("read_storagemanager_from_mom: " + str(ke), exc_info=False) + # self.logger.exception("read_storagemanager_from_mom: " + str(ke), exc_info=False) self.logger.info("Storagemanager not found in MoM") # If the key exists in the VIC tree in OTDB, we use that instead if read_from_otdb has been called. diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py index dd83184f0620934c0637b5153778e5cdb659bbb8..9d2ed8ea5f44607abf7c12da211cfc5597f990bb 100755 --- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py +++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py @@ -512,6 +512,6 @@ class RAtoOTDBTranslator(): storagemanager = mom_info.storagemanager if storagemanager is not None: # should be "" or "dysco" logging.info("Adding storagemanager to parset: %s" % storagemanager) - parset[PREFIX+"ObservationControl.PythonControl.DPPP.storagemanager.name"] = storagemanager + parset[PREFIX+"ObservationControl.PythonControl.DPPP.msout.storagemanager.name"] = storagemanager return parset diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_translator.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_translator.py index c24f3cb7ffaed2af3c0426655c3e3b0bd0165db8..f71fc532fcba5f915d595d65c8035a807ccd4673 100644 --- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_translator.py +++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_translator.py @@ -29,7 +29,7 @@ class RAtoOTDBPropagatorTest(unittest.TestCase): value = RAtoOTDBTranslator().CreateParset(otdb_id, ra_info, project_name, mom_info) # assert: - self.assertEqual(value[PREFIX+"ObservationControl.PythonControl.DPPP.storagemanager.name"], storagemanager) + self.assertEqual(value[PREFIX+"ObservationControl.PythonControl.DPPP.msout.storagemanager.name"], storagemanager) if __name__ == "__main__": diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py b/SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py index bbeec2501294045f96587ce043fdb7ec67768db6..74bfd9330f42de6d85ab074670be2a4c4cceb39b 100644 --- a/SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py +++ b/SAS/ResourceAssignment/ResourceAssigner/lib/rabuslistener.py @@ -64,11 +64,18 @@ class RABusListener(AbstractBusListener): self.onTaskScheduled(msg.content) elif msg.subject == '%sTaskConflict' % self.subject_prefix: self.onTaskConflict(msg.content) + elif msg.subject == '%sTaskApproved' % self.subject_prefix: + self.onTaskApproved(msg.content) elif msg.subject == '%sTaskError' % self.subject_prefix: self.onTaskError(msg.content) else: logger.error("RABusListener.handleMessage: unknown subject: %s" %str(msg.subject)) + def onTaskApproved(self, task_ids): + '''onTaskApproved is called upon receiving a TaskApproved message. + :param task_ids: a dict containing radb_id, mom_id and otdb_id''' + pass + def onTaskScheduled(self, task_ids): '''onTaskScheduled is called upon receiving a TaskScheduled message. :param task_ids: a dict containing radb_id, mom_id and otdb_id'''