From c7153e307512d9a1e8eec9b28b1d3dd8ce78ed65 Mon Sep 17 00:00:00 2001 From: Karsten Sperling Date: Thu, 26 Sep 2024 16:39:21 +1200 Subject: [PATCH 1/2] Don't hardcode TBRM endpoint number in TC-TBRM-2.4 Fixes #35726 --- src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml index 4b358e1bd7575b..4835b9658d4e7f 100644 --- a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml @@ -21,6 +21,8 @@ PICS: config: nodeId: 0x12344321 + cluster: Thread Border Router Management + endpoint: 1 payload: "MT:-24J0AFN00KA0648G00" discriminator: 3840 @@ -70,8 +72,6 @@ tests: - label: "TH2 send GetActiveDatasetRequest command to the DUT in PASE session" identity: beta - cluster: Thread Border Router Management - endpoint: 1 command: GetActiveDatasetRequest response: error: UNSUPPORTED_ACCESS @@ -79,8 +79,6 @@ tests: - label: "TH2 send GetPendingDatasetRequest command to the DUT in PASE session" identity: beta - cluster: Thread Border Router Management - endpoint: 1 command: GetPendingDatasetRequest response: error: UNSUPPORTED_ACCESS From 902ce8d04945954c87c54287a917ffc3bee71589 Mon Sep 17 00:00:00 2001 From: Karsten Sperling Date: Thu, 26 Sep 2024 22:21:07 +1200 Subject: [PATCH 2/2] Fix Open Commissioning Window parameters Prefix Ecm-related test constants to avoid potential conflict with 'payload' test parameter. Use a setup payload that does not have a vendor ID baked in, and use a passcode and discriminator that differ from the default values for good measure. --- .../suites/certification/Test_TC_TBRM_2_4.yaml | 14 +++++++------- .../suites/certification/Test_TC_THNETDIR_2_3.yaml | 14 +++++++------- .../suites/certification/Test_TC_WIFINM_2_2.yaml | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml index 4835b9658d4e7f..80b34fb5905500 100644 --- a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml @@ -24,11 +24,11 @@ config: cluster: Thread Border Router Management endpoint: 1 - payload: "MT:-24J0AFN00KA0648G00" - discriminator: 3840 - PakeVerifier: + EcmPayload: "MT:00000EBQ15J.JP67600" + EcmDiscriminator: 3501 + EcmPakeVerifier: type: octet_string - defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf" + defaultValue: "hex:d0e8a02db8629e9d172dfd40719c89204ff395651a6a2612839a71469880ec2404687d05cf0642b91242c712b5405b6905070c2a4bd80bdc8437ae5a2aded0cf3de91318d16f0ce9450d1c802cc01f39b8761de87cc7eeeb7f52b51308353da49a" tests: - label: "Wait for the commissioned device to be retrieved" @@ -49,9 +49,9 @@ tests: - name: CommissioningTimeout value: 180 - name: PAKEPasscodeVerifier - value: PakeVerifier + value: EcmPakeVerifier - name: Discriminator - value: discriminator + value: EcmDiscriminator - name: Iterations value: 1000 - name: Salt @@ -67,7 +67,7 @@ tests: - name: nodeId value: nodeId - name: payload - value: payload + value: EcmPayload - label: "TH2 send GetActiveDatasetRequest command to the DUT in PASE session" diff --git a/src/app/tests/suites/certification/Test_TC_THNETDIR_2_3.yaml b/src/app/tests/suites/certification/Test_TC_THNETDIR_2_3.yaml index 9d7d4de6ee3ac8..2a5d0f16195d2d 100644 --- a/src/app/tests/suites/certification/Test_TC_THNETDIR_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_THNETDIR_2_3.yaml @@ -27,11 +27,11 @@ config: type: octet_string defaultValue: "hex:39758ec8144b07fb" - payload: "MT:-24J0AFN00KA0648G00" - discriminator: 3840 - PakeVerifier: + EcmPayload: "MT:00000EBQ15J.JP67600" + EcmDiscriminator: 3501 + EcmPakeVerifier: type: octet_string - defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf" + defaultValue: "hex:d0e8a02db8629e9d172dfd40719c89204ff395651a6a2612839a71469880ec2404687d05cf0642b91242c712b5405b6905070c2a4bd80bdc8437ae5a2aded0cf3de91318d16f0ce9450d1c802cc01f39b8761de87cc7eeeb7f52b51308353da49a" tests: - label: "Wait for the commissioned device to be retrieved" @@ -52,9 +52,9 @@ tests: - name: CommissioningTimeout value: 180 - name: PAKEPasscodeVerifier - value: PakeVerifier + value: EcmPakeVerifier - name: Discriminator - value: discriminator + value: EcmDiscriminator - name: Iterations value: 1000 - name: Salt @@ -70,7 +70,7 @@ tests: - name: nodeId value: nodeId - name: payload - value: payload + value: EcmPayload - label: "TH2 sends GetOperationalDataset command to the DUT over the PASE diff --git a/src/app/tests/suites/certification/Test_TC_WIFINM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_WIFINM_2_2.yaml index 774fb3ce050f1c..3d078f0e35e003 100644 --- a/src/app/tests/suites/certification/Test_TC_WIFINM_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_WIFINM_2_2.yaml @@ -28,11 +28,11 @@ config: type: octet_string defaultValue: "hex:39758ec8144b07fb" - payload: "MT:-24J0AFN00KA0648G00" - discriminator: 3840 - PakeVerifier: + EcmPayload: "MT:00000EBQ15J.JP67600" + EcmDiscriminator: 3501 + EcmPakeVerifier: type: octet_string - defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf" + defaultValue: "hex:d0e8a02db8629e9d172dfd40719c89204ff395651a6a2612839a71469880ec2404687d05cf0642b91242c712b5405b6905070c2a4bd80bdc8437ae5a2aded0cf3de91318d16f0ce9450d1c802cc01f39b8761de87cc7eeeb7f52b51308353da49a" tests: - label: "Wait for the commissioned device to be retrieved" @@ -53,9 +53,9 @@ tests: - name: CommissioningTimeout value: 180 - name: PAKEPasscodeVerifier - value: PakeVerifier + value: EcmPakeVerifier - name: Discriminator - value: discriminator + value: EcmDiscriminator - name: Iterations value: 1000 - name: Salt @@ -71,7 +71,7 @@ tests: - name: nodeId value: nodeId - name: payload - value: payload + value: EcmPayload - label: "TH2 sends the NetworkPassphraseRequest command to the DUT over the