Skip to content

Commit

Permalink
Modified script Sep 06 (project-chip#22410)
Browse files Browse the repository at this point in the history
* Modified Manual and automation script
Test_TC_CC_4_5
Test_TC_CC_5_4
Test_TC_CC_7_5
Test_TC_DRLK_2_2
Test_TC_G_3_2
Test_TC_IDM_4_1
Test_TC_LTIME_1_1
Test_TC_LUNIT_1_1
Test_TC_LVL_2_3
Test_TC_LVL_8_1
Test_TC_OPCREDS_3_3
Test_TC_SC_4_7
Test_TC_ULABEL_3_1
Test_TC_OO_1_1
Test_TC_DGTHREAD_1_1
Test_TC_DGTHREAD_2_1

* Auto generated files

* Restyled by whitespace

* Modified DGTHREAD.S.F.00 PICS

* Auto generated files

* Modified CC scripts

* Auto generated files

* Modified scripts Sep 7
Test_TC_BIND_2_3.yaml
Test_TC_CADMIN_1_1.yaml
Test_TC_CADMIN_1_2.yaml
Test_TC_CADMIN_1_7.yaml
Test_TC_CADMIN_1_8.yaml
Test_TC_CADMIN_1_9.yaml
Test_TC_CADMIN_1_10.yaml
Test_TC_CADMIN_1_11.yaml
Test_TC_CADMIN_1_12.yaml
Test_TC_CADMIN_1_13.yaml
Test_TC_CADMIN_1_14.yaml
Test_TC_CADMIN_1_15.yaml
Test_TC_CADMIN_1_16.yaml
Test_TC_CADMIN_1_17.yaml
Test_TC_CADMIN_1_18.yaml
Test_TC_CNET_1_3.yaml
Test_TC_CNET_4_1.yaml
Test_TC_CNET_4_2.yaml
Test_TC_CNET_4_3.yaml
Test_TC_CNET_4_10.yaml
Test_TC_CNET_4_11.yaml
Test_TC_CNET_4_12.yaml
Test_TC_CNET_4_15.yaml
Test_TC_CNET_4_16.yaml
Test_TC_CNET_4_17.yaml
Test_TC_CNET_4_18.yaml
Test_TC_CNET_4_19.yaml
Test_TC_CNET_4_20.yaml
Test_TC_CNET_4_21.yaml
Test_TC_DA_1_1.yaml
Test_TC_DA_1_4.yaml
Test_TC_DA_1_6.yaml
Test_TC_DA_1_7.yaml
Test_TC_DD_1_5.yaml
Test_TC_DD_1_8.yaml
Test_TC_DD_1_9.yaml
Test_TC_DD_1_13.yaml
Test_TC_DD_2_1.yaml
Test_TC_DD_3_1.yaml
Test_TC_DD_3_5.yaml
Test_TC_DD_3_8.yaml
Test_TC_DD_3_9.yaml
Test_TC_DD_3_17.yaml
Test_TC_DD_3_19.yaml
Test_TC_DGGEN_3_1.yaml
Test_TC_DGTHREAD_3_1.yaml
Test_TC_DGTHREAD_3_2.yaml
Test_TC_DGTHREAD_3_3.yaml
Test_TC_DGTHREAD_3_4.yaml
Test_TC_DGWIFI_3_1.yaml
Test_TC_DGWIFI_3_2.yaml
Test_TC_IDM_6_1.yaml
Test_TC_IDM_6_2.yaml
Test_TC_IDM_8_1.yaml
Test_TC_OCC_2_4.yaml
Test_TC_OPCREDS_3_1.yaml
Test_TC_OPCREDS_3_4.yaml
Test_TC_OPCREDS_3_5.yaml
Test_TC_PS_2_2.yaml
Test_TC_PSCFG_2_2.yaml
Test_TC_ULABEL_3_1.yaml
Test_TC_WNCV_5_1.yaml
Test_TC_WNCV_7_1.yaml

* Auto generated files

* Restyled by whitespace

* Modified DGGEN-2.2 Manual script

* Modified CC and DRLK-2.9 script

* Auto generated files

* Fixed issue project-chip#2216 and project-chip#2219

* Auto generated files

Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
2 people authored and isiu-apple committed Sep 16, 2022
1 parent c13f3a5 commit 94fe272
Show file tree
Hide file tree
Showing 99 changed files with 2,874 additions and 2,979 deletions.
9 changes: 3 additions & 6 deletions src/app/tests/suites/certification/PICS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3077,9 +3077,6 @@ PICS:
- label: "Is the device a barrier access device?"
id: MCORE.DD.DEV_BARRIER

- label: "Does the device have a vendor specific information element (IE)?"
id: MCORE.DD.IE

- label:
"Does the device or device packaging have a QR code based onboarding
payload?"
Expand Down Expand Up @@ -3724,10 +3721,10 @@ PICS:
id: DGTHREAD.S.A0039

- label: "Does the DUT-server support the Delay attribute?"
id: DGTHREAD.S.A003a
id: DGTHREAD.S.A003A

- label: "Does the DUT-server support the SecurityPolicy attribute?"
id: DGTHREAD.S.A003b
id: DGTHREAD.S.A003B

- label: "Does the DUT-server support the ChannelPage0Mask attribute?"
id: DGTHREAD.S.A003c
Expand Down Expand Up @@ -5568,4 +5565,4 @@ PICS:
id: MCORE.IDM.C.SubscribeRequest.MultipleAttributes

- label: "Does the device support the Factory Reset Method?"
id: MCORE.UI.FACTORYRESET
id: PICS_MCORE_UI_FACTORYRESET
43 changes: 23 additions & 20 deletions src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,29 @@ tests:
"TH1 writes Binding entry into DUT with Entry 1: Group = The Group ID
in the AddGroup command sent from TH1 to TH2"
verification: |
Before write the binding entries run the ACL Commands:
Run this cmmd for [ nRF52840-DK ]Thread device in chip-tool:
./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null },{"fabricIndex": 1, "privilege": 4, "authMode": 3, "subjects": [1], "targets": null }]" 74 0
On TH1(Chip-tool), Verify the success response for Acl:
[1659075680.943991][2687:2692] CHIP:DMG: StatusIB =
[1659075680.944052][2687:2692] CHIP:DMG: {
[1659075680.944116][2687:2692] CHIP:DMG: status = 0x00 (SUCCESS),
Run this cmmd for lighting app in chip-tool:
./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null },{"fabricIndex": 1, "privilege": 4, "authMode": 3, "subjects": [1], "targets": null }]" 2 0
On TH1(Chip-tool), Verify the success response for Acl:
[1659075680.943991][2687:2692] CHIP:DMG: StatusIB =
[1659075680.944052][2687:2692] CHIP:DMG: {
[1659075680.944116][2687:2692] CHIP:DMG: status = 0x00 (SUCCESS),
Run this cmmd for [ nRF52840-DK ]Thread device in chip-tool:
./chip-tool binding write binding "[{"group" : "0x0001"}]" 74 1
Expand All @@ -248,26 +271,6 @@ tests:
entries"
PICS: OO.C.C01.Tx
verification: |
Run this cmmd for [ nRF52840-DK ]Thread device in chip-tool:
./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null },{"fabricIndex": 1, "privilege": 4, "authMode": 3, "subjects": [1], "targets": null }]" 74 0
On TH1(Chip-tool), Verify the success response for Acl:
[1659075680.943991][2687:2692] CHIP:DMG: StatusIB =
[1659075680.944052][2687:2692] CHIP:DMG: {
[1659075680.944116][2687:2692] CHIP:DMG: status = 0x00 (SUCCESS),
Run this cmmd for lighting app in chip-tool:
./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null },{"fabricIndex": 1, "privilege": 4, "authMode": 3, "subjects": [1], "targets": null }]" 2 0
On TH1(Chip-tool), Verify the success response for Acl:
[1659075680.943991][2687:2692] CHIP:DMG: StatusIB =
[1659075680.944052][2687:2692] CHIP:DMG: {
[1659075680.944116][2687:2692] CHIP:DMG: status = 0x00 (SUCCESS),
Press button no.2 on nrf52840 DK thread board
disabled: true

Expand Down
241 changes: 125 additions & 116 deletions src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml

Large diffs are not rendered by default.

57 changes: 0 additions & 57 deletions src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,63 +71,6 @@ tests:
- name: "nodeId"
value: nodeId

- label:
"Open commissioning window exactly like we plan to later to verify
that `correctPayload` can in fact commision the device."
cluster: "AdministratorCommissioning"
command: "OpenBasicCommissioningWindow"
PICS: CADMIN.S.C01.Rsp
timedInteractionTimeoutMs: 10000
arguments:
values:
- name: "CommissioningTimeout"
value: 900

- label:
"Temporarily commission device with `correctPayload` just like we will
try to later"
identity: "beta"
cluster: "CommissionerCommands"
command: "PairWithCode"
# Only run this if we ran the previous step.
PICS: CADMIN.S && CADMIN.S.C01.Rsp
arguments:
values:
- name: "nodeId"
value: nodeId2
- name: "payload"
value: correctPayload

- label: "Wait for a CASE session"
identity: "beta"
cluster: "DelayCommands"
command: "WaitForCommissionee"
PICS: CADMIN.S
arguments:
values:
- name: "nodeId"
value: nodeId2

- label: "Read FabricIndex of beta so we can delete the temp fabric"
identity: "beta"
cluster: "Operational Credentials"
command: "readAttribute"
attribute: "CurrentFabricIndex"
# Only run this if we commissioned the device.
PICS: CADMIN.S.C01.Rsp
response:
saveAs: tempFabricIndex

- label: "Remove the temp fabric"
cluster: "Operational Credentials"
command: "RemoveFabric"
# Only run this if we commissioned the device.
PICS: CADMIN.S.C01.Rsp
arguments:
values:
- name: "FabricIndex"
value: tempFabricIndex

- label: "TH_CR1 opens a commissioning window on DUT_CE"
cluster: "AdministratorCommissioning"
command: "OpenBasicCommissioningWindow"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ tests:
- name: "nodeId"
value: nodeId2
- name: "payload"
value: payload --commissioner-name beta
value: payload

- label: "DUT_CE is commissioned to TH_CR2"
PICS: CADMIN.S
Expand Down
Loading

0 comments on commit 94fe272

Please sign in to comment.