faucetsdn · grafnu · Dec 12, 2022 · Dec 10, 2022 · Dec 10, 2022 · Dec 10, 2022
diff --git a/add b/add
diff --git 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
 

diff --git 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
 
@@ -174,30 +173,26 @@ Restart and connect to same endpoint and expect it returns.
 
 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/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
diff --git 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
diff --git a/...teback_failure_state/config_pointset.attr → ...es/writeback_failure/config_pointset.attr b/...teback_failure_state/config_pointset.attr → ...es/writeback_failure/config_pointset.attr
diff --git a/...teback_failure_state/config_pointset.json → ...es/writeback_failure/config_pointset.json b/...teback_failure_state/config_pointset.json → ...es/writeback_failure/config_pointset.json
diff --git a/...riteback_failure_state/config_system.attr → ...nces/writeback_failure/config_system.attr b/...riteback_failure_state/config_system.attr → ...nces/writeback_failure/config_system.attr
diff --git a/...riteback_failure_state/config_system.json → ...nces/writeback_failure/config_system.json b/...riteback_failure_state/config_system.json → ...nces/writeback_failure/config_system.json
diff --git a/...riteback_failure_state/config_update.attr → ...nces/writeback_failure/config_update.attr b/...riteback_failure_state/config_update.attr → ...nces/writeback_failure/config_update.attr
diff --git a/...riteback_failure_state/config_update.json → ...nces/writeback_failure/config_update.json b/...riteback_failure_state/config_update.json → ...nces/writeback_failure/config_update.json
diff --git a/...iteback_failure_state/event_pointset.attr → ...ces/writeback_failure/event_pointset.attr b/...iteback_failure_state/event_pointset.attr → ...ces/writeback_failure/event_pointset.attr
diff --git a/...iteback_failure_state/event_pointset.json → ...ces/writeback_failure/event_pointset.json b/...iteback_failure_state/event_pointset.json → ...ces/writeback_failure/event_pointset.json
diff --git a/...writeback_failure_state/event_system.attr → ...ences/writeback_failure/event_system.attr b/...writeback_failure_state/event_system.attr → ...ences/writeback_failure/event_system.attr
diff --git a/...writeback_failure_state/event_system.json → ...ences/writeback_failure/event_system.json b/...writeback_failure_state/event_system.json → ...ences/writeback_failure/event_system.json
diff --git a/...iteback_failure_state/local_pointset.json → ...ces/writeback_failure/local_pointset.json b/...iteback_failure_state/local_pointset.json → ...ces/writeback_failure/local_pointset.json
diff --git a/...writeback_failure_state/local_system.json → ...ences/writeback_failure/local_system.json b/...writeback_failure_state/local_system.json → ...ences/writeback_failure/local_system.json
diff --git a/...writeback_failure_state/local_update.json → ...ences/writeback_failure/local_update.json b/...writeback_failure_state/local_update.json → ...ences/writeback_failure/local_update.json
diff --git a/...ences/writeback_failure_state/sequence.md → ...r/sequences/writeback_failure/sequence.md b/...ences/writeback_failure_state/sequence.md → ...r/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/...ces/writeback_failure_state/sequencer.log → ...sequences/writeback_failure/sequencer.log b/...ces/writeback_failure_state/sequencer.log → ...sequences/writeback_failure/sequencer.log
diff --git a/...iteback_failure_state/state_pointset.attr → ...ces/writeback_failure/state_pointset.attr b/...iteback_failure_state/state_pointset.attr → ...ces/writeback_failure/state_pointset.attr
diff --git a/...iteback_failure_state/state_pointset.json → ...ces/writeback_failure/state_pointset.json b/...iteback_failure_state/state_pointset.json → ...ces/writeback_failure/state_pointset.json
diff --git a/...writeback_failure_state/state_system.attr → ...ences/writeback_failure/state_system.attr b/...writeback_failure_state/state_system.attr → ...ences/writeback_failure/state_system.attr
diff --git a/...writeback_failure_state/state_system.json → ...ences/writeback_failure/state_system.json b/...writeback_failure_state/state_system.json → ...ences/writeback_failure/state_system.json
diff --git a/...writeback_failure_state/state_update.attr → ...ences/writeback_failure/state_update.attr b/...writeback_failure_state/state_update.attr → ...ences/writeback_failure/state_update.attr
diff --git a/...writeback_failure_state/state_update.json → ...ences/writeback_failure/state_update.json b/...writeback_failure_state/state_update.json → ...ences/writeback_failure/state_update.json
diff --git a/...uences/writeback_failure_state/system.log → ...or/sequences/writeback_failure/system.log b/...uences/writeback_failure_state/system.log → ...or/sequences/writeback_failure/system.log
diff --git a/...teback_invalid_state/config_pointset.attr → ...es/writeback_invalid/config_pointset.attr b/...teback_invalid_state/config_pointset.attr → ...es/writeback_invalid/config_pointset.attr
diff --git a/...teback_invalid_state/config_pointset.json → ...es/writeback_invalid/config_pointset.json b/...teback_invalid_state/config_pointset.json → ...es/writeback_invalid/config_pointset.json
diff --git a/...riteback_invalid_state/config_system.attr → ...nces/writeback_invalid/config_system.attr b/...riteback_invalid_state/config_system.attr → ...nces/writeback_invalid/config_system.attr
diff --git a/...riteback_invalid_state/config_system.json → ...nces/writeback_invalid/config_system.json b/...riteback_invalid_state/config_system.json → ...nces/writeback_invalid/config_system.json
diff --git a/...riteback_invalid_state/config_update.attr → ...nces/writeback_invalid/config_update.attr b/...riteback_invalid_state/config_update.attr → ...nces/writeback_invalid/config_update.attr
diff --git a/...riteback_invalid_state/config_update.json → ...nces/writeback_invalid/config_update.json b/...riteback_invalid_state/config_update.json → ...nces/writeback_invalid/config_update.json
diff --git a/...iteback_invalid_state/event_pointset.attr → ...ces/writeback_invalid/event_pointset.attr b/...iteback_invalid_state/event_pointset.attr → ...ces/writeback_invalid/event_pointset.attr
diff --git a/...iteback_invalid_state/event_pointset.json → ...ces/writeback_invalid/event_pointset.json b/...iteback_invalid_state/event_pointset.json → ...ces/writeback_invalid/event_pointset.json
diff --git a/...writeback_invalid_state/event_system.attr → ...ences/writeback_invalid/event_system.attr b/...writeback_invalid_state/event_system.attr → ...ences/writeback_invalid/event_system.attr
diff --git a/...writeback_invalid_state/event_system.json → ...ences/writeback_invalid/event_system.json b/...writeback_invalid_state/event_system.json → ...ences/writeback_invalid/event_system.json
diff --git a/...iteback_invalid_state/local_pointset.json → ...ces/writeback_invalid/local_pointset.json b/...iteback_invalid_state/local_pointset.json → ...ces/writeback_invalid/local_pointset.json
diff --git a/...writeback_invalid_state/local_system.json → ...ences/writeback_invalid/local_system.json b/...writeback_invalid_state/local_system.json → ...ences/writeback_invalid/local_system.json
diff --git a/...writeback_invalid_state/local_update.json → ...ences/writeback_invalid/local_update.json b/...writeback_invalid_state/local_update.json → ...ences/writeback_invalid/local_update.json
diff --git a/...ences/writeback_invalid_state/sequence.md → ...r/sequences/writeback_invalid/sequence.md b/...ences/writeback_invalid_state/sequence.md → ...r/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/...ces/writeback_invalid_state/sequencer.log → ...sequences/writeback_invalid/sequencer.log b/...ces/writeback_invalid_state/sequencer.log → ...sequences/writeback_invalid/sequencer.log
diff --git a/...iteback_invalid_state/state_pointset.attr → ...ces/writeback_invalid/state_pointset.attr b/...iteback_invalid_state/state_pointset.attr → ...ces/writeback_invalid/state_pointset.attr
diff --git a/...iteback_invalid_state/state_pointset.json → ...ces/writeback_invalid/state_pointset.json b/...iteback_invalid_state/state_pointset.json → ...ces/writeback_invalid/state_pointset.json
diff --git a/...writeback_invalid_state/state_system.attr → ...ences/writeback_invalid/state_system.attr b/...writeback_invalid_state/state_system.attr → ...ences/writeback_invalid/state_system.attr
diff --git a/...writeback_invalid_state/state_system.json → ...ences/writeback_invalid/state_system.json b/...writeback_invalid_state/state_system.json → ...ences/writeback_invalid/state_system.json
diff --git a/...writeback_invalid_state/state_update.attr → ...ences/writeback_invalid/state_update.attr b/...writeback_invalid_state/state_update.attr → ...ences/writeback_invalid/state_update.attr
diff --git a/...writeback_invalid_state/state_update.json → ...ences/writeback_invalid/state_update.json b/...writeback_invalid_state/state_update.json → ...ences/writeback_invalid/state_update.json
diff --git a/...uences/writeback_invalid_state/system.log → ...or/sequences/writeback_invalid/system.log b/...uences/writeback_invalid_state/system.log → ...or/sequences/writeback_invalid/system.log
diff --git a/...teback_success_apply/config_pointset.attr → ...es/writeback_success/config_pointset.attr b/...teback_success_apply/config_pointset.attr → ...es/writeback_success/config_pointset.attr
diff --git a/...teback_success_state/config_pointset.json → ...es/writeback_success/config_pointset.json b/...teback_success_state/config_pointset.json → ...es/writeback_success/config_pointset.json
diff --git a/...riteback_success_apply/config_system.attr → ...nces/writeback_success/config_system.attr b/...riteback_success_apply/config_system.attr → ...nces/writeback_success/config_system.attr
diff --git a/...riteback_success_state/config_system.json → ...nces/writeback_success/config_system.json b/...riteback_success_state/config_system.json → ...nces/writeback_success/config_system.json
diff --git a/...riteback_success_apply/config_update.attr → ...nces/writeback_success/config_update.attr b/...riteback_success_apply/config_update.attr → ...nces/writeback_success/config_update.attr
diff --git a/...riteback_success_state/config_update.json → ...nces/writeback_success/config_update.json b/...riteback_success_state/config_update.json → ...nces/writeback_success/config_update.json
diff --git a/...iteback_success_apply/event_pointset.attr → ...ces/writeback_success/event_pointset.attr b/...iteback_success_apply/event_pointset.attr → ...ces/writeback_success/event_pointset.attr
diff --git a/...iteback_success_state/event_pointset.json → ...ces/writeback_success/event_pointset.json b/...iteback_success_state/event_pointset.json → ...ces/writeback_success/event_pointset.json
diff --git a/...writeback_success_apply/event_system.attr → ...ences/writeback_success/event_system.attr b/...writeback_success_apply/event_system.attr → ...ences/writeback_success/event_system.attr
diff --git a/...writeback_success_state/event_system.json → ...ences/writeback_success/event_system.json b/...writeback_success_state/event_system.json → ...ences/writeback_success/event_system.json
diff --git a/...iteback_success_apply/local_pointset.json → ...ces/writeback_success/local_pointset.json b/...iteback_success_apply/local_pointset.json → ...ces/writeback_success/local_pointset.json
diff --git a/...writeback_success_state/local_system.json → ...ences/writeback_success/local_system.json b/...writeback_success_state/local_system.json → ...ences/writeback_success/local_system.json
diff --git a/...writeback_success_state/local_update.json → ...ences/writeback_success/local_update.json b/...writeback_success_state/local_update.json → ...ences/writeback_success/local_update.json
diff --git a/...ences/writeback_success_state/sequence.md → ...r/sequences/writeback_success/sequence.md b/...ences/writeback_success_state/sequence.md → ...r/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/...ces/writeback_success_state/sequencer.log → ...sequences/writeback_success/sequencer.log b/...ces/writeback_success_state/sequencer.log → ...sequences/writeback_success/sequencer.log
diff --git a/...iteback_success_apply/state_pointset.attr → ...ces/writeback_success/state_pointset.attr b/...iteback_success_apply/state_pointset.attr → ...ces/writeback_success/state_pointset.attr
diff --git a/...iteback_success_state/state_pointset.json → ...ces/writeback_success/state_pointset.json b/...iteback_success_state/state_pointset.json → ...ces/writeback_success/state_pointset.json
diff --git a/...writeback_success_apply/state_system.attr → ...ences/writeback_success/state_system.attr b/...writeback_success_apply/state_system.attr → ...ences/writeback_success/state_system.attr
diff --git a/...writeback_success_state/state_system.json → ...ences/writeback_success/state_system.json b/...writeback_success_state/state_system.json → ...ences/writeback_success/state_system.json
diff --git a/...writeback_success_apply/state_update.attr → ...ences/writeback_success/state_update.attr b/...writeback_success_apply/state_update.attr → ...ences/writeback_success/state_update.attr
diff --git a/...writeback_success_state/state_update.json → ...ences/writeback_success/state_update.json b/...writeback_success_state/state_update.json → ...ences/writeback_success/state_update.json
diff --git a/...uences/writeback_success_state/system.log → ...or/sequences/writeback_success/system.log b/...uences/writeback_success_state/system.log → ...or/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
diff --git a/validator/sequences/writeback_success_apply/config_system.json b/validator/sequences/writeback_success_apply/config_system.json
diff --git a/validator/sequences/writeback_success_apply/config_update.json b/validator/sequences/writeback_success_apply/config_update.json
diff --git a/validator/sequences/writeback_success_apply/event_pointset.json b/validator/sequences/writeback_success_apply/event_pointset.json
diff --git a/validator/sequences/writeback_success_apply/event_system.json b/validator/sequences/writeback_success_apply/event_system.json
diff --git a/validator/sequences/writeback_success_apply/local_system.json b/validator/sequences/writeback_success_apply/local_system.json
diff --git a/validator/sequences/writeback_success_apply/local_update.json b/validator/sequences/writeback_success_apply/local_update.json
diff --git a/validator/sequences/writeback_success_apply/sequence.md b/validator/sequences/writeback_success_apply/sequence.md