From e9688c8ec347cdaf0edaf6c7edae23b7efb920b5 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Sat, 10 Dec 2022 14:46:31 -0800 Subject: [PATCH 1/7] Writeback changes --- .../config_pointset.attr | 0 .../config_pointset.json | 0 .../config_system.attr | 0 .../config_system.json | 0 .../config_update.attr | 0 .../config_update.json | 0 .../event_pointset.attr | 0 .../event_pointset.json | 0 .../event_system.attr | 0 .../event_system.json | 0 .../local_pointset.json | 0 .../local_system.json | 0 .../local_update.json | 0 .../sequence.md | 2 +- .../sequencer.log | 0 .../state_pointset.attr | 0 .../state_pointset.json | 0 .../state_system.attr | 0 .../state_system.json | 0 .../state_update.attr | 0 .../state_update.json | 0 .../system.log | 0 .../config_pointset.attr | 0 .../config_pointset.json | 0 .../config_system.attr | 0 .../config_system.json | 0 .../config_update.attr | 0 .../config_update.json | 0 .../event_pointset.attr | 0 .../event_pointset.json | 0 .../event_system.attr | 0 .../event_system.json | 0 .../local_pointset.json | 0 .../local_system.json | 0 .../local_update.json | 0 .../sequence.md | 2 +- .../sequencer.log | 0 .../state_pointset.attr | 0 .../state_pointset.json | 0 .../state_system.attr | 0 .../state_system.json | 0 .../state_update.attr | 0 .../state_update.json | 0 .../system.log | 0 .../config_pointset.attr | 0 .../config_pointset.json | 0 .../config_system.attr | 0 .../config_system.json | 0 .../config_update.attr | 0 .../config_update.json | 0 .../event_pointset.attr | 0 .../event_pointset.json | 0 .../event_system.attr | 0 .../event_system.json | 0 .../local_pointset.json | 0 .../local_system.json | 0 .../local_update.json | 0 .../sequence.md | 6 +- .../sequencer.log | 0 .../state_pointset.attr | 0 .../state_pointset.json | 0 .../state_system.attr | 0 .../state_system.json | 0 .../state_update.attr | 0 .../state_update.json | 0 .../system.log | 0 .../config_pointset.json | 15 - .../config_system.json | 10 - .../config_update.json | 25 - .../event_pointset.json | 15 - .../writeback_success_apply/event_system.json | 11 - .../writeback_success_apply/local_system.json | 8 - .../writeback_success_apply/local_update.json | 25 - .../writeback_success_apply/sequence.md | 6 - .../writeback_success_apply/sequencer.log | 767 ------------------ .../state_pointset.json | 11 - .../writeback_success_apply/state_system.json | 22 - .../writeback_success_apply/state_update.json | 33 - .../writeback_success_apply/system.log | 105 --- .../config_pointset.attr | 10 - .../config_system.attr | 10 - .../config_update.attr | 10 - .../event_pointset.attr | 10 - .../writeback_success_state/event_system.attr | 10 - .../local_pointset.json | 13 - .../state_pointset.attr | 10 - .../writeback_success_state/state_system.attr | 10 - .../writeback_success_state/state_update.attr | 10 - ...{PointSequencer.java => PointsetBase.java} | 10 +- .../sequences/WritebackSequences.java | 136 +--- 90 files changed, 56 insertions(+), 1246 deletions(-) rename validator/sequences/{writeback_failure_state => writeback_failure}/config_pointset.attr (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/config_pointset.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/config_system.attr (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/config_system.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/config_update.attr (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/config_update.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/event_pointset.attr (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/event_pointset.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/event_system.attr (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/event_system.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/local_pointset.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/local_system.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/local_update.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/sequence.md (92%) rename validator/sequences/{writeback_failure_state => writeback_failure}/sequencer.log (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/state_pointset.attr (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/state_pointset.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/state_system.attr (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/state_system.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/state_update.attr (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/state_update.json (100%) rename validator/sequences/{writeback_failure_state => writeback_failure}/system.log (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/config_pointset.attr (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/config_pointset.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/config_system.attr (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/config_system.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/config_update.attr (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/config_update.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/event_pointset.attr (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/event_pointset.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/event_system.attr (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/event_system.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/local_pointset.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/local_system.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/local_update.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/sequence.md (92%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/sequencer.log (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/state_pointset.attr (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/state_pointset.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/state_system.attr (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/state_system.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/state_update.attr (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/state_update.json (100%) rename validator/sequences/{writeback_invalid_state => writeback_invalid}/system.log (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/config_pointset.attr (100%) rename validator/sequences/{writeback_success_state => writeback_success}/config_pointset.json (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/config_system.attr (100%) rename validator/sequences/{writeback_success_state => writeback_success}/config_system.json (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/config_update.attr (100%) rename validator/sequences/{writeback_success_state => writeback_success}/config_update.json (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/event_pointset.attr (100%) rename validator/sequences/{writeback_success_state => writeback_success}/event_pointset.json (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/event_system.attr (100%) rename validator/sequences/{writeback_success_state => writeback_success}/event_system.json (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/local_pointset.json (100%) rename validator/sequences/{writeback_success_state => writeback_success}/local_system.json (100%) rename validator/sequences/{writeback_success_state => writeback_success}/local_update.json (100%) rename validator/sequences/{writeback_success_state => writeback_success}/sequence.md (58%) rename validator/sequences/{writeback_success_state => writeback_success}/sequencer.log (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/state_pointset.attr (100%) rename validator/sequences/{writeback_success_state => writeback_success}/state_pointset.json (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/state_system.attr (100%) rename validator/sequences/{writeback_success_state => writeback_success}/state_system.json (100%) rename validator/sequences/{writeback_success_apply => writeback_success}/state_update.attr (100%) rename validator/sequences/{writeback_success_state => writeback_success}/state_update.json (100%) rename validator/sequences/{writeback_success_state => writeback_success}/system.log (100%) delete mode 100644 validator/sequences/writeback_success_apply/config_pointset.json delete mode 100644 validator/sequences/writeback_success_apply/config_system.json delete mode 100644 validator/sequences/writeback_success_apply/config_update.json delete mode 100644 validator/sequences/writeback_success_apply/event_pointset.json delete mode 100644 validator/sequences/writeback_success_apply/event_system.json delete mode 100644 validator/sequences/writeback_success_apply/local_system.json delete mode 100644 validator/sequences/writeback_success_apply/local_update.json delete mode 100644 validator/sequences/writeback_success_apply/sequence.md delete mode 100644 validator/sequences/writeback_success_apply/sequencer.log delete mode 100644 validator/sequences/writeback_success_apply/state_pointset.json delete mode 100644 validator/sequences/writeback_success_apply/state_system.json delete mode 100644 validator/sequences/writeback_success_apply/state_update.json delete mode 100644 validator/sequences/writeback_success_apply/system.log delete mode 100644 validator/sequences/writeback_success_state/config_pointset.attr delete mode 100644 validator/sequences/writeback_success_state/config_system.attr delete mode 100644 validator/sequences/writeback_success_state/config_update.attr delete mode 100644 validator/sequences/writeback_success_state/event_pointset.attr delete mode 100644 validator/sequences/writeback_success_state/event_system.attr delete mode 100644 validator/sequences/writeback_success_state/local_pointset.json delete mode 100644 validator/sequences/writeback_success_state/state_pointset.attr delete mode 100644 validator/sequences/writeback_success_state/state_system.attr delete mode 100644 validator/sequences/writeback_success_state/state_update.attr rename validator/src/main/java/com/google/daq/mqtt/sequencer/{PointSequencer.java => PointsetBase.java} (88%) diff --git a/validator/sequences/writeback_failure_state/config_pointset.attr b/validator/sequences/writeback_failure/config_pointset.attr similarity index 100% rename from validator/sequences/writeback_failure_state/config_pointset.attr rename to validator/sequences/writeback_failure/config_pointset.attr diff --git a/validator/sequences/writeback_failure_state/config_pointset.json b/validator/sequences/writeback_failure/config_pointset.json similarity index 100% rename from validator/sequences/writeback_failure_state/config_pointset.json rename to validator/sequences/writeback_failure/config_pointset.json diff --git a/validator/sequences/writeback_failure_state/config_system.attr b/validator/sequences/writeback_failure/config_system.attr similarity index 100% rename from validator/sequences/writeback_failure_state/config_system.attr rename to validator/sequences/writeback_failure/config_system.attr diff --git a/validator/sequences/writeback_failure_state/config_system.json b/validator/sequences/writeback_failure/config_system.json similarity index 100% rename from validator/sequences/writeback_failure_state/config_system.json rename to validator/sequences/writeback_failure/config_system.json diff --git a/validator/sequences/writeback_failure_state/config_update.attr b/validator/sequences/writeback_failure/config_update.attr similarity index 100% rename from validator/sequences/writeback_failure_state/config_update.attr rename to validator/sequences/writeback_failure/config_update.attr diff --git a/validator/sequences/writeback_failure_state/config_update.json b/validator/sequences/writeback_failure/config_update.json similarity index 100% rename from validator/sequences/writeback_failure_state/config_update.json rename to validator/sequences/writeback_failure/config_update.json diff --git a/validator/sequences/writeback_failure_state/event_pointset.attr b/validator/sequences/writeback_failure/event_pointset.attr similarity index 100% rename from validator/sequences/writeback_failure_state/event_pointset.attr rename to validator/sequences/writeback_failure/event_pointset.attr diff --git a/validator/sequences/writeback_failure_state/event_pointset.json b/validator/sequences/writeback_failure/event_pointset.json similarity index 100% rename from validator/sequences/writeback_failure_state/event_pointset.json rename to validator/sequences/writeback_failure/event_pointset.json diff --git a/validator/sequences/writeback_failure_state/event_system.attr b/validator/sequences/writeback_failure/event_system.attr similarity index 100% rename from validator/sequences/writeback_failure_state/event_system.attr rename to validator/sequences/writeback_failure/event_system.attr diff --git a/validator/sequences/writeback_failure_state/event_system.json b/validator/sequences/writeback_failure/event_system.json similarity index 100% rename from validator/sequences/writeback_failure_state/event_system.json rename to validator/sequences/writeback_failure/event_system.json diff --git a/validator/sequences/writeback_failure_state/local_pointset.json b/validator/sequences/writeback_failure/local_pointset.json similarity index 100% rename from validator/sequences/writeback_failure_state/local_pointset.json rename to validator/sequences/writeback_failure/local_pointset.json diff --git a/validator/sequences/writeback_failure_state/local_system.json b/validator/sequences/writeback_failure/local_system.json similarity index 100% rename from validator/sequences/writeback_failure_state/local_system.json rename to validator/sequences/writeback_failure/local_system.json diff --git a/validator/sequences/writeback_failure_state/local_update.json b/validator/sequences/writeback_failure/local_update.json similarity index 100% rename from validator/sequences/writeback_failure_state/local_update.json rename to validator/sequences/writeback_failure/local_update.json diff --git a/validator/sequences/writeback_failure_state/sequence.md b/validator/sequences/writeback_failure/sequence.md similarity index 92% rename from validator/sequences/writeback_failure_state/sequence.md rename to validator/sequences/writeback_failure/sequence.md index a9f32f3f7e..b244f3a15b 100644 --- a/validator/sequences/writeback_failure_state/sequence.md +++ b/validator/sequences/writeback_failure/sequence.md @@ -1,5 +1,5 @@ -## writeback_failure_state +## writeback_failure 1. Wait for point filter_alarm_pressure_status to have value_state default (null) 1. Update config before point filter_alarm_pressure_status to have value_state failure: diff --git a/validator/sequences/writeback_failure_state/sequencer.log b/validator/sequences/writeback_failure/sequencer.log similarity index 100% rename from validator/sequences/writeback_failure_state/sequencer.log rename to validator/sequences/writeback_failure/sequencer.log diff --git a/validator/sequences/writeback_failure_state/state_pointset.attr b/validator/sequences/writeback_failure/state_pointset.attr similarity index 100% rename from validator/sequences/writeback_failure_state/state_pointset.attr rename to validator/sequences/writeback_failure/state_pointset.attr diff --git a/validator/sequences/writeback_failure_state/state_pointset.json b/validator/sequences/writeback_failure/state_pointset.json similarity index 100% rename from validator/sequences/writeback_failure_state/state_pointset.json rename to validator/sequences/writeback_failure/state_pointset.json diff --git a/validator/sequences/writeback_failure_state/state_system.attr b/validator/sequences/writeback_failure/state_system.attr similarity index 100% rename from validator/sequences/writeback_failure_state/state_system.attr rename to validator/sequences/writeback_failure/state_system.attr diff --git a/validator/sequences/writeback_failure_state/state_system.json b/validator/sequences/writeback_failure/state_system.json similarity index 100% rename from validator/sequences/writeback_failure_state/state_system.json rename to validator/sequences/writeback_failure/state_system.json diff --git a/validator/sequences/writeback_failure_state/state_update.attr b/validator/sequences/writeback_failure/state_update.attr similarity index 100% rename from validator/sequences/writeback_failure_state/state_update.attr rename to validator/sequences/writeback_failure/state_update.attr diff --git a/validator/sequences/writeback_failure_state/state_update.json b/validator/sequences/writeback_failure/state_update.json similarity index 100% rename from validator/sequences/writeback_failure_state/state_update.json rename to validator/sequences/writeback_failure/state_update.json diff --git a/validator/sequences/writeback_failure_state/system.log b/validator/sequences/writeback_failure/system.log similarity index 100% rename from validator/sequences/writeback_failure_state/system.log rename to validator/sequences/writeback_failure/system.log diff --git a/validator/sequences/writeback_invalid_state/config_pointset.attr b/validator/sequences/writeback_invalid/config_pointset.attr similarity index 100% rename from validator/sequences/writeback_invalid_state/config_pointset.attr rename to validator/sequences/writeback_invalid/config_pointset.attr diff --git a/validator/sequences/writeback_invalid_state/config_pointset.json b/validator/sequences/writeback_invalid/config_pointset.json similarity index 100% rename from validator/sequences/writeback_invalid_state/config_pointset.json rename to validator/sequences/writeback_invalid/config_pointset.json diff --git a/validator/sequences/writeback_invalid_state/config_system.attr b/validator/sequences/writeback_invalid/config_system.attr similarity index 100% rename from validator/sequences/writeback_invalid_state/config_system.attr rename to validator/sequences/writeback_invalid/config_system.attr diff --git a/validator/sequences/writeback_invalid_state/config_system.json b/validator/sequences/writeback_invalid/config_system.json similarity index 100% rename from validator/sequences/writeback_invalid_state/config_system.json rename to validator/sequences/writeback_invalid/config_system.json diff --git a/validator/sequences/writeback_invalid_state/config_update.attr b/validator/sequences/writeback_invalid/config_update.attr similarity index 100% rename from validator/sequences/writeback_invalid_state/config_update.attr rename to validator/sequences/writeback_invalid/config_update.attr diff --git a/validator/sequences/writeback_invalid_state/config_update.json b/validator/sequences/writeback_invalid/config_update.json similarity index 100% rename from validator/sequences/writeback_invalid_state/config_update.json rename to validator/sequences/writeback_invalid/config_update.json diff --git a/validator/sequences/writeback_invalid_state/event_pointset.attr b/validator/sequences/writeback_invalid/event_pointset.attr similarity index 100% rename from validator/sequences/writeback_invalid_state/event_pointset.attr rename to validator/sequences/writeback_invalid/event_pointset.attr diff --git a/validator/sequences/writeback_invalid_state/event_pointset.json b/validator/sequences/writeback_invalid/event_pointset.json similarity index 100% rename from validator/sequences/writeback_invalid_state/event_pointset.json rename to validator/sequences/writeback_invalid/event_pointset.json diff --git a/validator/sequences/writeback_invalid_state/event_system.attr b/validator/sequences/writeback_invalid/event_system.attr similarity index 100% rename from validator/sequences/writeback_invalid_state/event_system.attr rename to validator/sequences/writeback_invalid/event_system.attr diff --git a/validator/sequences/writeback_invalid_state/event_system.json b/validator/sequences/writeback_invalid/event_system.json similarity index 100% rename from validator/sequences/writeback_invalid_state/event_system.json rename to validator/sequences/writeback_invalid/event_system.json diff --git a/validator/sequences/writeback_invalid_state/local_pointset.json b/validator/sequences/writeback_invalid/local_pointset.json similarity index 100% rename from validator/sequences/writeback_invalid_state/local_pointset.json rename to validator/sequences/writeback_invalid/local_pointset.json diff --git a/validator/sequences/writeback_invalid_state/local_system.json b/validator/sequences/writeback_invalid/local_system.json similarity index 100% rename from validator/sequences/writeback_invalid_state/local_system.json rename to validator/sequences/writeback_invalid/local_system.json diff --git a/validator/sequences/writeback_invalid_state/local_update.json b/validator/sequences/writeback_invalid/local_update.json similarity index 100% rename from validator/sequences/writeback_invalid_state/local_update.json rename to validator/sequences/writeback_invalid/local_update.json diff --git a/validator/sequences/writeback_invalid_state/sequence.md b/validator/sequences/writeback_invalid/sequence.md similarity index 92% rename from validator/sequences/writeback_invalid_state/sequence.md rename to validator/sequences/writeback_invalid/sequence.md index a1e4b01cc3..d9ebcfe8cc 100644 --- a/validator/sequences/writeback_invalid_state/sequence.md +++ b/validator/sequences/writeback_invalid/sequence.md @@ -1,5 +1,5 @@ -## writeback_invalid_state +## writeback_invalid 1. Wait for point filter_differential_pressure_sensor to have value_state default (null) 1. Update config before point filter_differential_pressure_sensor to have value_state invalid: diff --git a/validator/sequences/writeback_invalid_state/sequencer.log b/validator/sequences/writeback_invalid/sequencer.log similarity index 100% rename from validator/sequences/writeback_invalid_state/sequencer.log rename to validator/sequences/writeback_invalid/sequencer.log diff --git a/validator/sequences/writeback_invalid_state/state_pointset.attr b/validator/sequences/writeback_invalid/state_pointset.attr similarity index 100% rename from validator/sequences/writeback_invalid_state/state_pointset.attr rename to validator/sequences/writeback_invalid/state_pointset.attr diff --git a/validator/sequences/writeback_invalid_state/state_pointset.json b/validator/sequences/writeback_invalid/state_pointset.json similarity index 100% rename from validator/sequences/writeback_invalid_state/state_pointset.json rename to validator/sequences/writeback_invalid/state_pointset.json diff --git a/validator/sequences/writeback_invalid_state/state_system.attr b/validator/sequences/writeback_invalid/state_system.attr similarity index 100% rename from validator/sequences/writeback_invalid_state/state_system.attr rename to validator/sequences/writeback_invalid/state_system.attr diff --git a/validator/sequences/writeback_invalid_state/state_system.json b/validator/sequences/writeback_invalid/state_system.json similarity index 100% rename from validator/sequences/writeback_invalid_state/state_system.json rename to validator/sequences/writeback_invalid/state_system.json diff --git a/validator/sequences/writeback_invalid_state/state_update.attr b/validator/sequences/writeback_invalid/state_update.attr similarity index 100% rename from validator/sequences/writeback_invalid_state/state_update.attr rename to validator/sequences/writeback_invalid/state_update.attr diff --git a/validator/sequences/writeback_invalid_state/state_update.json b/validator/sequences/writeback_invalid/state_update.json similarity index 100% rename from validator/sequences/writeback_invalid_state/state_update.json rename to validator/sequences/writeback_invalid/state_update.json diff --git a/validator/sequences/writeback_invalid_state/system.log b/validator/sequences/writeback_invalid/system.log similarity index 100% rename from validator/sequences/writeback_invalid_state/system.log rename to validator/sequences/writeback_invalid/system.log diff --git a/validator/sequences/writeback_success_apply/config_pointset.attr b/validator/sequences/writeback_success/config_pointset.attr similarity index 100% rename from validator/sequences/writeback_success_apply/config_pointset.attr rename to validator/sequences/writeback_success/config_pointset.attr diff --git a/validator/sequences/writeback_success_state/config_pointset.json b/validator/sequences/writeback_success/config_pointset.json similarity index 100% rename from validator/sequences/writeback_success_state/config_pointset.json rename to validator/sequences/writeback_success/config_pointset.json diff --git a/validator/sequences/writeback_success_apply/config_system.attr b/validator/sequences/writeback_success/config_system.attr similarity index 100% rename from validator/sequences/writeback_success_apply/config_system.attr rename to validator/sequences/writeback_success/config_system.attr diff --git a/validator/sequences/writeback_success_state/config_system.json b/validator/sequences/writeback_success/config_system.json similarity index 100% rename from validator/sequences/writeback_success_state/config_system.json rename to validator/sequences/writeback_success/config_system.json diff --git a/validator/sequences/writeback_success_apply/config_update.attr b/validator/sequences/writeback_success/config_update.attr similarity index 100% rename from validator/sequences/writeback_success_apply/config_update.attr rename to validator/sequences/writeback_success/config_update.attr diff --git a/validator/sequences/writeback_success_state/config_update.json b/validator/sequences/writeback_success/config_update.json similarity index 100% rename from validator/sequences/writeback_success_state/config_update.json rename to validator/sequences/writeback_success/config_update.json diff --git a/validator/sequences/writeback_success_apply/event_pointset.attr b/validator/sequences/writeback_success/event_pointset.attr similarity index 100% rename from validator/sequences/writeback_success_apply/event_pointset.attr rename to validator/sequences/writeback_success/event_pointset.attr diff --git a/validator/sequences/writeback_success_state/event_pointset.json b/validator/sequences/writeback_success/event_pointset.json similarity index 100% rename from validator/sequences/writeback_success_state/event_pointset.json rename to validator/sequences/writeback_success/event_pointset.json diff --git a/validator/sequences/writeback_success_apply/event_system.attr b/validator/sequences/writeback_success/event_system.attr similarity index 100% rename from validator/sequences/writeback_success_apply/event_system.attr rename to validator/sequences/writeback_success/event_system.attr diff --git a/validator/sequences/writeback_success_state/event_system.json b/validator/sequences/writeback_success/event_system.json similarity index 100% rename from validator/sequences/writeback_success_state/event_system.json rename to validator/sequences/writeback_success/event_system.json diff --git a/validator/sequences/writeback_success_apply/local_pointset.json b/validator/sequences/writeback_success/local_pointset.json similarity index 100% rename from validator/sequences/writeback_success_apply/local_pointset.json rename to validator/sequences/writeback_success/local_pointset.json diff --git a/validator/sequences/writeback_success_state/local_system.json b/validator/sequences/writeback_success/local_system.json similarity index 100% rename from validator/sequences/writeback_success_state/local_system.json rename to validator/sequences/writeback_success/local_system.json diff --git a/validator/sequences/writeback_success_state/local_update.json b/validator/sequences/writeback_success/local_update.json similarity index 100% rename from validator/sequences/writeback_success_state/local_update.json rename to validator/sequences/writeback_success/local_update.json diff --git a/validator/sequences/writeback_success_state/sequence.md b/validator/sequences/writeback_success/sequence.md similarity index 58% rename from validator/sequences/writeback_success_state/sequence.md rename to validator/sequences/writeback_success/sequence.md index a1728cc714..dc3e8bdcc0 100644 --- a/validator/sequences/writeback_success_state/sequence.md +++ b/validator/sequences/writeback_success/sequence.md @@ -1,8 +1,10 @@ -## writeback_success_state +## writeback_success +1. Update config before point filter_differential_pressure_setpoint to have value_state default (null): + * Remove `pointset.points.filter_differential_pressure_setpoint.set_value` 1. Wait for point filter_differential_pressure_setpoint to have value_state default (null) 1. Update config before point filter_differential_pressure_setpoint to have value_state applied: - * Set `pointset.points.filter_differential_pressure_setpoint.set_value` = `60` + * Add `pointset.points.filter_differential_pressure_setpoint.set_value` = `60` 1. Wait for point filter_differential_pressure_setpoint to have value_state applied 1. Wait for point `filter_differential_pressure_setpoint` to have present_value `60` diff --git a/validator/sequences/writeback_success_state/sequencer.log b/validator/sequences/writeback_success/sequencer.log similarity index 100% rename from validator/sequences/writeback_success_state/sequencer.log rename to validator/sequences/writeback_success/sequencer.log diff --git a/validator/sequences/writeback_success_apply/state_pointset.attr b/validator/sequences/writeback_success/state_pointset.attr similarity index 100% rename from validator/sequences/writeback_success_apply/state_pointset.attr rename to validator/sequences/writeback_success/state_pointset.attr diff --git a/validator/sequences/writeback_success_state/state_pointset.json b/validator/sequences/writeback_success/state_pointset.json similarity index 100% rename from validator/sequences/writeback_success_state/state_pointset.json rename to validator/sequences/writeback_success/state_pointset.json diff --git a/validator/sequences/writeback_success_apply/state_system.attr b/validator/sequences/writeback_success/state_system.attr similarity index 100% rename from validator/sequences/writeback_success_apply/state_system.attr rename to validator/sequences/writeback_success/state_system.attr diff --git a/validator/sequences/writeback_success_state/state_system.json b/validator/sequences/writeback_success/state_system.json similarity index 100% rename from validator/sequences/writeback_success_state/state_system.json rename to validator/sequences/writeback_success/state_system.json diff --git a/validator/sequences/writeback_success_apply/state_update.attr b/validator/sequences/writeback_success/state_update.attr similarity index 100% rename from validator/sequences/writeback_success_apply/state_update.attr rename to validator/sequences/writeback_success/state_update.attr diff --git a/validator/sequences/writeback_success_state/state_update.json b/validator/sequences/writeback_success/state_update.json similarity index 100% rename from validator/sequences/writeback_success_state/state_update.json rename to validator/sequences/writeback_success/state_update.json diff --git a/validator/sequences/writeback_success_state/system.log b/validator/sequences/writeback_success/system.log similarity index 100% rename from validator/sequences/writeback_success_state/system.log rename to validator/sequences/writeback_success/system.log diff --git a/validator/sequences/writeback_success_apply/config_pointset.json b/validator/sequences/writeback_success_apply/config_pointset.json deleted file mode 100644 index 277bef74de..0000000000 --- a/validator/sequences/writeback_success_apply/config_pointset.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "points" : { - "filter_alarm_pressure_status" : { - "ref" : "BV11.present_value" - }, - "filter_differential_pressure_setpoint" : { - "set_value" : 60 - }, - "filter_differential_pressure_sensor" : { - "ref" : "AV12.present_value" - } - }, - "timestamp" : "2022-11-07T17:42:21.434Z", - "version" : "1.3.14-93-g714f5f4-dirty" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/config_system.json b/validator/sequences/writeback_success_apply/config_system.json deleted file mode 100644 index 2b132d4c13..0000000000 --- a/validator/sequences/writeback_success_apply/config_system.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "last_start" : "2022-11-07T17:40:18Z", - "metrics_rate_sec" : 600, - "min_loglevel" : 200, - "testing" : { - "sequence_name" : "writeback_success_apply" - }, - "timestamp" : "2022-11-07T17:42:19.612Z", - "version" : "1.3.14-93-g714f5f4-dirty" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/config_update.json b/validator/sequences/writeback_success_apply/config_update.json deleted file mode 100644 index a67ab2246c..0000000000 --- a/validator/sequences/writeback_success_apply/config_update.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { - "ref" : "BV11.present_value" - }, - "filter_differential_pressure_setpoint" : { - "set_value" : 60 - }, - "filter_differential_pressure_sensor" : { - "ref" : "AV12.present_value" - } - } - }, - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } - }, - "timestamp" : "2022-11-07T17:42:21.486Z", - "version" : "1.3.14-93-g714f5f4-dirty" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/event_pointset.json b/validator/sequences/writeback_success_apply/event_pointset.json deleted file mode 100644 index 4d37d249ed..0000000000 --- a/validator/sequences/writeback_success_apply/event_pointset.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "points" : { - "filter_alarm_pressure_status" : { - "present_value" : false - }, - "filter_differential_pressure_setpoint" : { - "present_value" : 60 - }, - "filter_differential_pressure_sensor" : { - "present_value" : 9 - } - }, - "timestamp" : "2022-11-07T17:42:30.013Z", - "version" : "1.4.0" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/event_system.json b/validator/sequences/writeback_success_apply/event_system.json deleted file mode 100644 index f366afe27a..0000000000 --- a/validator/sequences/writeback_success_apply/event_system.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "last_config" : "2022-11-07T17:42:21Z", - "logentries" : [ ], - "metrics" : { - "restart_count" : 71, - "mem_total_mb" : 128, - "mem_free_mb" : 98.27529907226562 - }, - "timestamp" : "2022-11-07T17:42:30.288Z", - "version" : "1.4.0" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/local_system.json b/validator/sequences/writeback_success_apply/local_system.json deleted file mode 100644 index 484a8fe928..0000000000 --- a/validator/sequences/writeback_success_apply/local_system.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/local_update.json b/validator/sequences/writeback_success_apply/local_update.json deleted file mode 100644 index 839fa6a669..0000000000 --- a/validator/sequences/writeback_success_apply/local_update.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "timestamp" : "2022-11-07T17:42:16Z", - "version" : "@@@cloud udmi version###1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { - "ref" : "BV11.present_value" - }, - "filter_differential_pressure_setpoint" : { - "set_value" : 60 - }, - "filter_differential_pressure_sensor" : { - "ref" : "AV12.present_value" - } - } - } -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/sequence.md b/validator/sequences/writeback_success_apply/sequence.md deleted file mode 100644 index bea995fb55..0000000000 --- a/validator/sequences/writeback_success_apply/sequence.md +++ /dev/null @@ -1,6 +0,0 @@ - -## writeback_success_apply - -1. Update config before point `filter_differential_pressure_setpoint` to have present_value `60`: - * Set `pointset.points.filter_differential_pressure_setpoint.set_value` = `60` -1. Wait for point `filter_differential_pressure_setpoint` to have present_value `60` diff --git a/validator/sequences/writeback_success_apply/sequencer.log b/validator/sequences/writeback_success_apply/sequencer.log deleted file mode 100644 index 2dff694a7c..0000000000 --- a/validator/sequences/writeback_success_apply/sequencer.log +++ /dev/null @@ -1,767 +0,0 @@ -2022-11-07T17:41:51Z NOTICE sequencer starting test writeback_success_apply -2022-11-07T17:42:11Z DEBUG sequencer Starting reset_config -2022-11-07T17:42:11Z INFO sequencer start waiting for device config sync after 20s -2022-11-07T17:42:11Z DEBUG sequencer system config extra field reset_config -2022-11-07T17:42:11Z DEBUG sequencer update config_system -2022-11-07T17:42:11Z DEBUG sequencer local local_system -2022-11-07T17:42:13Z DEBUG sequencer Update config before device config sync: 1970-01-01T00:00:00Z -2022-11-07T17:42:13Z DEBUG sequencer local local_update -2022-11-07T17:42:13Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:41:50Z: State update defer 1315ms -2022-11-07T17:42:13Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:41:50Z: State update defer 1312ms -2022-11-07T17:42:13Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:41:50Z: Config handler -2022-11-07T17:42:13Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:41:50Z: State update defer 1316ms -2022-11-07T17:42:13Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:41:50Z: State update defer 1312ms -2022-11-07T17:42:13Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:41:50Z: 2022-11-07T17:41:50Z received config 2022-11-07T17:41:49Z -2022-11-07T17:42:13Z DEBUG sequencer received event_system NOTICE system.config.apply 2022-11-07T17:41:50Z: success -2022-11-07T17:42:13Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:41:50Z: State update defer 1056ms -2022-11-07T17:42:13Z DEBUG sequencer received event_pointset -2022-11-07T17:42:13Z DEBUG sequencer received event_system (no logs) -2022-11-07T17:42:13Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:41:51Z: State update defer -1ms -2022-11-07T17:42:13Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:41:51Z: update state 2022-11-07T17:41:51Z last_config 2022-11-07T17:41:49Z -2022-11-07T17:42:13Z DEBUG sequencer received state_pointset -2022-11-07T17:42:13Z DEBUG sequencer received state_system -2022-11-07T17:42:13Z DEBUG sequencer received state_update -2022-11-07T17:42:13Z DEBUG sequencer Updated state #029: -{ - "timestamp" : "2022-11-07T17:41:51Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:41:49Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:41:50Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:13Z NOTICE sequencer Received serial no sequencer-14994 -2022-11-07T17:42:13Z DEBUG sequencer Updated state has last_config 2022-11-07T17:41:49Z -2022-11-07T17:42:13Z DEBUG sequencer received event_pointset -2022-11-07T17:42:13Z DEBUG sequencer received event_system (no logs) -2022-11-07T17:42:13Z DEBUG sequencer received event_pointset -2022-11-07T17:42:13Z DEBUG sequencer received event_system (no logs) -2022-11-07T17:42:13Z DEBUG sequencer received config_system -2022-11-07T17:42:13Z DEBUG sequencer received config_update -2022-11-07T17:42:13Z DEBUG sequencer Update with config reset -2022-11-07T17:42:13Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:11Z -2022-11-07T17:42:13Z DEBUG sequencer Updated config #025: -{ - "timestamp" : "2022-11-07T17:42:11Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "testing" : { - "sequence_name" : "reset_config" - } - } -} -2022-11-07T17:42:13Z INFO sequencer finished waiting for device config sync after 22s -2022-11-07T17:42:13Z INFO sequencer clearing system logs... -2022-11-07T17:42:14Z DEBUG sequencer Reading generated config file /workspaces/udmi/sites/udmi_site_model/devices/AHU-1/out/generated_config.json -2022-11-07T17:42:14Z INFO sequencer start waiting for device config sync after 23s -2022-11-07T17:42:14Z DEBUG sequencer system config extra field null -2022-11-07T17:42:14Z DEBUG sequencer update config_system -2022-11-07T17:42:14Z DEBUG sequencer local local_system -2022-11-07T17:42:16Z DEBUG sequencer update config_pointset -2022-11-07T17:42:16Z DEBUG sequencer local local_pointset -2022-11-07T17:42:18Z DEBUG sequencer Update config before device config sync: 2022-04-21T00:33:43Z -2022-11-07T17:42:18Z DEBUG sequencer local local_update -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:11Z: State update defer -17615ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:11Z: update state 2022-11-07T17:42:11Z last_config 2022-11-07T17:41:49Z -2022-11-07T17:42:18Z DEBUG sequencer received state_system -2022-11-07T17:42:18Z DEBUG sequencer received state_pointset -2022-11-07T17:42:18Z DEBUG sequencer received state_update -2022-11-07T17:42:18Z DEBUG sequencer Updated state #030: -{ - "timestamp" : "2022-11-07T17:42:11Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:41:49Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:18Z DEBUG sequencer Updated state has last_config 2022-11-07T17:41:49Z -2022-11-07T17:42:18Z DEBUG sequencer received event_system NOTICE system.config.apply 2022-11-07T17:42:11Z: success -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:11Z: State update defer 2000ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:11Z: State update defer 1997ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:11Z: Config handler -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:11Z: State update defer 1996ms -2022-11-07T17:42:18Z DEBUG sequencer received config_update -2022-11-07T17:42:18Z DEBUG sequencer Update with config reset -2022-11-07T17:42:18Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:11Z -2022-11-07T17:42:18Z DEBUG sequencer Updated config #026: -{ - "timestamp" : "2022-11-07T17:42:11Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "reset_config" - } - } -} -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:12Z: State update defer 1083ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:12Z: Config handler -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:12Z: State update defer 1088ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:12Z: State update defer 1086ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system NOTICE system.config.apply 2022-11-07T17:42:12Z: success -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:12Z: 2022-11-07T17:42:12Z received config 2022-11-07T17:42:11Z -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:12Z: State update defer 1084ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:13Z: State update defer 0ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:10Z: 2022-11-07T17:42:10Z sending test message #10 -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:13Z: update state 2022-11-07T17:42:13Z last_config 2022-11-07T17:42:11Z -2022-11-07T17:42:18Z DEBUG sequencer received state_system -2022-11-07T17:42:18Z DEBUG sequencer received state_pointset -2022-11-07T17:42:18Z DEBUG sequencer received state_update -2022-11-07T17:42:18Z DEBUG sequencer Updated state #031: -{ - "timestamp" : "2022-11-07T17:42:13Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:11Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:12Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:18Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:11Z -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:11Z: 2022-11-07T17:42:11Z received config 2022-11-07T17:42:11Z -2022-11-07T17:42:18Z DEBUG sequencer received config_system -2022-11-07T17:42:18Z DEBUG sequencer received config_update -2022-11-07T17:42:18Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:14Z -2022-11-07T17:42:18Z DEBUG sequencer Updated config #027: -{ - "timestamp" : "2022-11-07T17:42:14Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "testing" : { - "sequence_name" : "writeback_success_apply" - } - } -} -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:14Z: State update defer 1259ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:14Z: State update defer 1260ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:14Z: State update defer 1262ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system NOTICE system.config.apply 2022-11-07T17:42:14Z: success -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:14Z: 2022-11-07T17:42:14Z received config 2022-11-07T17:42:14Z -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:14Z: Config handler -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:14Z: State update defer 1263ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:15Z: State update defer 0ms -2022-11-07T17:42:18Z DEBUG sequencer received state_system -2022-11-07T17:42:18Z DEBUG sequencer received state_update -2022-11-07T17:42:18Z DEBUG sequencer Updated state #032: -{ - "timestamp" : "2022-11-07T17:42:15Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:14Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:14Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:18Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:14Z -2022-11-07T17:42:18Z DEBUG sequencer received state_pointset -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:15Z: update state 2022-11-07T17:42:15Z last_config 2022-11-07T17:42:14Z -2022-11-07T17:42:18Z DEBUG sequencer received config_update -2022-11-07T17:42:18Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:14Z -2022-11-07T17:42:18Z DEBUG sequencer Updated config #028: -{ - "timestamp" : "2022-11-07T17:42:14Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } - } -} -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:16Z: State update defer 1877ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:16Z: State update defer 1876ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:16Z: 2022-11-07T17:42:16Z received config 2022-11-07T17:42:14Z -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:16Z: State update defer 1879ms -2022-11-07T17:42:18Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:16Z: Config handler -2022-11-07T17:42:18Z DEBUG sequencer received event_system NOTICE system.config.apply 2022-11-07T17:42:16Z: success -2022-11-07T17:42:18Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:16Z: State update defer 1880ms -2022-11-07T17:42:18Z DEBUG sequencer received config_pointset -2022-11-07T17:42:18Z DEBUG sequencer received config_update -2022-11-07T17:42:18Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:16Z -2022-11-07T17:42:18Z DEBUG sequencer Updated config #029: -{ - "timestamp" : "2022-11-07T17:42:16Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { - "ref" : "BV11.present_value" - }, - "filter_differential_pressure_setpoint" : { - "set_value" : 98 - }, - "filter_differential_pressure_sensor" : { - "ref" : "AV12.present_value" - } - } - } -} -2022-11-07T17:42:18Z INFO sequencer finished waiting for device config sync after 27s -2022-11-07T17:42:18Z DEBUG sequencer Done with reset_config -2022-11-07T17:42:18Z INFO sequencer clearing system logs... -2022-11-07T17:42:19Z DEBUG sequencer system config extra field null -2022-11-07T17:42:19Z DEBUG sequencer update config_system -2022-11-07T17:42:19Z DEBUG sequencer local local_system -2022-11-07T17:42:21Z DEBUG sequencer Update config: 2022-11-07T17:42:16Z -2022-11-07T17:42:21Z DEBUG sequencer local local_update -2022-11-07T17:42:21Z INFO sequencer start waiting for device config sync after 30s -2022-11-07T17:42:21Z DEBUG sequencer system config extra field null -2022-11-07T17:42:21Z DEBUG sequencer Update config before device config sync: 2022-11-07T17:42:16Z -2022-11-07T17:42:21Z DEBUG sequencer local local_update -2022-11-07T17:42:21Z INFO sequencer finished waiting for device config sync after 30s -2022-11-07T17:42:21Z DEBUG sequencer config synced to 2022-11-07T17:42:16Z -2022-11-07T17:42:21Z INFO sequencer start waiting for device state update after 30s -2022-11-07T17:42:21Z DEBUG sequencer system config extra field null -2022-11-07T17:42:21Z DEBUG sequencer Update config before device state update: 2022-11-07T17:42:16Z -2022-11-07T17:42:21Z DEBUG sequencer local local_update -2022-11-07T17:42:21Z INFO sequencer finished waiting for device state update after 30s -2022-11-07T17:42:21Z INFO sequencer start waiting for point `filter_differential_pressure_setpoint` to have present_value `60` after 30s -2022-11-07T17:42:21Z DEBUG sequencer system config extra field null -2022-11-07T17:42:21Z DEBUG sequencer update config_pointset -2022-11-07T17:42:21Z DEBUG sequencer local local_pointset -2022-11-07T17:42:23Z DEBUG sequencer Update config before point `filter_differential_pressure_setpoint` to have present_value `60`: 2022-11-07T17:42:16Z -2022-11-07T17:42:23Z DEBUG sequencer local local_update -2022-11-07T17:42:23Z DEBUG sequencer received event_system NOTICE system.config.apply 2022-11-07T17:42:17Z: success -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:17Z: State update defer 392ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:17Z: Config handler -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:17Z: State update defer 388ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:17Z: State update defer 391ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:17Z: 2022-11-07T17:42:17Z received config 2022-11-07T17:42:16Z -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:17Z: State update defer 387ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:17Z: State update defer 0ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:17Z: update state 2022-11-07T17:42:17Z last_config 2022-11-07T17:42:16Z -2022-11-07T17:42:23Z DEBUG sequencer received state_update -2022-11-07T17:42:23Z DEBUG sequencer Updated state #033: -{ - "timestamp" : "2022-11-07T17:42:17Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:16Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:17Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:23Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:16Z -2022-11-07T17:42:23Z DEBUG sequencer received state_system -2022-11-07T17:42:23Z DEBUG sequencer received state_pointset -2022-11-07T17:42:23Z DEBUG sequencer received state_system -2022-11-07T17:42:23Z DEBUG sequencer received state_update -2022-11-07T17:42:23Z DEBUG sequencer Updated state #034: -{ - "timestamp" : "2022-11-07T17:42:17Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:16Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:17Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - } - }, - "configAcked" : "true" -} -2022-11-07T17:42:23Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:16Z -2022-11-07T17:42:23Z DEBUG sequencer received state_pointset -2022-11-07T17:42:23Z DEBUG sequencer received config_system -2022-11-07T17:42:23Z DEBUG sequencer received config_update -2022-11-07T17:42:23Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:19Z -2022-11-07T17:42:23Z DEBUG sequencer Updated config #030: -{ - "timestamp" : "2022-11-07T17:42:19Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { - "ref" : "BV11.present_value" - }, - "filter_differential_pressure_setpoint" : { - "set_value" : 98 - }, - "filter_differential_pressure_sensor" : { - "ref" : "AV12.present_value" - } - } - } -} -2022-11-07T17:42:23Z DEBUG sequencer received event_system NOTICE system.config.apply 2022-11-07T17:42:19Z: success -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:19Z: State update defer 324ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:19Z: Config handler -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:19Z: State update defer 325ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:19Z: State update defer 321ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:19Z: 2022-11-07T17:42:19Z received config 2022-11-07T17:42:19Z -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:19Z: State update defer 321ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:20Z: update state 2022-11-07T17:42:20Z last_config 2022-11-07T17:42:19Z -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:20Z: State update defer 0ms -2022-11-07T17:42:23Z DEBUG sequencer received state_pointset -2022-11-07T17:42:23Z DEBUG sequencer received state_system -2022-11-07T17:42:23Z DEBUG sequencer received state_update -2022-11-07T17:42:23Z DEBUG sequencer Updated state #035: -{ - "timestamp" : "2022-11-07T17:42:20Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:19Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:19Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:23Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:19Z -2022-11-07T17:42:23Z DEBUG sequencer received event_pointset -2022-11-07T17:42:23Z DEBUG sequencer received event_system (no logs) -2022-11-07T17:42:23Z DEBUG sequencer received config_pointset -2022-11-07T17:42:23Z DEBUG sequencer received config_update -2022-11-07T17:42:23Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:21Z -2022-11-07T17:42:23Z DEBUG sequencer Updated config #031: -{ - "timestamp" : "2022-11-07T17:42:21Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { - "ref" : "BV11.present_value" - }, - "filter_differential_pressure_setpoint" : { - "set_value" : 60 - }, - "filter_differential_pressure_sensor" : { - "ref" : "AV12.present_value" - } - } - } -} -2022-11-07T17:42:23Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:21Z: Config handler -2022-11-07T17:42:23Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:21Z: 2022-11-07T17:42:21Z received config 2022-11-07T17:42:21Z -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:21Z: State update defer 600ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:21Z: State update defer 603ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:21Z: State update defer 599ms -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:21Z: State update defer 604ms -2022-11-07T17:42:23Z DEBUG sequencer received state_update -2022-11-07T17:42:23Z DEBUG sequencer Updated state #036: -{ - "timestamp" : "2022-11-07T17:42:22Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:21Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:21Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:23Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:21Z -2022-11-07T17:42:23Z DEBUG sequencer received state_system -2022-11-07T17:42:23Z DEBUG sequencer received state_pointset -2022-11-07T17:42:23Z DEBUG sequencer received event_system WARNING device.log 2022-11-07T17:42:22Z: State update defer -1ms -2022-11-07T17:42:24Z DEBUG sequencer received event_system NOTICE system.config.apply 2022-11-07T17:42:21Z: success -2022-11-07T17:42:25Z DEBUG sequencer received event_system INFO device.log 2022-11-07T17:42:22Z: update state 2022-11-07T17:42:22Z last_config 2022-11-07T17:42:21Z -2022-11-07T17:42:30Z DEBUG sequencer received event_system (no logs) -2022-11-07T17:42:30Z DEBUG sequencer received event_pointset -2022-11-07T17:42:30Z INFO sequencer finished waiting for point `filter_differential_pressure_setpoint` to have present_value `60` after 39s -2022-11-07T17:42:30Z DEBUG sequencer Starting reset_config -2022-11-07T17:42:30Z INFO sequencer start waiting for device config sync after 39s -2022-11-07T17:42:30Z DEBUG sequencer system config extra field reset_config -2022-11-07T17:42:30Z DEBUG sequencer update config_system -2022-11-07T17:42:32Z DEBUG sequencer Update config before device config sync: 1970-01-01T00:00:00Z -2022-11-07T17:42:32Z DEBUG sequencer Update with config reset -2022-11-07T17:42:32Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:31Z -2022-11-07T17:42:32Z DEBUG sequencer Updated config #032: -{ - "timestamp" : "2022-11-07T17:42:31Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "testing" : { - "sequence_name" : "reset_config" - } - } -} -2022-11-07T17:42:32Z INFO sequencer finished waiting for device config sync after 41s -2022-11-07T17:42:32Z INFO sequencer clearing system logs... -2022-11-07T17:42:33Z DEBUG sequencer Reading generated config file /workspaces/udmi/sites/udmi_site_model/devices/AHU-1/out/generated_config.json -2022-11-07T17:42:33Z INFO sequencer start waiting for device config sync after 42s -2022-11-07T17:42:33Z DEBUG sequencer system config extra field null -2022-11-07T17:42:33Z DEBUG sequencer update config_system -2022-11-07T17:42:35Z DEBUG sequencer update config_pointset -2022-11-07T17:42:37Z DEBUG sequencer Update config before device config sync: 2022-04-21T00:33:43Z -2022-11-07T17:42:37Z DEBUG sequencer Updated state #037: -{ - "timestamp" : "2022-11-07T17:42:31Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:21Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:37Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:21Z -2022-11-07T17:42:37Z DEBUG sequencer Update with config reset -2022-11-07T17:42:37Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:31Z -2022-11-07T17:42:37Z DEBUG sequencer Updated config #033: -{ - "timestamp" : "2022-11-07T17:42:31Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "reset_config" - } - } -} -2022-11-07T17:42:37Z DEBUG sequencer Updated state #038: -{ - "timestamp" : "2022-11-07T17:42:33Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:31Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:32Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:37Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:31Z -2022-11-07T17:42:37Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:34Z -2022-11-07T17:42:37Z DEBUG sequencer Updated config #034: -{ - "timestamp" : "2022-11-07T17:42:34Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "testing" : { - "sequence_name" : "writeback_success_apply" - } - } -} -2022-11-07T17:42:37Z DEBUG sequencer Updated state #039: -{ - "timestamp" : "2022-11-07T17:42:35Z", - "version" : "1.4.0", - "system" : { - "last_config" : "2022-11-07T17:42:34Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:34Z", - "level" : 300 - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { }, - "filter_differential_pressure_sensor" : { } - } - } -} -2022-11-07T17:42:37Z DEBUG sequencer Updated state has last_config 2022-11-07T17:42:34Z -2022-11-07T17:42:37Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:34Z -2022-11-07T17:42:37Z DEBUG sequencer Updated config #035: -{ - "timestamp" : "2022-11-07T17:42:34Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } - } -} -2022-11-07T17:42:37Z DEBUG sequencer Updated config with timestamp 2022-11-07T17:42:36Z -2022-11-07T17:42:37Z DEBUG sequencer Updated config #036: -{ - "timestamp" : "2022-11-07T17:42:36Z", - "version" : "1.3.14-93-g714f5f4-dirty", - "system" : { - "min_loglevel" : 200, - "metrics_rate_sec" : 600, - "last_start" : "2022-11-07T17:40:18Z", - "testing" : { - "sequence_name" : "writeback_success_apply" - } - }, - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { - "ref" : "BV11.present_value" - }, - "filter_differential_pressure_setpoint" : { - "set_value" : 98 - }, - "filter_differential_pressure_sensor" : { - "ref" : "AV12.present_value" - } - } - } -} -2022-11-07T17:42:37Z INFO sequencer finished waiting for device config sync after 46s -2022-11-07T17:42:37Z DEBUG sequencer Done with reset_config -2022-11-07T17:42:37Z NOTICE sequencer RESULT pass writeback_success_apply Sequence complete -2022-11-07T17:42:37Z INFO sequencer Sequence complete -2022-11-07T17:42:37Z NOTICE sequencer ending test writeback_success_apply after 46s diff --git a/validator/sequences/writeback_success_apply/state_pointset.json b/validator/sequences/writeback_success_apply/state_pointset.json deleted file mode 100644 index d077de7f2c..0000000000 --- a/validator/sequences/writeback_success_apply/state_pointset.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - }, - "timestamp" : "2022-11-07T17:42:22Z", - "version" : "1.4.0" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/state_system.json b/validator/sequences/writeback_success_apply/state_system.json deleted file mode 100644 index f21d0651f2..0000000000 --- a/validator/sequences/writeback_success_apply/state_system.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "last_config" : "2022-11-07T17:42:21Z", - "last_start" : "2022-11-07T17:40:18Z", - "mode" : "initial", - "operational" : true, - "serial_no" : "sequencer-14994", - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:21Z", - "level" : 300 - }, - "timestamp" : "2022-11-07T17:42:22Z", - "version" : "1.4.0" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/state_update.json b/validator/sequences/writeback_success_apply/state_update.json deleted file mode 100644 index 54bba1d9a3..0000000000 --- a/validator/sequences/writeback_success_apply/state_update.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pointset" : { - "points" : { - "filter_alarm_pressure_status" : { }, - "filter_differential_pressure_setpoint" : { - "value_state" : "applied" - }, - "filter_differential_pressure_sensor" : { } - } - }, - "system" : { - "last_config" : "2022-11-07T17:42:21Z", - "operational" : true, - "mode" : "initial", - "last_start" : "2022-11-07T17:40:18Z", - "serial_no" : "sequencer-14994", - "hardware" : { - "make" : "BOS", - "model" : "pubber" - }, - "software" : { - "firmware" : "v1" - }, - "status" : { - "message" : "success", - "category" : "system.config.apply", - "timestamp" : "2022-11-07T17:42:21Z", - "level" : 300 - } - }, - "timestamp" : "2022-11-07T17:42:22Z", - "version" : "1.4.0" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_apply/system.log b/validator/sequences/writeback_success_apply/system.log deleted file mode 100644 index d8fa667483..0000000000 --- a/validator/sequences/writeback_success_apply/system.log +++ /dev/null @@ -1,105 +0,0 @@ -2022-11-07T17:41:50Z WARNING device.log State update defer 1315ms -2022-11-07T17:41:50Z WARNING device.log State update defer 1312ms -2022-11-07T17:41:50Z INFO device.log Config handler -2022-11-07T17:41:50Z WARNING device.log State update defer 1316ms -2022-11-07T17:41:50Z WARNING device.log State update defer 1312ms -2022-11-07T17:41:50Z INFO device.log 2022-11-07T17:41:50Z received config 2022-11-07T17:41:49Z -2022-11-07T17:41:50Z NOTICE system.config.apply success -2022-11-07T17:41:50Z WARNING device.log State update defer 1056ms -2022-11-07T17:41:51Z WARNING device.log State update defer -1ms -2022-11-07T17:41:51Z INFO device.log update state 2022-11-07T17:41:51Z last_config 2022-11-07T17:41:49Z -2022-11-07T17:42:11Z WARNING device.log State update defer -17615ms -2022-11-07T17:42:11Z INFO device.log update state 2022-11-07T17:42:11Z last_config 2022-11-07T17:41:49Z -2022-11-07T17:42:11Z NOTICE system.config.apply success -2022-11-07T17:42:11Z WARNING device.log State update defer 2000ms -2022-11-07T17:42:11Z WARNING device.log State update defer 1997ms -2022-11-07T17:42:11Z INFO device.log Config handler -2022-11-07T17:42:11Z WARNING device.log State update defer 1996ms -2022-11-07T17:42:12Z WARNING device.log State update defer 1083ms -2022-11-07T17:42:12Z INFO device.log Config handler -2022-11-07T17:42:12Z WARNING device.log State update defer 1088ms -2022-11-07T17:42:12Z WARNING device.log State update defer 1086ms -2022-11-07T17:42:12Z NOTICE system.config.apply success -2022-11-07T17:42:12Z INFO device.log 2022-11-07T17:42:12Z received config 2022-11-07T17:42:11Z -2022-11-07T17:42:12Z WARNING device.log State update defer 1084ms -2022-11-07T17:42:13Z WARNING device.log State update defer 0ms -2022-11-07T17:42:10Z INFO device.log 2022-11-07T17:42:10Z sending test message #10 -2022-11-07T17:42:13Z INFO device.log update state 2022-11-07T17:42:13Z last_config 2022-11-07T17:42:11Z -2022-11-07T17:42:11Z INFO device.log 2022-11-07T17:42:11Z received config 2022-11-07T17:42:11Z -2022-11-07T17:42:14Z WARNING device.log State update defer 1259ms -2022-11-07T17:42:14Z WARNING device.log State update defer 1260ms -2022-11-07T17:42:14Z WARNING device.log State update defer 1262ms -2022-11-07T17:42:14Z NOTICE system.config.apply success -2022-11-07T17:42:14Z INFO device.log 2022-11-07T17:42:14Z received config 2022-11-07T17:42:14Z -2022-11-07T17:42:14Z INFO device.log Config handler -2022-11-07T17:42:14Z WARNING device.log State update defer 1263ms -2022-11-07T17:42:15Z WARNING device.log State update defer 0ms -2022-11-07T17:42:15Z INFO device.log update state 2022-11-07T17:42:15Z last_config 2022-11-07T17:42:14Z -2022-11-07T17:42:16Z WARNING device.log State update defer 1877ms -2022-11-07T17:42:16Z WARNING device.log State update defer 1876ms -2022-11-07T17:42:16Z INFO device.log 2022-11-07T17:42:16Z received config 2022-11-07T17:42:14Z -2022-11-07T17:42:16Z WARNING device.log State update defer 1879ms -2022-11-07T17:42:16Z INFO device.log Config handler -2022-11-07T17:42:16Z NOTICE system.config.apply success -2022-11-07T17:42:16Z WARNING device.log State update defer 1880ms -2022-11-07T17:42:17Z NOTICE system.config.apply success -2022-11-07T17:42:17Z WARNING device.log State update defer 392ms -2022-11-07T17:42:17Z INFO device.log Config handler -2022-11-07T17:42:17Z WARNING device.log State update defer 388ms -2022-11-07T17:42:17Z WARNING device.log State update defer 391ms -2022-11-07T17:42:17Z INFO device.log 2022-11-07T17:42:17Z received config 2022-11-07T17:42:16Z -2022-11-07T17:42:17Z WARNING device.log State update defer 387ms -2022-11-07T17:42:17Z WARNING device.log State update defer 0ms -2022-11-07T17:42:17Z INFO device.log update state 2022-11-07T17:42:17Z last_config 2022-11-07T17:42:16Z -2022-11-07T17:42:19Z NOTICE system.config.apply success -2022-11-07T17:42:19Z WARNING device.log State update defer 324ms -2022-11-07T17:42:19Z INFO device.log Config handler -2022-11-07T17:42:19Z WARNING device.log State update defer 325ms -2022-11-07T17:42:19Z WARNING device.log State update defer 321ms -2022-11-07T17:42:19Z INFO device.log 2022-11-07T17:42:19Z received config 2022-11-07T17:42:19Z -2022-11-07T17:42:19Z WARNING device.log State update defer 321ms -2022-11-07T17:42:20Z INFO device.log update state 2022-11-07T17:42:20Z last_config 2022-11-07T17:42:19Z -2022-11-07T17:42:20Z WARNING device.log State update defer 0ms -2022-11-07T17:42:21Z INFO device.log Config handler -2022-11-07T17:42:21Z INFO device.log 2022-11-07T17:42:21Z received config 2022-11-07T17:42:21Z -2022-11-07T17:42:21Z WARNING device.log State update defer 600ms -2022-11-07T17:42:21Z WARNING device.log State update defer 603ms -2022-11-07T17:42:21Z WARNING device.log State update defer 599ms -2022-11-07T17:42:21Z WARNING device.log State update defer 604ms -2022-11-07T17:42:22Z WARNING device.log State update defer -1ms -2022-11-07T17:42:21Z NOTICE system.config.apply success -2022-11-07T17:42:22Z INFO device.log update state 2022-11-07T17:42:22Z last_config 2022-11-07T17:42:21Z -2022-11-07T17:42:31Z WARNING device.log State update defer -6898ms -2022-11-07T17:42:31Z INFO device.log update state 2022-11-07T17:42:31Z last_config 2022-11-07T17:42:21Z -2022-11-07T17:42:31Z NOTICE system.config.apply success -2022-11-07T17:42:31Z INFO device.log Config handler -2022-11-07T17:42:31Z WARNING device.log State update defer 1996ms -2022-11-07T17:42:31Z WARNING device.log State update defer 2000ms -2022-11-07T17:42:31Z INFO device.log 2022-11-07T17:42:31Z received config 2022-11-07T17:42:31Z -2022-11-07T17:42:31Z WARNING device.log State update defer 1997ms -2022-11-07T17:42:32Z WARNING device.log State update defer 608ms -2022-11-07T17:42:32Z NOTICE system.config.apply success -2022-11-07T17:42:32Z WARNING device.log State update defer 606ms -2022-11-07T17:42:32Z INFO device.log 2022-11-07T17:42:32Z received config 2022-11-07T17:42:31Z -2022-11-07T17:42:32Z WARNING device.log State update defer 604ms -2022-11-07T17:42:32Z INFO device.log Config handler -2022-11-07T17:42:32Z WARNING device.log State update defer 603ms -2022-11-07T17:42:33Z WARNING device.log State update defer 0ms -2022-11-07T17:42:33Z INFO device.log update state 2022-11-07T17:42:33Z last_config 2022-11-07T17:42:31Z -2022-11-07T17:42:34Z WARNING device.log State update defer 1263ms -2022-11-07T17:42:34Z NOTICE system.config.apply success -2022-11-07T17:42:34Z INFO device.log 2022-11-07T17:42:34Z received config 2022-11-07T17:42:34Z -2022-11-07T17:42:34Z WARNING device.log State update defer 1258ms -2022-11-07T17:42:34Z WARNING device.log State update defer 1259ms -2022-11-07T17:42:34Z WARNING device.log State update defer 1262ms -2022-11-07T17:42:34Z INFO device.log Config handler -2022-11-07T17:42:35Z INFO device.log update state 2022-11-07T17:42:35Z last_config 2022-11-07T17:42:34Z -2022-11-07T17:42:35Z WARNING device.log State update defer -1ms -2022-11-07T17:42:35Z WARNING device.log State update defer 1868ms -2022-11-07T17:42:35Z WARNING device.log State update defer 1870ms -2022-11-07T17:42:35Z INFO device.log Config handler -2022-11-07T17:42:35Z INFO device.log 2022-11-07T17:42:35Z received config 2022-11-07T17:42:34Z -2022-11-07T17:42:35Z WARNING device.log State update defer 1867ms -2022-11-07T17:42:35Z NOTICE system.config.apply success -2022-11-07T17:42:35Z WARNING device.log State update defer 1872ms -2022-11-07T17:42:37Z INFO sequencer Sequence complete diff --git a/validator/sequences/writeback_success_state/config_pointset.attr b/validator/sequences/writeback_success_state/config_pointset.attr deleted file mode 100644 index 57a1e92fc7..0000000000 --- a/validator/sequences/writeback_success_state/config_pointset.attr +++ /dev/null @@ -1,10 +0,0 @@ -{ - "deviceNumId" : "123456789101112", - "subFolder" : "pointset", - "wasBase64" : "false", - "deviceRegistryId" : "ZZ-TRI-FECTA", - "subType" : "config", - "category" : "commands", - "deviceId" : "AHU-1", - "projectId" : "daq1-273309" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_state/config_system.attr b/validator/sequences/writeback_success_state/config_system.attr deleted file mode 100644 index a5efc747dc..0000000000 --- a/validator/sequences/writeback_success_state/config_system.attr +++ /dev/null @@ -1,10 +0,0 @@ -{ - "deviceNumId" : "123456789101112", - "subFolder" : "system", - "wasBase64" : "false", - "deviceRegistryId" : "ZZ-TRI-FECTA", - "subType" : "config", - "category" : "commands", - "deviceId" : "AHU-1", - "projectId" : "daq1-273309" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_state/config_update.attr b/validator/sequences/writeback_success_state/config_update.attr deleted file mode 100644 index 9bbb74882b..0000000000 --- a/validator/sequences/writeback_success_state/config_update.attr +++ /dev/null @@ -1,10 +0,0 @@ -{ - "deviceNumId" : "123456789101112", - "subFolder" : "update", - "wasBase64" : "false", - "deviceRegistryId" : "ZZ-TRI-FECTA", - "subType" : "config", - "category" : "commands", - "deviceId" : "AHU-1", - "projectId" : "daq1-273309" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_state/event_pointset.attr b/validator/sequences/writeback_success_state/event_pointset.attr deleted file mode 100644 index 0e95159cbf..0000000000 --- a/validator/sequences/writeback_success_state/event_pointset.attr +++ /dev/null @@ -1,10 +0,0 @@ -{ - "deviceNumId" : "123456789101112", - "subFolder" : "pointset", - "wasBase64" : "false", - "deviceRegistryId" : "ZZ-TRI-FECTA", - "subType" : "event", - "category" : "commands", - "deviceId" : "AHU-1", - "projectId" : "daq1-273309" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_state/event_system.attr b/validator/sequences/writeback_success_state/event_system.attr deleted file mode 100644 index a37c3797af..0000000000 --- a/validator/sequences/writeback_success_state/event_system.attr +++ /dev/null @@ -1,10 +0,0 @@ -{ - "deviceNumId" : "123456789101112", - "subFolder" : "system", - "wasBase64" : "false", - "deviceRegistryId" : "ZZ-TRI-FECTA", - "subType" : "event", - "category" : "commands", - "deviceId" : "AHU-1", - "projectId" : "daq1-273309" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_state/local_pointset.json b/validator/sequences/writeback_success_state/local_pointset.json deleted file mode 100644 index 9d005c5f6a..0000000000 --- a/validator/sequences/writeback_success_state/local_pointset.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "points" : { - "filter_alarm_pressure_status" : { - "ref" : "BV11.present_value" - }, - "filter_differential_pressure_setpoint" : { - "set_value" : 60 - }, - "filter_differential_pressure_sensor" : { - "ref" : "AV12.present_value" - } - } -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_state/state_pointset.attr b/validator/sequences/writeback_success_state/state_pointset.attr deleted file mode 100644 index 5832c95a52..0000000000 --- a/validator/sequences/writeback_success_state/state_pointset.attr +++ /dev/null @@ -1,10 +0,0 @@ -{ - "deviceNumId" : "123456789101112", - "subFolder" : "pointset", - "wasBase64" : "false", - "deviceRegistryId" : "ZZ-TRI-FECTA", - "subType" : "state", - "category" : "commands", - "deviceId" : "AHU-1", - "projectId" : "daq1-273309" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_state/state_system.attr b/validator/sequences/writeback_success_state/state_system.attr deleted file mode 100644 index 3fee36c4ab..0000000000 --- a/validator/sequences/writeback_success_state/state_system.attr +++ /dev/null @@ -1,10 +0,0 @@ -{ - "deviceNumId" : "123456789101112", - "subFolder" : "system", - "wasBase64" : "false", - "deviceRegistryId" : "ZZ-TRI-FECTA", - "subType" : "state", - "category" : "commands", - "deviceId" : "AHU-1", - "projectId" : "daq1-273309" -} \ No newline at end of file diff --git a/validator/sequences/writeback_success_state/state_update.attr b/validator/sequences/writeback_success_state/state_update.attr deleted file mode 100644 index 64e651c30c..0000000000 --- a/validator/sequences/writeback_success_state/state_update.attr +++ /dev/null @@ -1,10 +0,0 @@ -{ - "deviceNumId" : "123456789101112", - "subFolder" : "update", - "wasBase64" : "false", - "deviceRegistryId" : "ZZ-TRI-FECTA", - "subType" : "state", - "category" : "commands", - "deviceId" : "AHU-1", - "projectId" : "daq1-273309" -} \ No newline at end of file diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/PointSequencer.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/PointsetBase.java similarity index 88% rename from validator/src/main/java/com/google/daq/mqtt/sequencer/PointSequencer.java rename to validator/src/main/java/com/google/daq/mqtt/sequencer/PointsetBase.java index bbab1ed7a9..2f339b67c3 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/PointSequencer.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/PointsetBase.java @@ -11,7 +11,7 @@ /** * Class used for testing sequences with points. */ -public abstract class PointSequencer extends SequenceBase { +public abstract class PointsetBase extends SequenceBase { /** * Make the required set of points in the config block. @@ -32,9 +32,11 @@ public void makePoints() { private void ensurePointConfig(String target) { String targetPoint = getTarget(target).target_point; - if (!deviceConfig.pointset.points.containsKey(targetPoint)) { - deviceConfig.pointset.points.put(targetPoint, new PointPointsetConfig()); - } + deviceConfig.pointset.points.computeIfAbsent(targetPoint, this::makePointsetConfig); + } + + private PointPointsetConfig makePointsetConfig(String pointName) { + return new PointPointsetConfig(); } protected TargetTestingModel getTarget(String target) { diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java index bf4e572419..b70c14f9c4 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java @@ -1,18 +1,9 @@ package com.google.daq.mqtt.sequencer.sequences; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; - -import com.google.daq.mqtt.sequencer.PointSequencer; -import com.google.udmi.util.JsonUtil; +import com.google.daq.mqtt.sequencer.PointsetBase; import java.util.List; -import java.util.Map; import java.util.Objects; import org.junit.Test; -import udmi.schema.DiscoveryEvent; -import udmi.schema.Envelope.SubFolder; -import udmi.schema.PointPointsetEvent; import udmi.schema.PointPointsetState.Value_state; import udmi.schema.PointsetEvent; import udmi.schema.TargetTestingModel; @@ -20,7 +11,7 @@ /** * Validate UDMI writeback capabilities. */ -public class WritebackSequences extends PointSequencer { +public class WritebackSequences extends PointsetBase { public static final String INVALID_STATE = "invalid"; public static final String FAILURE_STATE = "failure"; @@ -31,127 +22,88 @@ public class WritebackSequences extends PointSequencer { * Checks `value_state` for the point in the state matches the provided string. * * @param pointName Target point - * @param expected Expected `value_state` + * @param expected Expected `value_state` * @return true/false actual matches expected */ private boolean valueStateIs(String pointName, String expected) { if (deviceState.pointset == null || !deviceState.pointset.points.containsKey(pointName)) { - return false; + throw new AbortMessageLoop("Missing pointset point " + pointName); } Value_state rawState = deviceState.pointset.points.get(pointName).value_state; String valueState = rawState == null ? null : rawState.value(); boolean equals = Objects.equals(expected, valueState); - debug(String.format("%s Value state %s equals %s = %s%n", - JsonUtil.getTimestamp(), expected, valueState, equals)); + debug(String.format("Value state %s equals %s = %s", expected, valueState, equals)); return equals; } - /** Log string for value_state check. */ + /** + * Log string for value_state check. + */ private String expectedValueState(String pointName, String expectedValue) { String targetState = expectedValue == null ? "default (null)" : expectedValue; return String.format("point %s to have value_state %s", pointName, targetState); } - /** Log string for present_value check. */ - private String expectedPresentValue(String pointName, Object expectedValue) { - return String.format("point `%s` to have present_value `%s`", pointName, expectedValue); + /** + * Log string for present_value check. + * + * @param targetModel Target point model + */ + private String expectedPresentValue(TargetTestingModel targetModel) { + return String.format("point `%s` to have present_value `%s`", targetModel.target_point, + targetModel.target_value); } /** * Checks if the `present_value` for the given point matches the given value. * - * @param pointName Target point - * @param expectedValue Expected `present_value` + * @param targetModel Target point model * @return true/false actual matches expected */ - private boolean presentValueIs(String pointName, Object expectedValue) { - List messages = getReceivedEvents(PointsetEvent.class); - for (PointsetEvent message : messages) { - PointsetEvent pointsetEvent = JsonUtil.convertTo(PointsetEvent.class, message); - if (pointsetEvent.points.get(pointName) != null - && pointsetEvent.points.get(pointName).present_value == expectedValue) { + private boolean presentValueIs(TargetTestingModel targetModel) { + String pointName = targetModel.target_point; + List messages = popReceivedEvents(PointsetEvent.class); + for (PointsetEvent pointsetEvent : messages) { + if (pointsetEvent.points.get(pointName) != null + && pointsetEvent.points.get(pointName).present_value == targetModel.target_value) { return true; } } return false; } - protected PointsetEvent latestPointsetEvent() { - List events = getReceivedEvents(PointsetEvent.class); - if (events == null) { - return null; - } - return JsonUtil.convertTo(PointsetEvent.class, events.get(events.size() - 1)); - } - @Test(timeout = 90000) - public void writeback_success_apply() { - TargetTestingModel appliedTarget = getTarget(APPLIED_STATE); - String appliedPoint = appliedTarget.target_point; - Object appliedValue = appliedTarget.target_value; - deviceConfig.pointset.points.get(appliedPoint).set_value = appliedValue; - - untilTrue(expectedPresentValue(appliedPoint, appliedValue), - () -> presentValueIs(appliedPoint, appliedValue) - ); - + public void writeback_success() { + TargetTestingModel targetModel = testTargetState(APPLIED_STATE); + untilTrue(expectedPresentValue(targetModel), () -> presentValueIs(targetModel)); } - @Test(timeout = 90000) - public void writeback_success_state() { - TargetTestingModel appliedTarget = getTarget(APPLIED_STATE); - String appliedPoint = appliedTarget.target_point; - Object appliedValue = appliedTarget.target_value; - - untilTrue(expectedValueState(appliedPoint, DEFAULT_STATE), - () -> valueStateIs(appliedPoint, DEFAULT_STATE) - ); - - deviceConfig.pointset.points.get(appliedPoint).set_value = appliedValue; - - untilTrue(expectedValueState(appliedPoint, APPLIED_STATE), - () -> valueStateIs(appliedPoint, APPLIED_STATE) - ); - - untilTrue(expectedPresentValue(appliedPoint, appliedValue), - () -> presentValueIs(appliedPoint, appliedValue) - ); - } + private TargetTestingModel testTargetState(String targetState) { + TargetTestingModel targetModel = getTarget(targetState); + String targetPoint = targetModel.target_point; + Object targetValue = targetModel.target_value; - @Test - public void writeback_invalid_state() { - TargetTestingModel invalidTarget = getTarget(INVALID_STATE); - String invalidPoint = invalidTarget.target_point; - Object invalidValue = invalidTarget.target_value; + deviceConfig.pointset.points.get(targetPoint).set_value = null; + + untilTrue(expectedValueState(targetPoint, DEFAULT_STATE), + () -> valueStateIs(targetPoint, DEFAULT_STATE)); - untilTrue(expectedValueState(invalidPoint, DEFAULT_STATE), - () -> valueStateIs(invalidPoint, DEFAULT_STATE) - ); + deviceConfig.pointset.points.get(targetPoint).set_value = targetValue; - deviceConfig.pointset.points.get(invalidPoint).set_value = invalidValue; + untilTrue(expectedValueState(targetPoint, targetState), + () -> valueStateIs(targetPoint, targetState)); - untilTrue(expectedValueState(invalidPoint, INVALID_STATE), - () -> valueStateIs(invalidPoint, INVALID_STATE) - ); - + return targetModel; } @Test - public void writeback_failure_state() { - TargetTestingModel failureTarget = getTarget(FAILURE_STATE); - String failurePoint = failureTarget.target_point; - Object failureValue = failureTarget.target_value; - - untilTrue(expectedValueState(failurePoint, DEFAULT_STATE), - () -> valueStateIs(failurePoint, DEFAULT_STATE) - ); - - deviceConfig.pointset.points.get(failurePoint).set_value = failureValue; - - untilTrue(expectedValueState(failurePoint, FAILURE_STATE), - () -> valueStateIs(failurePoint, FAILURE_STATE) - ); + public void writeback_invalid() { + testTargetState(INVALID_STATE); } + @Test + public void writeback_failure() { + testTargetState(FAILURE_STATE); + } } From de8810411eab6e8b6342f0acca0e964812472e38 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Sat, 10 Dec 2022 14:51:49 -0800 Subject: [PATCH 2/7] Fixing expected out --- docs/specs/sequences/generated.md | 35 +++++++++---------- validator/sequences/broken_config/sequence.md | 7 ++-- .../sequences/system_min_loglevel/sequence.md | 3 +- .../sequences/system_mode_restart/sequence.md | 2 +- .../sequences/WritebackSequences.java | 4 +-- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/docs/specs/sequences/generated.md b/docs/specs/sequences/generated.md index 1d40fe458a..c5d55d8676 100644 --- a/docs/specs/sequences/generated.md +++ b/docs/specs/sequences/generated.md @@ -39,10 +39,9 @@ Some caveats: * [system_min_loglevel](#system_min_loglevel): Check that the min log-level config is honored by the device. * [system_mode_restart](#system_mode_restart): Restart and connect to same endpoint and expect it returns. * [valid_serial_no](#valid_serial_no) -* [writeback_failure_state](#writeback_failure_state) -* [writeback_invalid_state](#writeback_invalid_state) -* [writeback_success_apply](#writeback_success_apply) -* [writeback_success_state](#writeback_success_state) +* [writeback_failure](#writeback_failure) +* [writeback_invalid](#writeback_invalid) +* [writeback_success](#writeback_success) ## broken_config @@ -53,16 +52,17 @@ Check that the device correctly handles a broken (non-json) config message. 1. Wait for no interesting status 1. Wait for state synchronized 1. Check that initial stable_config matches last_config +1. Wait for log category `system.config.apply` level `NOTICE` 1. Wait for log category `system.config.receive` level `DEBUG` 1. Wait for has interesting status 1. Wait for log category `system.config.parse` level `ERROR` -1. Check has not logged category `system.config.apply` level `NOTICE` (**incomplete!**) 1. Force reset config -1. Wait for log category `system.config.receive` level `DEBUG` +1. Update config before no interesting status: + * Add `system.last_start` = `device reported` + * Set `system.min_loglevel` = `100` 1. Wait for no interesting status 1. Wait for last_config updated 1. Wait for log category `system.config.apply` level `NOTICE` -1. Wait for log category `system.config.parse` level `DEBUG` ## device_config_acked @@ -146,7 +146,8 @@ Check that last_update state is correctly set in response to a config update. Check that the min log-level config is honored by the device. -1. Check has not logged category `system.config.apply` level `NOTICE` (**incomplete!**) +1. Wait for log category `system.config.apply` level `NOTICE` +1. Check that device config resolved within 10s 1. Update config: * Set `system.min_loglevel` = `400` 1. Update config before log category `system.config.apply` level `NOTICE`: @@ -167,37 +168,33 @@ Restart and connect to same endpoint and expect it returns. 1. Update config before deviceState.system.mode == ACTIVE: * Set `system.mode` = `active` 1. Wait for deviceState.system.mode == ACTIVE -1. Wait for last_config is newer than previous last_config +1. Wait for last_config is newer than previous last_config after abort 1. Wait for last_start is newer than previous last_start ## valid_serial_no 1. Wait for received serial no matches -## writeback_failure_state +## writeback_failure 1. Wait for point filter_alarm_pressure_status to have value_state default (null) 1. Update config before point filter_alarm_pressure_status to have value_state failure: * Add `pointset.points.filter_alarm_pressure_status.set_value` = `false` 1. Wait for point filter_alarm_pressure_status to have value_state failure -## writeback_invalid_state +## writeback_invalid 1. Wait for point filter_differential_pressure_sensor to have value_state default (null) 1. Update config before point filter_differential_pressure_sensor to have value_state invalid: * Add `pointset.points.filter_differential_pressure_sensor.set_value` = `15` 1. Wait for point filter_differential_pressure_sensor to have value_state invalid -## writeback_success_apply - -1. Update config before point `filter_differential_pressure_setpoint` to have present_value `60`: - * Set `pointset.points.filter_differential_pressure_setpoint.set_value` = `60` -1. Wait for point `filter_differential_pressure_setpoint` to have present_value `60` - -## writeback_success_state +## writeback_success +1. Update config before point filter_differential_pressure_setpoint to have value_state default (null): + * Remove `pointset.points.filter_differential_pressure_setpoint.set_value` 1. Wait for point filter_differential_pressure_setpoint to have value_state default (null) 1. Update config before point filter_differential_pressure_setpoint to have value_state applied: - * Set `pointset.points.filter_differential_pressure_setpoint.set_value` = `60` + * Add `pointset.points.filter_differential_pressure_setpoint.set_value` = `60` 1. Wait for point filter_differential_pressure_setpoint to have value_state applied 1. Wait for point `filter_differential_pressure_setpoint` to have present_value `60` diff --git a/validator/sequences/broken_config/sequence.md b/validator/sequences/broken_config/sequence.md index 62781c53ee..043e93d099 100644 --- a/validator/sequences/broken_config/sequence.md +++ b/validator/sequences/broken_config/sequence.md @@ -8,13 +8,14 @@ Check that the device correctly handles a broken (non-json) config message. 1. Wait for no interesting status 1. Wait for state synchronized 1. Check that initial stable_config matches last_config +1. Wait for log category `system.config.apply` level `NOTICE` 1. Wait for log category `system.config.receive` level `DEBUG` 1. Wait for has interesting status 1. Wait for log category `system.config.parse` level `ERROR` -1. Check has not logged category `system.config.apply` level `NOTICE` (**incomplete!**) 1. Force reset config -1. Wait for log category `system.config.receive` level `DEBUG` +1. Update config before no interesting status: + * Add `system.last_start` = `device reported` + * Set `system.min_loglevel` = `100` 1. Wait for no interesting status 1. Wait for last_config updated 1. Wait for log category `system.config.apply` level `NOTICE` -1. Wait for log category `system.config.parse` level `DEBUG` diff --git a/validator/sequences/system_min_loglevel/sequence.md b/validator/sequences/system_min_loglevel/sequence.md index a54f56543a..244bcbd1bf 100644 --- a/validator/sequences/system_min_loglevel/sequence.md +++ b/validator/sequences/system_min_loglevel/sequence.md @@ -3,7 +3,8 @@ Check that the min log-level config is honored by the device. -1. Check has not logged category `system.config.apply` level `NOTICE` (**incomplete!**) +1. Wait for log category `system.config.apply` level `NOTICE` +1. Check that device config resolved within 10s 1. Update config: * Set `system.min_loglevel` = `400` 1. Update config before log category `system.config.apply` level `NOTICE`: diff --git a/validator/sequences/system_mode_restart/sequence.md b/validator/sequences/system_mode_restart/sequence.md index a571c546b2..0c78bed83e 100644 --- a/validator/sequences/system_mode_restart/sequence.md +++ b/validator/sequences/system_mode_restart/sequence.md @@ -13,5 +13,5 @@ Restart and connect to same endpoint and expect it returns. 1. Update config before deviceState.system.mode == ACTIVE: * Set `system.mode` = `active` 1. Wait for deviceState.system.mode == ACTIVE -1. Wait for last_config is newer than previous last_config +1. Wait for last_config is newer than previous last_config after abort 1. Wait for last_start is newer than previous last_start diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java index b70c14f9c4..bca84581fd 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java @@ -27,7 +27,7 @@ public class WritebackSequences extends PointsetBase { */ private boolean valueStateIs(String pointName, String expected) { if (deviceState.pointset == null || !deviceState.pointset.points.containsKey(pointName)) { - throw new AbortMessageLoop("Missing pointset point " + pointName); + return false; } Value_state rawState = deviceState.pointset.points.get(pointName).value_state; String valueState = rawState == null ? null : rawState.value(); @@ -62,7 +62,7 @@ private String expectedPresentValue(TargetTestingModel targetModel) { */ private boolean presentValueIs(TargetTestingModel targetModel) { String pointName = targetModel.target_point; - List messages = popReceivedEvents(PointsetEvent.class); + List messages = getReceivedEvents(PointsetEvent.class); for (PointsetEvent pointsetEvent : messages) { if (pointsetEvent.points.get(pointName) != null && pointsetEvent.points.get(pointName).present_value == targetModel.target_value) { From d202dd78e1a729a6c3aceb8cc88d0243c6bcb5b7 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Sat, 10 Dec 2022 14:59:06 -0800 Subject: [PATCH 3/7] Update test_itemited --- etc/test_itemized.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/test_itemized.out b/etc/test_itemized.out index 1e40bb928a..43efceb436 100644 --- a/etc/test_itemized.out +++ b/etc/test_itemized.out @@ -1,2 +1,2 @@ -TEST writeback_success_state noWriteback RESULT fail writeback_success_state timeout nothing -TEST writeback_success_apply noPointState RESULT pass writeback_success_apply Sequence complete +TEST writeback_success noWriteback RESULT fail writeback_success timeout nothing +TEST writeback_success noPointState RESULT fail writeback_success timeout nothing From 4db10262051af46d8169723884575762063f299e Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Sat, 10 Dec 2022 14:59:36 -0800 Subject: [PATCH 4/7] Results --- etc/sequencer.out | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/etc/sequencer.out b/etc/sequencer.out index 3eb7691366..b079b2ded2 100644 --- a/etc/sequencer.out +++ b/etc/sequencer.out @@ -13,7 +13,6 @@ RESULT pass valid_serial_no Sequence complete RESULT pass valid_serial_no Sequence complete RESULT pass valid_serial_no Sequence complete RESULT pass valid_serial_no Sequence complete -RESULT pass writeback_failure_state Sequence complete -RESULT pass writeback_invalid_state Sequence complete -RESULT pass writeback_success_apply Sequence complete -RESULT pass writeback_success_state Sequence complete +RESULT pass writeback_failure Sequence complete +RESULT pass writeback_invalid Sequence complete +RESULT pass writeback_success Sequence complete From 8b43dda1dafac2384427e764b9a0188e6d61b918 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Sat, 10 Dec 2022 15:01:05 -0800 Subject: [PATCH 5/7] Updating test_itemized --- bin/test_itemized | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/test_itemized b/bin/test_itemized index 3df12eee32..cc8688e913 100755 --- a/bin/test_itemized +++ b/bin/test_itemized @@ -1,5 +1,8 @@ #!/bin/bash -e +ROOT_DIR=$(dirname $0)/.. +cd $ROOT_DIR + if [[ $# != 1 ]]; then echo Usage: $0 PROJECT_ID false @@ -10,8 +13,8 @@ shift 1 SITE_PATH=sites/udmi_site_model DEVICE_ID=AHU-1 -PUBBER_OUT=/tmp/pubber.log -SEQUENCER_OUT=/tmp/sequencer.log +PUBBER_OUT=pubber.out +SEQUENCER_OUT=sequencer.out RESULTS_OUT=/tmp/test_itemized.out GOLDEN_FILE=etc/test_itemized.out From 1b8ff863d047db1f4cf11372ad9db31bc9a87a62 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Sat, 10 Dec 2022 17:53:21 -0800 Subject: [PATCH 6/7] Gencode run --- docs/specs/sequences/generated.md | 12 +++++------- validator/sequences/broken_config/sequence.md | 7 +++---- validator/sequences/system_min_loglevel/sequence.md | 3 +-- validator/sequences/system_mode_restart/sequence.md | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/specs/sequences/generated.md b/docs/specs/sequences/generated.md index c5d55d8676..deff86e487 100644 --- a/docs/specs/sequences/generated.md +++ b/docs/specs/sequences/generated.md @@ -52,17 +52,16 @@ Check that the device correctly handles a broken (non-json) config message. 1. Wait for no interesting status 1. Wait for state synchronized 1. Check that initial stable_config matches last_config -1. Wait for log category `system.config.apply` level `NOTICE` 1. Wait for log category `system.config.receive` level `DEBUG` 1. Wait for has interesting status 1. Wait for log category `system.config.parse` level `ERROR` +1. Check has not logged category `system.config.apply` level `NOTICE` (**incomplete!**) 1. Force reset config -1. Update config before no interesting status: - * Add `system.last_start` = `device reported` - * Set `system.min_loglevel` = `100` +1. Wait for log category `system.config.receive` level `DEBUG` 1. Wait for no interesting status 1. Wait for last_config updated 1. Wait for log category `system.config.apply` level `NOTICE` +1. Wait for log category `system.config.parse` level `DEBUG` ## device_config_acked @@ -146,8 +145,7 @@ Check that last_update state is correctly set in response to a config update. Check that the min log-level config is honored by the device. -1. Wait for log category `system.config.apply` level `NOTICE` -1. Check that device config resolved within 10s +1. Check has not logged category `system.config.apply` level `NOTICE` (**incomplete!**) 1. Update config: * Set `system.min_loglevel` = `400` 1. Update config before log category `system.config.apply` level `NOTICE`: @@ -168,7 +166,7 @@ Restart and connect to same endpoint and expect it returns. 1. Update config before deviceState.system.mode == ACTIVE: * Set `system.mode` = `active` 1. Wait for deviceState.system.mode == ACTIVE -1. Wait for last_config is newer than previous last_config after abort +1. Wait for last_config is newer than previous last_config 1. Wait for last_start is newer than previous last_start ## valid_serial_no diff --git a/validator/sequences/broken_config/sequence.md b/validator/sequences/broken_config/sequence.md index 043e93d099..62781c53ee 100644 --- a/validator/sequences/broken_config/sequence.md +++ b/validator/sequences/broken_config/sequence.md @@ -8,14 +8,13 @@ Check that the device correctly handles a broken (non-json) config message. 1. Wait for no interesting status 1. Wait for state synchronized 1. Check that initial stable_config matches last_config -1. Wait for log category `system.config.apply` level `NOTICE` 1. Wait for log category `system.config.receive` level `DEBUG` 1. Wait for has interesting status 1. Wait for log category `system.config.parse` level `ERROR` +1. Check has not logged category `system.config.apply` level `NOTICE` (**incomplete!**) 1. Force reset config -1. Update config before no interesting status: - * Add `system.last_start` = `device reported` - * Set `system.min_loglevel` = `100` +1. Wait for log category `system.config.receive` level `DEBUG` 1. Wait for no interesting status 1. Wait for last_config updated 1. Wait for log category `system.config.apply` level `NOTICE` +1. Wait for log category `system.config.parse` level `DEBUG` diff --git a/validator/sequences/system_min_loglevel/sequence.md b/validator/sequences/system_min_loglevel/sequence.md index 244bcbd1bf..a54f56543a 100644 --- a/validator/sequences/system_min_loglevel/sequence.md +++ b/validator/sequences/system_min_loglevel/sequence.md @@ -3,8 +3,7 @@ Check that the min log-level config is honored by the device. -1. Wait for log category `system.config.apply` level `NOTICE` -1. Check that device config resolved within 10s +1. Check has not logged category `system.config.apply` level `NOTICE` (**incomplete!**) 1. Update config: * Set `system.min_loglevel` = `400` 1. Update config before log category `system.config.apply` level `NOTICE`: diff --git a/validator/sequences/system_mode_restart/sequence.md b/validator/sequences/system_mode_restart/sequence.md index 0c78bed83e..a571c546b2 100644 --- a/validator/sequences/system_mode_restart/sequence.md +++ b/validator/sequences/system_mode_restart/sequence.md @@ -13,5 +13,5 @@ Restart and connect to same endpoint and expect it returns. 1. Update config before deviceState.system.mode == ACTIVE: * Set `system.mode` = `active` 1. Wait for deviceState.system.mode == ACTIVE -1. Wait for last_config is newer than previous last_config after abort +1. Wait for last_config is newer than previous last_config 1. Wait for last_start is newer than previous last_start From 340ca3e07f58331568b2da44cd9e7981d7b18227 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Sun, 11 Dec 2022 10:45:14 -0800 Subject: [PATCH 7/7] Removing stray file --- add | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 add diff --git a/add b/add deleted file mode 100644 index e69de29bb2..0000000000