Task #9640: SB should be SBG in output filenames of LB pipeline

SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py

@@ -79,9 +79,13 @@ class RAtoOTDBTranslator():
         else: ## It's a pipeline (no SAPs)
             if 'start_sb_nr' in storage_properties:
                 sb_nr = storage_properties['start_sb_nr']
+                filename_template = "L%d_SB%03d_uv.MS"
+            elif 'start_sbg_nr' in storage_properties: #Right now we're assuming this doesn't happen on raw data!
+                sb_nr = storage_properties['start_sbg_nr']
+                filename_template = "L%d_SBG%03d_uv.MS"
             for _ in xrange(storage_properties['nr_of_uv_files']):
                 locations.append(self.locationPath(project_name, otdb_id) + '/uv')
-                filenames.append("L%d_SB%03d_uv.MS" % (otdb_id, sb_nr))
+                filenames.append(filename_template % (otdb_id, sb_nr))
                 skip.append("0")
                 sb_nr += 1
         result[PREFIX + 'DataProducts.%s_Correlated.locations' % (io_type)] = '[' + to_csv_string(locations) + ']'

SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_resource_allocation_statics.sql

@@ -7,7 +7,7 @@ INSERT INTO resource_allocation.task_status VALUES (200, 'prepared'), (300, 'app
 (1150, 'error'), (1200, 'obsolete'); -- This is the list from OTDB, we'll need to merge it with the list from MoM in the future, might use different indexes?
 INSERT INTO resource_allocation.task_type VALUES (0, 'observation'),(1, 'pipeline'); -- We'll need more types
 INSERT INTO resource_allocation.resource_claim_status VALUES (0, 'claimed'), (1, 'allocated'), (2, 'conflict');
-INSERT INTO resource_allocation.resource_claim_property_type VALUES (0, 'nr_of_is_files'),(1, 'nr_of_cs_files'),(2, 'nr_of_uv_files'),(3, 'nr_of_im_files'),(4, 'nr_of_img_files'),(5, 'nr_of_pulp_files'),(6, 'nr_of_cs_stokes'),(7, 'nr_of_is_stokes'),(8, 'is_file_size'),(9, 'cs_file_size'),(10, 'uv_file_size'),(11, 'im_file_size'),(12, 'img_file_size'),(13, 'nr_of_pulp_files'),(14, 'nr_of_tabs'),(15, 'start_sb_nr'),(16,'uv_otdb_id'),(17,'cs_otdb_id'),(18,'is_otdb_id'),(19,'im_otdb_id'),(20,'img_otdb_id'),(21,'pulp_otdb_id'),(22, 'is_tab_nr');
+INSERT INTO resource_allocation.resource_claim_property_type VALUES (0, 'nr_of_is_files'),(1, 'nr_of_cs_files'),(2, 'nr_of_uv_files'),(3, 'nr_of_im_files'),(4, 'nr_of_img_files'),(5, 'nr_of_pulp_files'),(6, 'nr_of_cs_stokes'),(7, 'nr_of_is_stokes'),(8, 'is_file_size'),(9, 'cs_file_size'),(10, 'uv_file_size'),(11, 'im_file_size'),(12, 'img_file_size'),(13, 'nr_of_pulp_files'),(14, 'nr_of_tabs'),(15, 'start_sb_nr'),(16,'uv_otdb_id'),(17,'cs_otdb_id'),(18,'is_otdb_id'),(19,'im_otdb_id'),(20,'img_otdb_id'),(21,'pulp_otdb_id'),(22, 'is_tab_nr'),(23, 'start_sbg_nr');
 INSERT INTO resource_allocation.resource_claim_property_io_type VALUES (0, 'output'),(1, 'input');
 INSERT INTO resource_allocation.config VALUES (0, 'max_fill_percentage_cep4', '85.00'), (1, 'claim_timeout', '172800'), (2, 'min_inter_task_delay', '60'); -- Just some values 172800 is two days in seconds
 INSERT INTO resource_allocation.conflict_reason

SAS/XML_generator/src/xmlgen.py

@@ -29,7 +29,7 @@
 # URL            : $URL: https://svn.astron.nl/ROD/trunk/LOFAR_Scheduler/DataHandler.cpp $
 
 
-VERSION = "2.16.3"
+VERSION = "2.17.0"
     
 import sys, getopt, time
 from xml.sax.saxutils import escape as XMLescape