Merge 6b443c4 into 11930b4

ICRAR · Mar 15, 2023 · b592918 · b592918
2 parents 11930b4 + 6b443c4
commit b592918
Show file tree

Hide file tree

Showing 44 changed files with 138 additions and 44 deletions.
diff --git a/OpenAPI/tests/test.graph b/OpenAPI/tests/test.graph
@@ -36,7 +36,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/testSingle.graph b/daliuge-engine/test/reproducibility/testSingle.graph
@@ -17,7 +17,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/computationSandwich.graph b/daliuge-engine/test/reproducibility/topoGraphs/computationSandwich.graph
@@ -36,7 +36,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/dataFan.graph b/daliuge-engine/test/reproducibility/topoGraphs/dataFan.graph
@@ -45,7 +45,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/dataFunnel.graph b/daliuge-engine/test/reproducibility/topoGraphs/dataFunnel.graph
@@ -45,7 +45,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph b/daliuge-engine/test/reproducibility/topoGraphs/dataSandwich.graph
@@ -36,7 +36,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testCycle.graph b/daliuge-engine/test/reproducibility/topoGraphs/testCycle.graph
@@ -54,7 +54,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testEmpty.graph b/daliuge-engine/test/reproducibility/topoGraphs/testEmpty.graph
@@ -17,7 +17,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": []
 }
diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testNotDAG.graph b/daliuge-engine/test/reproducibility/topoGraphs/testNotDAG.graph
@@ -45,7 +45,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testSingle.graph b/daliuge-engine/test/reproducibility/topoGraphs/testSingle.graph
@@ -17,7 +17,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testTwoEnd.graph b/daliuge-engine/test/reproducibility/topoGraphs/testTwoEnd.graph
@@ -36,7 +36,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testTwoLines.graph b/daliuge-engine/test/reproducibility/topoGraphs/testTwoLines.graph
@@ -36,7 +36,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-engine/test/reproducibility/topoGraphs/testTwoStart.graph b/daliuge-engine/test/reproducibility/topoGraphs/testTwoStart.graph
@@ -36,7 +36,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/dlg/dropmake/lg.graph.schema b/daliuge-translator/dlg/dropmake/lg.graph.schema
@@ -55,6 +55,12 @@
                 },
                 "signature": {
                     "type": "string"
+                },
+                "shortDescription": {
+                    "type": "string"
+                },
+                "detailedDescription": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -74,7 +80,9 @@
                 "commitHash",
                 "downloadUrl",
                 "repositoryUrl",
-                "signature"
+                "signature",
+                "shortDescription",
+                "detailedDescription"
             ]
         },
         "nodeDataArray": {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph b/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph
@@ -27,7 +27,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/Plasma-test.graph b/daliuge-translator/test/dropmake/logical_graphs/Plasma-test.graph
@@ -72,7 +72,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph b/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph
@@ -72,7 +72,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/SharedMemoryTest.graph b/daliuge-translator/test/dropmake/logical_graphs/SharedMemoryTest.graph
@@ -81,7 +81,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/chiles_simple.graph b/daliuge-translator/test/dropmake/logical_graphs/chiles_simple.graph
@@ -252,7 +252,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph b/daliuge-translator/test/dropmake/logical_graphs/cont_img.graph
@@ -405,7 +405,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather.graph
@@ -117,7 +117,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_empty.graph b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_empty.graph
@@ -90,7 +90,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_simple.graph b/daliuge-translator/test/dropmake/logical_graphs/eagle_gather_simple.graph
@@ -135,7 +135,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph b/daliuge-translator/test/dropmake/logical_graphs/lofar_std.graph
@@ -315,7 +315,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/nagsIo.graph b/daliuge-translator/test/dropmake/logical_graphs/nagsIo.graph
@@ -36,7 +36,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph b/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph
@@ -54,7 +54,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph b/daliuge-translator/test/dropmake/logical_graphs/test-20190830-110556.graph
@@ -27,7 +27,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/testLoop (1).graph b/daliuge-translator/test/dropmake/logical_graphs/testLoop (1).graph
@@ -17,7 +17,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/testLoop.graph b/daliuge-translator/test/dropmake/logical_graphs/testLoop.graph
@@ -39,7 +39,9 @@
         "repositoryUrl": "",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": "signature"
+        "signature": "signature",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/testScatter.graph b/daliuge-translator/test/dropmake/logical_graphs/testScatter.graph
@@ -27,7 +27,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph b/daliuge-translator/test/dropmake/logical_graphs/test_grpby_gather.graph
@@ -117,7 +117,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloSBash.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloSBash.graph
@@ -45,7 +45,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython.graph
@@ -45,7 +45,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython2.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloSPython2.graph
@@ -45,7 +45,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {

diff --git a/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBash.graph b/daliuge-translator/test/reproducibility/reproGraphs/HelloWorldBash.graph
@@ -45,7 +45,9 @@
         "repoService": "Unknown",
         "repositoryUrl": "",
         "schemaVersion": "OJS",
-        "signature": ""
+        "signature": "",
+        "shortDescription": "",
+        "detailedDescription": ""
     },
     "nodeDataArray": [
         {