fix: Update Python test modules to new metric set schema.

pywr · Feb 12, 2024 · b17c5a7 · b17c5a7
1 parent 5251f47
commit b17c5a7
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 19 deletions.
diff --git a/pywr-python/tests/models/aggregated-node1/model.json b/pywr-python/tests/models/aggregated-node1/model.json
@@ -87,11 +87,26 @@
       {
         "name": "nodes",
         "metrics": [
-          "input1",
-          "link1",
-          "link2",
-          "output1",
-          "agg-node"
+          {
+            "type": "Default",
+            "node": "input1"
+          },
+          {
+            "type": "Default",
+            "node": "link1"
+          },
+          {
+            "type": "Default",
+            "node": "link2"
+          },
+          {
+            "type": "Default",
+            "node": "output1"
+          },
+          {
+            "type": "Default",
+            "node": "agg-node"
+          }
         ]
       }
     ],

diff --git a/pywr-python/tests/models/piecewise-link1/model.json b/pywr-python/tests/models/piecewise-link1/model.json
@@ -92,11 +92,26 @@
       {
         "name": "nodes",
         "metrics": [
-          "input1",
-          "link1",
-          "mrf1",
-          "demand1",
-          "term1"
+          {
+            "type": "Default",
+            "node": "input1"
+          },
+          {
+            "type": "Default",
+            "node": "link1"
+          },
+          {
+            "type": "Default",
+            "node": "mrf1"
+          },
+          {
+            "type": "Default",
+            "node": "demand1"
+          },
+          {
+            "type": "Default",
+            "node": "term1"
+          }
         ]
       }
     ],

diff --git a/pywr-python/tests/models/simple-custom-parameter/model.json b/pywr-python/tests/models/simple-custom-parameter/model.json
@@ -71,9 +71,18 @@
       {
         "name": "nodes",
         "metrics": [
-          "input1",
-          "link1",
-          "output1"
+          {
+            "type": "Default",
+            "node": "input1"
+          },
+          {
+            "type": "Default",
+            "node": "link1"
+          },
+          {
+            "type": "Default",
+            "node": "output1"
+          }
         ]
       }
     ],

diff --git a/pywr-python/tests/models/simple-storage-timeseries/model.json b/pywr-python/tests/models/simple-storage-timeseries/model.json
@@ -54,9 +54,18 @@
       {
         "name": "nodes",
         "metrics": [
-          "input1",
-          "storage1",
-          "output1"
+          {
+            "type": "Default",
+            "node": "input1"
+          },
+          {
+            "type": "Default",
+            "node": "storage1"
+          },
+          {
+            "type": "Default",
+            "node": "output1"
+          }
         ]
       }
     ],

diff --git a/pywr-python/tests/models/simple-timeseries/model.json b/pywr-python/tests/models/simple-timeseries/model.json
@@ -64,9 +64,18 @@
       {
         "name": "nodes",
         "metrics": [
-          "input1",
-          "link1",
-          "output1"
+          {
+            "type": "Default",
+            "node": "input1"
+          },
+          {
+            "type": "Default",
+            "node": "link1"
+          },
+          {
+            "type": "Default",
+            "node": "output1"
+          }
         ]
       }
     ],