Updates to discovery schema and capabilities (#824)

faucetsdn · Mar 4, 2024 · cf44816 · cf44816
1 parent b6218e6
commit cf44816
Show file tree

Hide file tree

Showing 160 changed files with 3,958 additions and 4,009 deletions.
diff --git a/.gencode_hash.txt b/.gencode_hash.txt
diff --git a/docs/specs/sequences/generated.md b/docs/specs/sequences/generated.md
@@ -49,10 +49,9 @@ Some caveats:
 * [gateway_attach_handling](#gateway_attach_handling-preview): Check adequate logging for gateway detach, errors, and reattach
 * [gateway_proxy_events](#gateway_proxy_events-beta): Check that a gateway proxies pointset events for indicated devices
 * [pointset_publish](#pointset_publish-beta): Check that a device publishes pointset events
-* [pointset_publish_interval](#pointset_publish_interval-beta): Check handling of sample rate and sample limit sec
+* [pointset_publish_interval](#pointset_publish_interval-beta): Check handling of sample_rate_sec and sample_limit_sec
 * [pointset_remove_point](#pointset_remove_point-beta): Check that pointset state does not report an unconfigured point
 * [pointset_request_extraneous](#pointset_request_extraneous-beta): Check error when pointset configuration contains extraneous point
-* [pointset_sample_rate](#pointset_sample_rate-beta): Check that a device publishes pointset events not faster than config sample_rate_sec
 * [state_make_model](#state_make_model-beta): Check that a device publishes correct make and model information in state messages
 * [state_software](#state_software-beta): Check that a device publishes correct software information in state messages
 * [system_last_update](#system_last_update-stable): Check that last_update state is correctly set in response to a config update.
@@ -308,7 +307,7 @@ Check that a device publishes pointset events
 
 ## pointset_publish_interval (BETA)
 
-Check handling of sample rate and sample limit sec
+Check handling of sample_rate_sec and sample_limit_sec
 
 1. Update config before receive at least 4 pointset events:
  * Add `pointset.sample_rate_sec` = `8`
@@ -355,17 +354,6 @@ Check error when pointset configuration contains extraneous point
 1. Wait for pointset state reports same points as defined in config
 1. Wait for pointset event contains correct points with present_value
 
-## pointset_sample_rate (BETA)
-
-Check that a device publishes pointset events not faster than config sample_rate_sec
-
-1. Wait for measure initial sample rate
-1. Update config before receive at least 5 pointset events:
- * Add `pointset.sample_rate_sec` = `5`
- * Add `pointset.sample_limit_sec` = `1`
-1. Wait for receive at least 5 pointset events
-1. Check that time period between successive pointset events is between 1 and 5 seconds
-
 ## state_make_model (BETA)
 
 Check that a device publishes correct make and model information in state messages

diff --git a/etc/schema_itemized.out b/etc/schema_itemized.out
@@ -9,7 +9,7 @@
 07 valid_serial_no RESULT pass schemas state_update_beta BETA 5/5 Schema validation passed
 08 writeback_success
 09 writeback_success
-10 pointset_sample_rate
+10 pointset_publish_interval
 11 system_mode_restart
 12 config_logging
 13 broken_config

diff --git a/etc/sequencer.out b/etc/sequencer.out
@@ -19,7 +19,6 @@ RESULT pass pointset pointset_publish BETA 5/5 Sequence complete
 RESULT pass pointset pointset_publish_interval BETA 5/5 Sequence complete
 RESULT pass pointset pointset_remove_point BETA 5/5 Sequence complete
 RESULT pass pointset pointset_request_extraneous BETA 5/5 Sequence complete
-RESULT pass pointset pointset_sample_rate BETA 5/5 Sequence complete
 RESULT pass system broken_config BETA 5/5 Sequence complete
 CPBLTY pass system broken_config.logging ALPHA 1/1 Capability functional
 RESULT pass system config_logging BETA 5/5 Sequence complete

diff --git a/etc/sequencer_nostate.out b/etc/sequencer_nostate.out
@@ -12,7 +12,6 @@ RESULT pass pointset pointset_publish BETA 5/5 Sequence complete
 RESULT pass pointset pointset_publish_interval BETA 5/5 Sequence complete
 RESULT skip pointset pointset_remove_point BETA 0/0 State testing disabled
 RESULT skip pointset pointset_request_extraneous BETA 0/0 State testing disabled
-RESULT skip pointset pointset_sample_rate BETA 0/0 State testing disabled
 RESULT skip system broken_config BETA 0/1 State testing disabled
 CPBLTY skip system broken_config.logging ALPHA 0/1 Never executed
 RESULT skip system config_logging BETA 0/0 State testing disabled

diff --git a/etc/test_itemized.in b/etc/test_itemized.in
@@ -7,7 +7,7 @@ TEST feature_enumeration featureEnableSwap
 TEST valid_serial_no noLastStart
 TEST writeback_success noWriteback
 TEST writeback_success noPointState
-TEST pointset_sample_rate fixedSampleRate=10
+TEST pointset_publish_interval fixedSampleRate=10
 TEST system_mode_restart noPersist
 TEST config_logging badVersion
 TEST broken_config barfConfig

diff --git a/etc/test_itemized.out b/etc/test_itemized.out
@@ -7,7 +7,7 @@
 07 RESULT pass system valid_serial_no BETA 5/5 Sequence complete
 08 RESULT fail writeback writeback_success ALPHA 0/5 Timeout waiting for point filter_differential_pressure_setpoint to have value_state applied
 09 RESULT fail writeback writeback_success ALPHA 0/5 Timeout waiting for point filter_differential_pressure_setpoint to have value_state applied
-10 RESULT fail pointset pointset_sample_rate BETA 0/5 Failed check that time period between successive pointset events is between 1 and 5 seconds
+10 RESULT fail pointset pointset_publish_interval BETA 0/5 Failed check that time period between successive pointset events is between 5 and 8 seconds
 11 RESULT fail system.mode system_mode_restart ALPHA 0/5 Failed check that restart count increased by one
 12 RESULT fail system config_logging BETA 0/5 Bad version string number format
 13 CPBLTY pass system broken_config.logging ALPHA 1/1 Capability functional

diff --git a/gencode/docs/command_mapping.html b/gencode/docs/command_mapping.html
diff --git a/gencode/docs/config.html b/gencode/docs/config.html