Skip to content

Commit e6b726f

Browse files
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.
1 parent 4f5babd commit e6b726f

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml

+9-11
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ PICS:
2121

2222
config:
2323
nodeId: 0x12344321
24+
cluster: Thread Border Router Management
25+
endpoint: 1
2426

25-
payload: "MT:-24J0AFN00KA0648G00"
26-
discriminator: 3840
27-
PakeVerifier:
27+
EcmPayload: "MT:00000EBQ15J.JP67600"
28+
EcmDiscriminator: 3501
29+
EcmPakeVerifier:
2830
type: octet_string
29-
defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
31+
defaultValue: "hex:d0e8a02db8629e9d172dfd40719c89204ff395651a6a2612839a71469880ec2404687d05cf0642b91242c712b5405b6905070c2a4bd80bdc8437ae5a2aded0cf3de91318d16f0ce9450d1c802cc01f39b8761de87cc7eeeb7f52b51308353da49a"
3032

3133
tests:
3234
- label: "Wait for the commissioned device to be retrieved"
@@ -47,9 +49,9 @@ tests:
4749
- name: CommissioningTimeout
4850
value: 180
4951
- name: PAKEPasscodeVerifier
50-
value: PakeVerifier
52+
value: EcmPakeVerifier
5153
- name: Discriminator
52-
value: discriminator
54+
value: EcmDiscriminator
5355
- name: Iterations
5456
value: 1000
5557
- name: Salt
@@ -65,22 +67,18 @@ tests:
6567
- name: nodeId
6668
value: nodeId
6769
- name: payload
68-
value: payload
70+
value: EcmPayload
6971

7072
- label:
7173
"TH2 send GetActiveDatasetRequest command to the DUT in PASE session"
7274
identity: beta
73-
cluster: Thread Border Router Management
74-
endpoint: 1
7575
command: GetActiveDatasetRequest
7676
response:
7777
error: UNSUPPORTED_ACCESS
7878

7979
- label:
8080
"TH2 send GetPendingDatasetRequest command to the DUT in PASE session"
8181
identity: beta
82-
cluster: Thread Border Router Management
83-
endpoint: 1
8482
command: GetPendingDatasetRequest
8583
response:
8684
error: UNSUPPORTED_ACCESS

src/app/tests/suites/certification/Test_TC_THNETDIR_2_3.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ config:
2727
type: octet_string
2828
defaultValue: "hex:39758ec8144b07fb"
2929

30-
payload: "MT:-24J0AFN00KA0648G00"
31-
discriminator: 3840
32-
PakeVerifier:
30+
EcmPayload: "MT:00000EBQ15J.JP67600"
31+
EcmDiscriminator: 3501
32+
EcmPakeVerifier:
3333
type: octet_string
34-
defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
34+
defaultValue: "hex:d0e8a02db8629e9d172dfd40719c89204ff395651a6a2612839a71469880ec2404687d05cf0642b91242c712b5405b6905070c2a4bd80bdc8437ae5a2aded0cf3de91318d16f0ce9450d1c802cc01f39b8761de87cc7eeeb7f52b51308353da49a"
3535

3636
tests:
3737
- label: "Wait for the commissioned device to be retrieved"
@@ -52,9 +52,9 @@ tests:
5252
- name: CommissioningTimeout
5353
value: 180
5454
- name: PAKEPasscodeVerifier
55-
value: PakeVerifier
55+
value: EcmPakeVerifier
5656
- name: Discriminator
57-
value: discriminator
57+
value: EcmDiscriminator
5858
- name: Iterations
5959
value: 1000
6060
- name: Salt
@@ -70,7 +70,7 @@ tests:
7070
- name: nodeId
7171
value: nodeId
7272
- name: payload
73-
value: payload
73+
value: EcmPayload
7474

7575
- label:
7676
"TH2 sends GetOperationalDataset command to the DUT over the PASE

src/app/tests/suites/certification/Test_TC_WIFINM_2_2.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ config:
2828
type: octet_string
2929
defaultValue: "hex:39758ec8144b07fb"
3030

31-
payload: "MT:-24J0AFN00KA0648G00"
32-
discriminator: 3840
33-
PakeVerifier:
31+
EcmPayload: "MT:00000EBQ15J.JP67600"
32+
EcmDiscriminator: 3501
33+
EcmPakeVerifier:
3434
type: octet_string
35-
defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
35+
defaultValue: "hex:d0e8a02db8629e9d172dfd40719c89204ff395651a6a2612839a71469880ec2404687d05cf0642b91242c712b5405b6905070c2a4bd80bdc8437ae5a2aded0cf3de91318d16f0ce9450d1c802cc01f39b8761de87cc7eeeb7f52b51308353da49a"
3636

3737
tests:
3838
- label: "Wait for the commissioned device to be retrieved"
@@ -53,9 +53,9 @@ tests:
5353
- name: CommissioningTimeout
5454
value: 180
5555
- name: PAKEPasscodeVerifier
56-
value: PakeVerifier
56+
value: EcmPakeVerifier
5757
- name: Discriminator
58-
value: discriminator
58+
value: EcmDiscriminator
5959
- name: Iterations
6060
value: 1000
6161
- name: Salt
@@ -71,7 +71,7 @@ tests:
7171
- name: nodeId
7272
value: nodeId
7373
- name: payload
74-
value: payload
74+
value: EcmPayload
7575

7676
- label:
7777
"TH2 sends the NetworkPassphraseRequest command to the DUT over the

0 commit comments

Comments
 (0)