Skip to content

Commit

Permalink
Restore functioning device_config_acked test (#748)
Browse files Browse the repository at this point in the history
  • Loading branch information
grafnu authored Nov 2, 2023
1 parent e03a75c commit 81f6060
Show file tree
Hide file tree
Showing 16 changed files with 165 additions and 83 deletions.
6 changes: 3 additions & 3 deletions .gencode_hash.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ d0f6ea11943f46c955891b3b49a25a9bffcf558fcabb9ed2b0f7667d8413953b gencode/docs/c
d2fe30200f9a1c530d144137a7774b5b97f268aae41185bfcb25de274d399250 gencode/docs/event_pointset.html
6849a96fe7608dc5ebda0dc9595dcea57757bc7c5253c30c30409469b6260498 gencode/docs/event_system.html
816481f69d3b1bdeb2224eaad6e3751a991d20eb98294d89f888b1323505209c gencode/docs/event_validation.html
0734afc2bddcaa7166c10e070ed6a4805127aa4c90e060915cdb48d5d79f618f gencode/docs/metadata.html
1a69cb42f856a150439455b9a38935ab4f51f5f646038feb3567f69ce2e0dcae gencode/docs/metadata.html
c4fa2845c5ad385a619ec97827370988c059567cb23c8da6894331fed89fefce gencode/docs/monitoring.html
180b32717db748e164a185b163ef9a97aa83d9d6add306283d5b9852d04af947 gencode/docs/persistent_device.html
5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d gencode/docs/properties.html
Expand All @@ -37,7 +37,7 @@ e28c3899bf2cb08cf456dbca29ccc3d4559c1d2145e252095689b171be82b4c6 gencode/java/u
2e7c0912c6f43b8dae9e9149b7361d3640bde4f01de6e13d8e487fe01be2c2c0 gencode/java/udmi/schema/Bucket.java
0a4f6bcd5065418c1cdc6c05b900b3de31744847d25b6ab6de7aabb1e724710e gencode/java/udmi/schema/BuildingTranslation.java
36a165d3c65ca02cd095606a27d7efa21f6d3b7134bb49771b315dcdfa7154b7 gencode/java/udmi/schema/Category.java
e15316a81d0acfc965e5517b9b49a7514f6dac024bebf8557e41f8abe0787023 gencode/java/udmi/schema/CloudModel.java
ebcd51b93ad48e616870976a56092e8bd065d11475237ee49c77782cb8221bc9 gencode/java/udmi/schema/CloudModel.java
a8bf763f1db77446d9e97154630b30ce4f92c13ea1c567102067dd132227ddd5 gencode/java/udmi/schema/Config.java
cf9762392e02b5d04c6498963222cc0c00f7be6c3cd82bde3d063a5eceba2b65 gencode/java/udmi/schema/Connections.java
8164e93ccc76d78548d456890e064df8427a09bbcd50686b37a10d3ff5ad429f gencode/java/udmi/schema/Credential.java
Expand Down Expand Up @@ -167,7 +167,7 @@ dd30f748b5321223933c272d58f5fa6dc319912737255170322f0df3244732a7 gencode/python
4361f48caba6a948a5916f67c8168215721cb3cc2384649f0336804785f01f1d gencode/python/udmi/schema/event_validation.py
633c85b0999d969310918bb03e9a40a08960f420b862340045a0290f8f5c4fe5 gencode/python/udmi/schema/event_validation_device.py
02e464aec10ae7f8cf10045f6107e069de4b852a24cd8fae6a4290a01c0d2ac8 gencode/python/udmi/schema/metadata.py
6e763776c8fc5b5a980b490873b1ee7613e15c5b1dee151278f7eb941e897901 gencode/python/udmi/schema/model_cloud.py
b40ad9a05ae0c8b317f5b5b12d2a805e8f4ebb327d19cffbb69a087919c0379a gencode/python/udmi/schema/model_cloud.py
805cc8dcb29732d1965bbd533b12d2bc4966d584f05b8a478dd2cac98fd99d52 gencode/python/udmi/schema/model_discovery.py
44d057dffcac3a994e7b894f8e1ebb643ba49d7dbfbb0bfea9cc04f97af0bc47 gencode/python/udmi/schema/model_discovery_family.py
bef91798566798ec70b2fe10ae52c909090de9095b92e2567da3cbdcec29cd2c gencode/python/udmi/schema/model_features.py
Expand Down
4 changes: 2 additions & 2 deletions bin/test_validator
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ fi
echo Pre-REDACTED output available in $TMP_VALIDATOR.raw
more $outfiles > $TMP_VALIDATOR.raw
sed -E < $TMP_VALIDATOR.raw >> $TMP_VALIDATOR \
-e 's/[0-9-]{10}T[0-9:]{8}Z/REDACTED_TIMESTAMP/' \
-e 's/threshold: [0-9]+/REDACTED_THRESHOLD/' \
-e 's/[0-9-]{10}T[0-9:.]+Z/REDACTED_TIMESTAMP/g' \
-e 's/ [0-9]+s / REDACTED_DURATION /g' \
-e 's/@[^)]+\)/REDACTED_ERROR/' \
-e 's/Validator.java:[0-9]+/REDACTED_FILE/' \
-e 's/\\t[a-zA-Z .()$0-9]+\.java:[0-9]+\)\\n/\\tREDACTED_STACK\\n/g'
Expand Down
1 change: 1 addition & 0 deletions etc/schema_itemized.out
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
=========== device_config_acked
=========== pointset_request_extraneous
=========== pointset_remove_point
=========== feature_enumeration
Expand Down
1 change: 1 addition & 0 deletions etc/test_itemized.out
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
TEST device_config_acked noConfigAck RESULT fail system device_config_acked BETA 5 timeout waiting for config acked
TEST pointset_request_extraneous extraPoint=llama RESULT fail pointset pointset_request_extraneous ALPHA 5 timeout waiting for pointset event contains correct points with present_value
TEST pointset_remove_point missingPoint=filter_alarm_pressure_status RESULT fail pointset pointset_remove_point ALPHA 5 timeout waiting for pointset state reports same points as defined in config
TEST pointset_remove_point noState RESULT fail pointset pointset_remove_point ALPHA 5 timeout waiting for no interesting system status
Expand Down
54 changes: 27 additions & 27 deletions etc/validator.out
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,14 @@ sites/udmi_site_model/out/devices/AHU-22/event_invalid.out
"sub_type" : "event",
"status" : {
"message" : "Multiple validation errors",
"detail" : "Timestamp jitter exceeds REDACTED_THRESHOLD; Unknown schema subFolder 'event_invalid' for AHU-22; While converting to json node: 1 schema violations found",
"detail" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold; Unknown schema subFolder 'event_invalid' for AHU-22; While converting to json node: 1 schema violations found",
"category" : "validation.device.multiple",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
},
"errors" : [ {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "event_invalid: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "event_invalid: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand All @@ -275,8 +275,8 @@ sites/udmi_site_model/out/devices/AHU-22/event_pointset.out
"sub_folder" : "pointset",
"sub_type" : "event",
"status" : {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "event_pointset: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "event_pointset: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand All @@ -286,8 +286,8 @@ sites/udmi_site_model/out/devices/AHU-22/event_pointset.out
"extra" : [ ]
},
"errors" : [ {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "event_pointset: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "event_pointset: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand All @@ -302,15 +302,15 @@ sites/udmi_site_model/out/devices/AHU-22/event_system.out
"sub_folder" : "system",
"sub_type" : "event",
"status" : {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "event_system: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "event_system: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
},
"errors" : [ {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "event_system: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "event_system: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand All @@ -325,15 +325,15 @@ sites/udmi_site_model/out/devices/AHU-22/state.out
"sub_folder" : "update",
"sub_type" : "state",
"status" : {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "state_update: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "state_update: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
},
"errors" : [ {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "state_update: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "state_update: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand Down Expand Up @@ -371,15 +371,15 @@ sites/udmi_site_model/out/devices/AHU-22/state_localnet.out
"sub_folder" : "localnet",
"sub_type" : "state",
"status" : {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "state_localnet: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "state_localnet: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
},
"errors" : [ {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "state_localnet: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "state_localnet: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand All @@ -394,8 +394,8 @@ sites/udmi_site_model/out/devices/AHU-22/state_pointset.out
"sub_folder" : "pointset",
"sub_type" : "state",
"status" : {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "state_pointset: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "state_pointset: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand All @@ -405,8 +405,8 @@ sites/udmi_site_model/out/devices/AHU-22/state_pointset.out
"extra" : [ ]
},
"errors" : [ {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "state_pointset: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "state_pointset: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand All @@ -421,15 +421,15 @@ sites/udmi_site_model/out/devices/AHU-22/state_system.out
"sub_folder" : "system",
"sub_type" : "state",
"status" : {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "state_system: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "state_system: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
},
"errors" : [ {
"message" : "Timestamp jitter exceeds REDACTED_THRESHOLD",
"detail" : "state_system: Timestamp jitter exceeds REDACTED_THRESHOLD REDACTED_ERROR",
"message" : "Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
"detail" : "state_system: Timestamp jitter REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
"category" : "validation.device.schema",
"timestamp" : "REDACTED_TIMESTAMP",
"level" : 500
Expand Down
40 changes: 40 additions & 0 deletions gencode/docs/metadata.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion gencode/java/udmi/schema/CloudModel.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 81f6060

Please sign in to comment.