TMSS: make dataproduct file/dir names conform lofar naming standards

SAS/TMSS/src/tmss/tmssapp/populate.py

@@ -208,7 +208,9 @@ def _populate_example_data():
 
         subtask_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask))
         for sb_nr in specifications_doc['stations']['digital_pointings'][0]['subbands']:
-            models.Dataproduct.objects.create(**Dataproduct_test_data(producer=subtask_output, filename="test_dataproduct_SB_%03d.MS"%sb_nr))
+            models.Dataproduct.objects.create(**Dataproduct_test_data(producer=subtask_output,
+                                                                      directory="CEP4:/data/test-projects/L%d/uv/" % (subtask.id,),
+                                                                      filename="L%d_SB%03d_uv.MS"%(subtask.id, sb_nr)))
     except ImportError:
         pass
 

SAS/TMSS/test/tmss_test_data_django_models.py

@@ -281,7 +281,7 @@ def Subtask_test_data(task_blueprint: models.TaskBlueprint=None, subtask_templat
 
 def Dataproduct_test_data(producer: models.SubtaskOutput=None,
                           filename: str="my_file.ext",
-                          directory: str="head.cep4.control.lofar:/data/test-projects",
+                          directory: str="CEP4:/data/test-projects",
                           dataformat: models.Dataformat=None) -> dict:
     if producer is None:
         producer = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data())
@@ -292,13 +292,13 @@ def Dataproduct_test_data(producer: models.SubtaskOutput=None,
     return {"filename": filename,
             "directory": directory,
             "dataformat": dataformat,
-            "deleted_since": datetime.utcnow().isoformat(),
-            "pinned_since": datetime.utcnow().isoformat(),
+            "deleted_since": None,
+            "pinned_since": None,
             "specifications_doc": "{}",
             "specifications_template": models.DataproductSpecificationsTemplate.objects.create(**DataproductSpecificationsTemplate_test_data()),
             "tags": ["TMSS", "TESTING"],
             "producer": producer,
-            "do_cancel": datetime.utcnow().isoformat(),
+            "do_cancel": None,
             "expected_size": 1234,
             "size": 123,
             "feedback_doc": "{}",