From f4d87d1fcdee0a229a96b087c7b1c84fd423e8f5 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Wed, 7 Dec 2022 12:21:17 -0500 Subject: [PATCH 1/4] x --- .../google/daq/mqtt/sequencer/sequences/BlobsetSequences.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java index f18f22d261..d22dd42381 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java @@ -47,7 +47,7 @@ private String generateEndpointConfigClientId() { private String generateEndpointConfigBase64Payload(String hostname) { String payload = String.format( - ENDPOINT_CONFIG_HOSTNAME_PAYLOAD, ENDPOINT_CONFIG_CLIENT_ID, hostname); + ENDPOINT_CONFIG_HOSTNAME_PAYLOAD, generateEndpointConfigClientId(), hostname); String base64Payload = Base64.getEncoder().encodeToString(payload.getBytes()); return SemanticValue.describe("endpoint_base64_payload", base64Payload); } From c0bd184d23a033dbd6fa8fc9e8203719bb7041c7 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Thu, 8 Dec 2022 08:51:11 -0500 Subject: [PATCH 2/4] x --- .../google/daq/mqtt/sequencer/sequences/BlobsetSequences.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java index d22dd42381..c5a0268428 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java @@ -99,7 +99,8 @@ public void endpoint_config_connection_success_reconnect() { return phase != null && phase.equals(BlobPhase.FINAL) && stateStatus.category.equals(SYSTEM_CONFIG_APPLY) - && stateStatus.level == Level.NOTICE.value(); + && stateStatus.level == Level.NOTICE.value() + && stateStatus.message.equals("success"); }); } From c146f573456cb5f04752ec54a696de9829d22d5b Mon Sep 17 00:00:00 2001 From: John Randolph Date: Thu, 8 Dec 2022 11:10:01 -0500 Subject: [PATCH 3/4] x --- .../daq/mqtt/sequencer/sequences/BlobsetSequences.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java index c5a0268428..740d4c1701 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java @@ -92,15 +92,15 @@ public void endpoint_config_connection_success_reconnect() { deviceConfig.blobset.blobs = new HashMap<>(); deviceConfig.blobset.blobs.put(SystemBlobsets.IOT_ENDPOINT_CONFIG.value(), config); - untilTrue("blobset entry config status is success", () -> { + untilTrue("blobset phase is FINAL and stateStatus is null", () -> { BlobPhase phase = deviceState.blobset.blobs.get( SystemBlobsets.IOT_ENDPOINT_CONFIG.value()).phase; - Entry stateStatus = deviceState.system.status; + // Successful reconnect sends a state message with empty Entry. + Entry stateStatus = deviceState.blobset.blobs.get( + SystemBlobsets.IOT_ENDPOINT_CONFIG.value()).status; return phase != null && phase.equals(BlobPhase.FINAL) - && stateStatus.category.equals(SYSTEM_CONFIG_APPLY) - && stateStatus.level == Level.NOTICE.value() - && stateStatus.message.equals("success"); + && (stateStatus == null); }); } From c44972afdb30135f5d3a99ad0754cc21d46eda93 Mon Sep 17 00:00:00 2001 From: John Randolph Date: Thu, 8 Dec 2022 11:18:15 -0500 Subject: [PATCH 4/4] x --- .../google/daq/mqtt/sequencer/sequences/BlobsetSequences.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java index 740d4c1701..a096ea77f9 100644 --- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java +++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/BlobsetSequences.java @@ -96,11 +96,11 @@ public void endpoint_config_connection_success_reconnect() { BlobPhase phase = deviceState.blobset.blobs.get( SystemBlobsets.IOT_ENDPOINT_CONFIG.value()).phase; // Successful reconnect sends a state message with empty Entry. - Entry stateStatus = deviceState.blobset.blobs.get( + Entry blobStateStatus = deviceState.blobset.blobs.get( SystemBlobsets.IOT_ENDPOINT_CONFIG.value()).status; return phase != null && phase.equals(BlobPhase.FINAL) - && (stateStatus == null); + && blobStateStatus == null; }); }