Skip to content

Commit

Permalink
Fixing site tests
Browse files Browse the repository at this point in the history
  • Loading branch information
grafnu committed Jan 17, 2025
1 parent 641143f commit 82cfbcf
Show file tree
Hide file tree
Showing 22 changed files with 100 additions and 200 deletions.
12 changes: 4 additions & 8 deletions tests/sites/basic/devices/AHU-1/expected/metadata_norm.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "8923a228",
"hash": "8de5f742",
"cloud": {
"auth_type": "RS256"
},
"system": {
"tags": [ ],
"location": {
"site": "ZZ-TRI-FECTA-AHU",
"section": "2-3N8C",
Expand Down Expand Up @@ -73,21 +72,18 @@
"points": {
"filter_alarm_pressure_status": {
"units": "No-units",
"ref": "BV11.present_value",
"tags": [ ]
"ref": "BV11.present_value"
},
"filter_differential_pressure_sensor": {
"units": "Degrees-Celsius",
"baseline_value": 10,
"baseline_tolerance": 2.0,
"ref": "AV12.present_value",
"tags": [ ]
"ref": "AV12.present_value"
},
"filter_differential_pressure_setpoint": {
"units": "Bars",
"writable": true,
"baseline_value": 98,
"tags": [ ]
"baseline_value": 98
}
},
"sample_rate_sec": 30
Expand Down
12 changes: 4 additions & 8 deletions tests/sites/basic/devices/AHU-22/expected/metadata_norm.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "97b15442",
"hash": "3792824a",
"cloud": {
"num_id": "1234567890"
},
"system": {
"tags": [ ],
"location": {
"site": "ZZ-TRI-FECTA",
"section": "2-3N8C",
Expand Down Expand Up @@ -41,17 +40,14 @@
"points": {
"filter_alarm_pressure_status": {
"units": "No-units",
"ref": "BV11.present_value",
"tags": [ ]
"ref": "BV11.present_value"
},
"filter_differential_pressure": {
"units": "Bars",
"tags": [ ]
"units": "Bars"
},
"filter_differential_pressure_sensor": {
"units": "Degrees-Celsius",
"ref": "AV12.present_value",
"tags": [ ]
"ref": "AV12.present_value"
}
},
"sample_rate_sec": 30
Expand Down
6 changes: 2 additions & 4 deletions tests/sites/basic/devices/GAT-123/expected/metadata_norm.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "9ee6f853",
"hash": "73717715",
"cloud": {
"auth_type": "ES256"
},
"system": {
"tags": [ ],
"location": {
"site": "ZZ-TRI-FECTA",
"section": "2-3N8C"
Expand All @@ -33,8 +32,7 @@
"pointset": {
"points": {
"globulating_globar": {
"units": "Bars",
"tags": [ ]
"units": "Bars"
}
},
"sample_rate_sec": 30
Expand Down
6 changes: 2 additions & 4 deletions tests/sites/basic/devices/GAT-72/expected/metadata_norm.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "ea656b97",
"hash": "9c1a1e4b",
"cloud": {
"auth_type": "ES256"
},
"system": {
"tags": [ ],
"location": {
"site": "ZZ-TRI-FECTA",
"section": "2-3N8C"
Expand Down Expand Up @@ -41,8 +40,7 @@
"pointset": {
"points": {
"globulating_globar": {
"units": "Bars",
"tags": [ ]
"units": "Bars"
}
},
"sample_rate_sec": 30
Expand Down
9 changes: 3 additions & 6 deletions tests/sites/basic/devices/SNS-4/expected/metadata_norm.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "324ddfb4",
"hash": "539a2745",
"system": {
"tags": [ ],
"location": {
"site": "ZZ-TRI-FECTA",
"section": "2-3N8C"
Expand All @@ -23,12 +22,10 @@
"pointset": {
"points": {
"split_threshold": {
"units": "Imperial-gallons-per-minute",
"tags": [ ]
"units": "Imperial-gallons-per-minute"
},
"triangulating_axis": {
"units": "Degrees-phase",
"tags": [ ]
"units": "Degrees-phase"
}
},
"exclude_points_from_config": true,
Expand Down
3 changes: 1 addition & 2 deletions tests/sites/basic/devices/SNS-8/expected/metadata_norm.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "94aa3778",
"hash": "d1a93ccf",
"system": {
"tags": [ ],
"location": {
"site": "ZZ-TRI-FECTA",
"section": "2-3N8C"
Expand Down
12 changes: 4 additions & 8 deletions tests/sites/configs/devices/AHU-1/expected/metadata_norm.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "98c613cb",
"hash": "3d7471e7",
"cloud": {
"auth_type": "RS256",
"config": {
"static_file": "non-existant.file"
}
},
"system": {
"tags": [ ],
"location": {
"site": "ZZ-TRI-FECTA-AHU",
"section": "2-3N8C",
Expand Down Expand Up @@ -62,21 +61,18 @@
"points": {
"filter_alarm_pressure_status": {
"units": "No-units",
"ref": "BV11.present_value",
"tags": [ ]
"ref": "BV11.present_value"
},
"filter_differential_pressure_sensor": {
"units": "Degrees-Celsius",
"baseline_value": 10,
"baseline_tolerance": 2.0,
"ref": "FAXLE12.present_value",
"tags": [ ]
"ref": "FAXLE12.present_value"
},
"filter_differential_pressure_setpoint": {
"units": "Bars",
"writable": true,
"baseline_value": 98,
"tags": [ ]
"baseline_value": 98
}
}
}
Expand Down
12 changes: 4 additions & 8 deletions tests/sites/configs/devices/AHU-22/expected/metadata_norm.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "6dd4c2f3",
"hash": "cd0a2095",
"system": {
"tags": [ ],
"location": {
"section": "2-3N8C",
"position": {
Expand Down Expand Up @@ -38,18 +37,15 @@
"points": {
"filter_alarm_pressure_status": {
"units": "No-units",
"ref": "MCN8.present_value",
"tags": [ ]
"ref": "MCN8.present_value"
},
"filter_differential_pressure": {
"units": "Baré",
"ref": "AI2.differential",
"tags": [ ]
"ref": "AI2.differential"
},
"filter_differential_pressure_sensor": {
"units": "Degrees-Celsius",
"ref": "AI1.present_value",
"tags": [ ]
"ref": "AI1.present_value"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "0c4722f4",
"hash": "8dacda55",
"cloud": {
"auth_type": "ES256",
"config": {
"static_file": "config.json"
}
},
"system": {
"tags": [ ],
"location": {
"section": "2-3N8C"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "44590073",
"hash": "d1ab96a4",
"cloud": {
"auth_type": "ES256",
"config": {
"static_file": "notjson.txt"
}
},
"system": {
"tags": [ ],
"location": {
"section": "2-3N8C"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"timestamp": "2020-05-01T13:39:07Z",
"version": "1.5.2",
"hash": "0ec89412",
"hash": "a63589c4",
"cloud": {
"auth_type": "ES256"
},
"system": {
"tags": [ ],
"location": {
"site": "ZZ-TRI-FECTA",
"section": "2-3N8C"
Expand All @@ -24,8 +23,7 @@
"pointset": {
"points": {
"globulating_globar": {
"units": "Bars",
"tags": [ ]
"units": "Bars"
}
}
}
Expand Down
Loading

0 comments on commit 82cfbcf

Please sign in to comment.