Don't hardcode TBRM endpoint number in TC-TBRM-2.4 (#35784)
* Don't hardcode TBRM endpoint number in TC-TBRM-2.4
Fixes #35726
* 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.
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 4b358e1..80b34fb 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,12 +21,14 @@
config:
nodeId: 0x12344321
+ 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"
@@ -47,9 +49,9 @@
- name: CommissioningTimeout
value: 180
- name: PAKEPasscodeVerifier
- value: PakeVerifier
+ value: EcmPakeVerifier
- name: Discriminator
- value: discriminator
+ value: EcmDiscriminator
- name: Iterations
value: 1000
- name: Salt
@@ -65,13 +67,11 @@
- name: nodeId
value: nodeId
- name: payload
- value: payload
+ value: EcmPayload
- 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 @@
- 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
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 9d7d4de..2a5d0f1 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 @@
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 @@
- 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 @@
- 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 774fb3c..3d078f0 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 @@
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 @@
- 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 @@
- name: nodeId
value: nodeId
- name: payload
- value: payload
+ value: EcmPayload
- label:
"TH2 sends the NetworkPassphraseRequest command to the DUT over the
