Task SW-306: Commited fixes after initial prerelease tests for Dysco

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.
 

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

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__":

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'''