Changed data_volume field to a ConstraintParameter

ICRAR · Aug 17, 2023 · a143999 · a143999
1 parent a55e5f8
commit a143999
Show file tree

Hide file tree

Showing 33 changed files with 110 additions and 135 deletions.
diff --git a/daliuge-engine/dlg/data/drops/data_base.py b/daliuge-engine/dlg/data/drops/data_base.py
@@ -60,7 +60,7 @@
 # @param category Data
 # @param tag template
 # @param dropclass my.awesome.data.Component/String/ComponentParameter/NoPort/ReadOnly//False/False/The python class that implements this data component
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param streaming False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component streams input and output data
 # @param persist False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component contains data that should not be deleted after execution
@@ -410,7 +410,7 @@ def path(self) -> str:
 # @param tag daliuge
 # @param dropclass dlg.data.drops.data_base.NullDROP/String/ComponentParameter/NoPort/ReadWrite//False/False/Drop class
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param dummy /Object/ApplicationArgument/InputOutput/ReadWrite//False/False/Dummy port
 # @par EAGLE_END
 class NullDROP(DataDROP):

diff --git a/daliuge-engine/dlg/data/drops/directorycontainer.py b/daliuge-engine/dlg/data/drops/directorycontainer.py
@@ -44,7 +44,7 @@
 # @param category Directory
 # @param tag future
 # @param dropclass dlg.data.drops.directorycontainer.DirectoryContainer/String/ComponentParameter/NoPort/ReadWrite//False/False/Drop class
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param check_exists True/Boolean/ApplicationArgument/NoPort/ReadWrite//False/False/Perform a check to make sure the file path exists before proceeding with the application
 # @param dirname /String/ApplicationArgument/NoPort/ReadWrite//False/False/"Directory name/path"

diff --git a/daliuge-engine/dlg/data/drops/file.py b/daliuge-engine/dlg/data/drops/file.py
@@ -44,7 +44,7 @@
 # @param dropclass dlg.data.drops.file.FileDROP/String/ComponentParameter/NoPort/ReadWrite//False/False/Drop class
 # @param streaming False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component streams input and output data
 # @param persist True/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component contains data that should not be deleted after execution
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param dummy /Object/ApplicationArgument/InputOutput/ReadWrite//False/False/Dummy port
 # @par EAGLE_END

diff --git a/daliuge-engine/dlg/data/drops/memory.py b/daliuge-engine/dlg/data/drops/memory.py
@@ -38,7 +38,7 @@
 # @param category Memory
 # @param tag daliuge
 # @param dropclass dlg.data.drops.memory.InMemoryDROP/String/ComponentParameter/NoPort/ReadWrite//False/False/Drop class
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param streaming False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component streams input and output data
 # @param persist False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component contains data that should not be deleted after execution
@@ -102,7 +102,7 @@ def generate_reproduce_data(self):
 # @param category SharedMemory
 # @param tag daliuge
 # @param dropclass dlg.data.drops.memory.SharedMemoryDROP/String/ComponentParameter/NoPort/ReadWrite//False/False/Drop class
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param streaming False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component streams input and output data
 # @param persist False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component contains data that should not be deleted after execution

diff --git a/daliuge-engine/dlg/data/drops/ngas.py b/daliuge-engine/dlg/data/drops/ngas.py
@@ -38,7 +38,7 @@
 # @param ngasMime "text/ascii"/String/ComponentParameter/NoPort/ReadWrite//False/False/Mime-type to be used for archiving
 # @param ngasTimeout 2/Integer/ComponentParameter/NoPort/ReadWrite//False/False/Timeout for receiving responses for NGAS
 # @param dropclass dlg.data.drops.ngas.NgasDROP/String/ComponentParameter/NoPort/ReadWrite//False/False/Drop class
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param streaming False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component streams input and output data
 # @param persist False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Specifies whether this data component contains data that should not be deleted after execution

diff --git a/daliuge-engine/dlg/data/drops/parset_drop.py b/daliuge-engine/dlg/data/drops/parset_drop.py
@@ -34,7 +34,7 @@
 # @par EAGLE_START
 # @param category ParameterSet
 # @param tag daliuge
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param mode "YANDA"/String/ComponentParameter/NoPort/ReadOnly//False/False/To what standard DALiuGE should filter and serialize the parameters.
 # @param config_data ""/String/ComponentParameter/NoPort/ReadWrite//False/False/Additional configuration information to be mixed in with the initial data

diff --git a/daliuge-engine/dlg/data/drops/plasma.py b/daliuge-engine/dlg/data/drops/plasma.py
@@ -39,7 +39,7 @@
 # @param plasma_path /String/ApplicationArgument/NoPort/ReadWrite//False/False/Path to the local plasma store
 # @param object_id /String/ApplicationArgument/NoPort/ReadWrite//False/False/PlasmaId of the object for all compute nodes
 # @param dropclass dlg.data.drops.plasma.PlasmaDROP/String/ComponentParameter/NoPort/ReadWrite//False/False/Drop class
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param use_staging False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Enables writing to a dynamically resizeable staging buffer
 # @param dummy /Object/ApplicationArgument/InputOutput/ReadWrite//False/False/Dummy port
@@ -90,7 +90,7 @@ def dataURL(self) -> str:
 # @param plasma_path /String/ApplicationArgument/NoPort/ReadWrite//False/False/Path to the local plasma store
 # @param object_id /String/ApplicationArgument/NoPort/ReadWrite//False/False/PlasmaId of the object for all compute nodes
 # @param dropclass dlg.data.drops.plasma.PlasmaFlightDROP/String/ComponentParameter/NoPort/ReadWrite//False/False/Drop class
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param flight_path /String/ComponentParameter/NoPort/ReadWrite//False/False/IP and flight port of the drop owner
 # @param dummy /Object/ApplicationArgument/InputOutput/ReadWrite//False/False/Dummy port

diff --git a/daliuge-engine/dlg/data/drops/rdbms.py b/daliuge-engine/dlg/data/drops/rdbms.py
@@ -35,7 +35,7 @@
 # @par EAGLE_START
 # @param category RDBMS
 # @param tag daliuge
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param dbmodule /String/ComponentParameter/NoPort/ReadWrite//False/False/Load path for python DB module
 # @param dbtable /String/ComponentParameter/NoPort/ReadWrite//False/False/The name of the table to use

diff --git a/daliuge-engine/dlg/data/drops/s3_drop.py b/daliuge-engine/dlg/data/drops/s3_drop.py
@@ -55,7 +55,7 @@
 # @par EAGLE_START
 # @param category S3
 # @param tag daliuge
-# @param data_volume 5/Float/ComponentParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
+# @param data_volume 5/Float/ConstraintParameter/NoPort/ReadWrite//False/False/Estimated size of the data contained in this node
 # @param group_end False/Boolean/ComponentParameter/NoPort/ReadWrite//False/False/Is this node the end of a group?
 # @param Bucket /String/ComponentParameter/NoPort/ReadWrite//False/False/The S3 Bucket
 # @param Key /String/ComponentParameter/NoPort/ReadWrite//False/False/The S3 object key

diff --git a/daliuge-engine/test/graphs/compilePG.graph b/daliuge-engine/test/graphs/compilePG.graph
@@ -113,7 +113,7 @@
                 "positional": false,
                 "keyAttribute": false,
                 "id": "8b0f89db-685a-4807-ad14-26e8a9cb552e",
-                "parameterType": "ComponentParameter",
+                "parameterType": "ConstraintParameter",
                 "usage": "NoPort"
             },
             "group_end": {

diff --git a/daliuge-translator/test/dropmake/logical_graphs/ArrayLoop.graph b/daliuge-translator/test/dropmake/logical_graphs/ArrayLoop.graph
@@ -149,7 +149,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,
@@ -554,7 +554,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,
@@ -730,7 +730,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,

diff --git a/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph b/daliuge-translator/test/dropmake/logical_graphs/HelloWorld_simple.graph
@@ -193,7 +193,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,

diff --git a/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph b/daliuge-translator/test/dropmake/logical_graphs/Plasma_test.graph
@@ -95,7 +95,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,
@@ -326,7 +326,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,
@@ -602,7 +602,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,

diff --git a/daliuge-translator/test/dropmake/logical_graphs/SharedMemoryTest.graph b/daliuge-translator/test/dropmake/logical_graphs/SharedMemoryTest.graph
@@ -213,7 +213,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,
@@ -679,7 +679,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,
@@ -758,7 +758,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,
@@ -837,7 +837,7 @@
                     "keyAttribute": false,
                     "name": "data_volume",
                     "options": [],
-                    "parameterType": "ComponentParameter",
+                    "parameterType": "ConstraintParameter",
                     "positional": false,
                     "precious": false,
                     "readonly": false,