From 480e64ed40362973aa4a075d52e9f76ecc6eae4b Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Wed, 30 Nov 2022 07:24:18 -0800 Subject: [PATCH 1/7] Clean out tests directory --- bin/test_sequencer | 2 ++ docs/specs/sequences/generated.md | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/test_sequencer b/bin/test_sequencer index e0e2d0ef6d..e16e6f0004 100755 --- a/bin/test_sequencer +++ b/bin/test_sequencer @@ -21,6 +21,8 @@ fi site_path=sites/udmi_site_model device_id=AHU-1 +rm -rf $site_path//out/devices/$device_id/tests + serial_no=sequencer-$RANDOM echo Using pubber with serial $serial_no diff --git a/docs/specs/sequences/generated.md b/docs/specs/sequences/generated.md index 51dd0d757f..59f0103172 100644 --- a/docs/specs/sequences/generated.md +++ b/docs/specs/sequences/generated.md @@ -58,8 +58,6 @@ Check that the device correctly handles a broken (non-json) config message. 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 log category `system.config.receive` level `DEBUG`: - * Add `system.last_start` = _device reported_ 1. Wait for log category `system.config.receive` level `DEBUG` 1. Wait for no interesting status 1. Wait for last_config updated From 3b7872579c8e9609dff66abdb78c1475b0fd56f7 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Wed, 30 Nov 2022 07:55:10 -0800 Subject: [PATCH 2/7] Add some debugging --- .../google/daq/mqtt/sequencer/sequences/ConfigSequences.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java index d422d37893..ded87bb908 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java @@ -78,7 +78,9 @@ public void broken_config() { hasLogged(SYSTEM_CONFIG_PARSE, Level.ERROR); hasNotLogged(SYSTEM_CONFIG_APPLY, SYSTEM_CONFIG_APPLY_LEVEL); resetConfig(); // clears extra_field + info("TAP BEFORE HAS LOGGED " + deviceConfig.system.last_start); hasLogged(SYSTEM_CONFIG_RECEIVE, SYSTEM_CONFIG_RECEIVE_LEVEL); + info("TAP AFTER HAS LOGGED " + deviceConfig.system.last_start); untilFalse("no interesting status", this::hasInterestingStatus); untilTrue("last_config updated", () -> !dateEquals(stableConfig, deviceState.system.last_config) From 45b2b45b1c28a907026f7910430189152fec704e Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Wed, 30 Nov 2022 07:56:09 -0800 Subject: [PATCH 3/7] Add some debugging --- .../main/java/com/google/daq/mqtt/sequencer/SequenceBase.java | 2 +- .../google/daq/mqtt/sequencer/sequences/ConfigSequences.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java index 9b8cdcb3a2..3bccd1095d 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java @@ -784,7 +784,7 @@ private void untilLoop(Supplier evaluator, String description) { waitingCondition = "nothing"; } - private void recordSequence(String step) { + protected void recordSequence(String step) { if (recordSequence) { sequenceMd.println("1. " + step); sequenceMd.flush(); diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java index ded87bb908..a1022e1bdc 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java @@ -78,9 +78,9 @@ public void broken_config() { hasLogged(SYSTEM_CONFIG_PARSE, Level.ERROR); hasNotLogged(SYSTEM_CONFIG_APPLY, SYSTEM_CONFIG_APPLY_LEVEL); resetConfig(); // clears extra_field - info("TAP BEFORE HAS LOGGED " + deviceConfig.system.last_start); + recordSequence("TAP BEFORE HAS LOGGED " + deviceConfig.system.last_start); hasLogged(SYSTEM_CONFIG_RECEIVE, SYSTEM_CONFIG_RECEIVE_LEVEL); - info("TAP AFTER HAS LOGGED " + deviceConfig.system.last_start); + recordSequence("TAP AFTER HAS LOGGED " + deviceConfig.system.last_start); untilFalse("no interesting status", this::hasInterestingStatus); untilTrue("last_config updated", () -> !dateEquals(stableConfig, deviceState.system.last_config) From 44c8ae082c67b5ac74cf596c3d3be70bfc233295 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Wed, 30 Nov 2022 08:26:45 -0800 Subject: [PATCH 4/7] Create empty system config if necessary --- .../java/com/google/daq/mqtt/sequencer/SequenceBase.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java index 3bccd1095d..770aac4bc9 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java @@ -372,7 +372,10 @@ private Config sanitizeConfig(Config deviceConfig) { if (!SemanticValue.isSemanticString(deviceConfig.version)) { deviceConfig.version = SemanticValue.describe("cloud udmi version", deviceConfig.version); } - if (deviceConfig.system != null && !(deviceConfig.system.last_start instanceof SemanticDate)) { + if (deviceConfig.system == null) { + deviceConfig.system = new SystemConfig(); + } + if (!(deviceConfig.system.last_start instanceof SemanticDate)) { deviceConfig.system.last_start = SemanticDate.describe("device reported", deviceConfig.system.last_start); } From 2bdffe717db8c570221f9019ee8e3002566c358d Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Wed, 30 Nov 2022 08:29:21 -0800 Subject: [PATCH 5/7] Remove logging --- .../google/daq/mqtt/sequencer/sequences/ConfigSequences.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java index a1022e1bdc..d422d37893 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java @@ -78,9 +78,7 @@ public void broken_config() { hasLogged(SYSTEM_CONFIG_PARSE, Level.ERROR); hasNotLogged(SYSTEM_CONFIG_APPLY, SYSTEM_CONFIG_APPLY_LEVEL); resetConfig(); // clears extra_field - recordSequence("TAP BEFORE HAS LOGGED " + deviceConfig.system.last_start); hasLogged(SYSTEM_CONFIG_RECEIVE, SYSTEM_CONFIG_RECEIVE_LEVEL); - recordSequence("TAP AFTER HAS LOGGED " + deviceConfig.system.last_start); untilFalse("no interesting status", this::hasInterestingStatus); untilTrue("last_config updated", () -> !dateEquals(stableConfig, deviceState.system.last_config) From 34e163d2093d3d3962dccc0d4eb72a8cd0635957 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Wed, 30 Nov 2022 08:35:17 -0800 Subject: [PATCH 6/7] Revert private access --- .../main/java/com/google/daq/mqtt/sequencer/SequenceBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java index 770aac4bc9..1d531a59ec 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java @@ -787,7 +787,7 @@ private void untilLoop(Supplier evaluator, String description) { waitingCondition = "nothing"; } - protected void recordSequence(String step) { + private void recordSequence(String step) { if (recordSequence) { sequenceMd.println("1. " + step); sequenceMd.flush(); From 9d3253b29cfd8d08607dd28f7b6c78672528f748 Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Wed, 30 Nov 2022 10:01:33 -0800 Subject: [PATCH 7/7] Fix double slash --- bin/test_sequencer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/test_sequencer b/bin/test_sequencer index e16e6f0004..fc0eb1a779 100755 --- a/bin/test_sequencer +++ b/bin/test_sequencer @@ -21,7 +21,7 @@ fi site_path=sites/udmi_site_model device_id=AHU-1 -rm -rf $site_path//out/devices/$device_id/tests +rm -rf $site_path/out/devices/$device_id/tests serial_no=sequencer-$RANDOM echo Using pubber with serial $serial_no