diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml index d2811820c14299..1b8aef66aa4404 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml @@ -42,6 +42,9 @@ config: incorrectSetupCodePayload: type: char_string defaultValue: "MT:-24J0AFN00I.0648G00" + PIXIT.CADMIN.CwDuration: + type: int16u + defaultValue: 180 tests: - label: "Precondition: Reset Devices to factory defaults" @@ -63,6 +66,17 @@ tests: value: "y" - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE" + cluster: "CommissionerCommands" + command: "PairWithCode" + PICS: CADMIN.S + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: correctPayload + + - label: "Step 1a: TH_CR1 commissioned with DUT_CE" cluster: "DelayCommands" command: "WaitForCommissionee" PICS: CADMIN.S @@ -79,9 +93,10 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 900 + value: PIXIT.CADMIN.CwDuration - label: "Step 2a: Waiting after opening commissioning window" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: @@ -89,27 +104,14 @@ tests: - name: "ms" value: waitAfterCommissioning - #Check for DNS-SD advertisement CM is not possible in YAML - label: "Step 3: Verify that the DNS-SD advertisement shows CM=1" - verification: | - On TH_CR1 send the below command - - ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp - + eth0 IPv6 2664ED6939FC373C _matterc._udp local - = eth0 IPv6 2664ED6939FC373C _matterc._udp local - hostname = [E45F010F27530000.local] - address = [fe80::e65f:1ff:fe0f:2753] - port = [5540] - txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"] - cluster: "LogCommands" - command: "UserPrompt" - PICS: PICS_SKIP_SAMPLE_APP - arguments: + PICS: CADMIN.S.C01.Rsp + cluster: "DiscoveryCommands" + command: "FindCommissionable" + response: values: - - name: "message" - value: "enter 'y' after success" - - name: "expectedValue" - value: "y" + - name: "commissioningMode" + value: 1 #As per issue https://github.com/CHIP-Specifications/chip-test-scripts/issues/495 adding --discover-once flag - label: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml index 71469309ace758..1fb1a118bbc453 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml @@ -35,6 +35,9 @@ config: payload: type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" + PIXIT.CADMIN.CwDuration: + type: int16u + defaultValue: 180 tests: - label: "Precondition: Reset Devices to factory defaults" @@ -56,6 +59,18 @@ tests: value: "y" - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE" + identity: "alpha" + cluster: "CommissionerCommands" + command: "PairWithCode" + PICS: CADMIN.S + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + + - label: "Step 1: TH_CR1 commissioned with DUT_CE" identity: "alpha" cluster: "DelayCommands" command: "WaitForCommissionee" @@ -74,9 +89,10 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - label: "Step 2a: Waiting after opening commissioning window" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: @@ -115,9 +131,10 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - label: "Step 4a: Waiting after opening commissioning window" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: @@ -200,29 +217,16 @@ tests: response: error: FAILURE - #Issue https://github.com/project-chip/connectedhomeip/issues/21999 - label: "Step 8b: TH_CR2 reads the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE" - PICS: BINFO.S.A0005 && PICS_USER_PROMPT - verification: | - Using TH_CR2 read attribute - - Verify read command fail as expected since the DUT_CE is no longer on the network on TH_CR2 (chip-tool) log - - ./chip-tool basicinformation read node-label 2 0 --commissioner-name beta - - [1678876803.495007][714337:714339] CHIP:SC: Received error (protocol code 1) during pairing process: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1727: CHIP Error 0x000000C9: No shared trusted root - [1678876803.495018][714337:714339] CHIP:IN: SecureSession[0x7f2764026220]: Released - Type:2 LSID:16528 - [1678876803.495040][714337:714339] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1727: CHIP Error 0x000000C9: No shared trusted root at ../../commands/clusters/ModelCommand.cpp:62 - cluster: "LogCommands" - command: "UserPrompt" - arguments: - values: - - name: "message" - value: "Please enter 'y' for success" - - name: "expectedValue" - value: "y" + PICS: BINFO.S.A0005 + identity: "beta" + command: "readAttribute" + cluster: "Basic Information" + attribute: "NodeLabel" + response: + error: FAILURE - label: "Step 9: TH_CR1 reads the list of Fabrics on DUT_CE" identity: "alpha" @@ -232,13 +236,13 @@ tests: attribute: "Fabrics" fabricFiltered: false response: - value: - [ - { Label: "", FabricIndex: 1, NodeID: nodeId }, - { Label: "", FabricIndex: 3, NodeID: nodeId3 }, - ] constraints: type: list + contains: + [ + { Label: "", FabricIndex: 1, NodeID: nodeId }, + { Label: "", FabricIndex: 3, NodeID: nodeId3 }, + ] - label: "Step 11: TH_CR1 opens a commissioning window on DUT_CE using BCM" identity: "alpha" @@ -249,9 +253,10 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - label: "Step 11a: Waiting after opening commissioning window" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: @@ -299,14 +304,14 @@ tests: attribute: "Fabrics" fabricFiltered: false response: - value: - [ - { Label: "", FabricIndex: 1, NodeID: nodeId }, - { Label: "", FabricIndex: 4, NodeID: nodeId2 }, - { Label: "", FabricIndex: 3, NodeID: nodeId3 }, - ] constraints: type: list + contains: + [ + { Label: "", FabricIndex: 1, NodeID: nodeId }, + { Label: "", FabricIndex: 4, NodeID: nodeId2 }, + { Label: "", FabricIndex: 3, NodeID: nodeId3 }, + ] - label: "Step 13a: Remove TH2 FabricIndex" PICS: OPCREDS.S.C0a.Rsp && CADMIN.S diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml index cd1141ce8813de..f6e7332a9d1f91 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml @@ -24,6 +24,9 @@ config: nodeId: 0x12344321 timeout: 950 endpoint: 0 + payload: + type: char_string + defaultValue: "MT:-24J0AFN00KA0648G00" tests: - label: "Precondition: Reset Devices to factory defaults" @@ -45,6 +48,17 @@ tests: value: "y" - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE" + cluster: "CommissionerCommands" + command: "PairWithCode" + PICS: CADMIN.S + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + + - label: "Step 1: TH_CR1 commissioned with DUT_CE" cluster: "DelayCommands" command: "WaitForCommissionee" PICS: CADMIN.S @@ -66,6 +80,7 @@ tests: value: 900 - label: "Step 3: Wait 901 seconds for commissioning Window to be closed" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml index ff0061e4bfd838..4b94b6518a7529 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml @@ -23,6 +23,9 @@ config: nodeId: 0x12344321 timeout: 950 endpoint: 0 + payload: + type: char_string + defaultValue: "MT:-24J0AFN00KA0648G00" discriminator: type: int16u defaultValue: 3840 @@ -50,6 +53,17 @@ tests: value: "y" - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE" + cluster: "CommissionerCommands" + command: "PairWithCode" + PICS: CADMIN.S + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + + - label: "Step 1: TH_CR1 commissioned with DUT_CE" cluster: "DelayCommands" command: "WaitForCommissionee" PICS: CADMIN.S.C00.Rsp @@ -110,6 +124,7 @@ tests: value: "SPAKE2P Key Salt" - label: "Step 3: Wait for commissioning Window to 901 seconds" + PICS: CADMIN.S.C00.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml index c383ff77a46ad9..9aab51aa3876d2 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml @@ -24,6 +24,9 @@ config: nodeId: 0x12344321 timeout: 200 endpoint: 0 + payload: + type: char_string + defaultValue: "MT:-24J0AFN00KA0648G00" tests: - label: "Precondition: Reset Devices to factory defaults" @@ -45,6 +48,17 @@ tests: value: "y" - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE" + cluster: "CommissionerCommands" + command: "PairWithCode" + PICS: CADMIN.S + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + + - label: "Step 1: TH_CR1 commissioned with DUT_CE" cluster: "DelayCommands" command: "WaitForCommissionee" PICS: CADMIN.S.C01.Rsp @@ -67,6 +81,7 @@ tests: - label: "Step 3: Wait for 181 seconds for commissioning Window to be closed" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml index 00f27d31146b6e..8e201988cc87db 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml @@ -23,6 +23,9 @@ config: nodeId: 0x12344321 timeout: 200 endpoint: 0 + payload: + type: char_string + defaultValue: "MT:-24J0AFN00KA0648G00" discriminator: type: int16u defaultValue: 3840 @@ -50,6 +53,17 @@ tests: value: "y" - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE" + cluster: "CommissionerCommands" + command: "PairWithCode" + PICS: CADMIN.S + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + + - label: "Step 1: TH_CR1 commissioned with DUT_CE" cluster: "DelayCommands" command: "WaitForCommissionee" PICS: CADMIN.S.C00.Rsp @@ -110,6 +124,7 @@ tests: value: "SPAKE2P Key Salt" - label: "Step 3: Wait for commissioning Window to 181 seconds" + PICS: CADMIN.S.C00.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml index 01822cf566e147..59b45e1ff87618 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml @@ -31,6 +31,9 @@ config: waitAfterCommissioning: type: int16u defaultValue: 5000 + PIXIT.CADMIN.CwDuration: + type: int16u + defaultValue: 180 tests: - label: "Precondition: Reset Devices to factory defaults" @@ -52,6 +55,17 @@ tests: value: "y" - label: "Step 1a: TH_CR1 starts a commissioning process with DUT_CE" + cluster: "CommissionerCommands" + command: "PairWithCode" + PICS: CADMIN.S + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + + - label: "Step 1a: TH_CR1 commissioned with DUT_CE" cluster: "DelayCommands" command: "WaitForCommissionee" PICS: CADMIN.S @@ -77,9 +91,10 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - label: "Step 2a: Waiting after opening commissioning window" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: @@ -87,27 +102,14 @@ tests: - name: "ms" value: waitAfterCommissioning - #Check for DNS-SD advertisement CM is not possible in YAML - label: "Step 2b: Verify that the DNS-SD advertisement shows CM=1" - verification: | - On TH_CR1 send the below command - - avahi-browse -rt _matterc._udp - + eth0 IPv6 B2822245F1F43570 _matterc._udp local - = eth0 IPv6 B2822245F1F43570 _matterc._udp local - hostname = [E45F010F27530000.local] - address = [fe80::e65f:1ff:fe0f:2753] - port = [5540] - txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"] - cluster: "LogCommands" - command: "UserPrompt" - PICS: PICS_SKIP_SAMPLE_APP - arguments: + PICS: CADMIN.S.C01.Rsp + cluster: "DiscoveryCommands" + command: "FindCommissionable" + response: values: - - name: "message" - value: "enter 'y' after success" - - name: "expectedValue" - value: "y" + - name: "commissioningMode" + value: 1 - label: "Step 2c: TH_CR1 writes the Basic Information Clusters NodeLabel @@ -202,13 +204,21 @@ tests: attribute: "Fabrics" fabricFiltered: false response: - value: - [ - { Label: "", FabricIndex: TH1FabricIndex, NodeID: nodeId }, - { Label: "", FabricIndex: TH2FabricIndex, NodeID: nodeId2 }, - ] constraints: type: list + contains: + [ + { + Label: "", + FabricIndex: TH1FabricIndex, + NodeID: nodeId, + }, + { + Label: "", + FabricIndex: TH2FabricIndex, + NodeID: nodeId2, + }, + ] - label: "Step 6: TH_CR2 reads the list of Fabrics on DUT_CE" identity: "beta" @@ -218,13 +228,21 @@ tests: PICS: OPCREDS.S.A0001 fabricFiltered: false response: - value: - [ - { Label: "", FabricIndex: TH1FabricIndex, NodeID: nodeId }, - { Label: "", FabricIndex: TH2FabricIndex, NodeID: nodeId2 }, - ] constraints: type: list + contains: + [ + { + Label: "", + FabricIndex: TH1FabricIndex, + NodeID: nodeId, + }, + { + Label: "", + FabricIndex: TH2FabricIndex, + NodeID: nodeId2, + }, + ] - label: "Step 7a: TH_CR1 writes the Basic Information Clusters NodeLabel @@ -283,15 +301,16 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - label: "Step 10: Wait for the commissioning window in step 13 to timeout" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: values: - name: "ms" - value: 180000 + value: PIXIT.CADMIN.CwDuration * 1000 - label: "Step 11: TH_CR2 reads the window status to verify the DUT_CE window @@ -312,9 +331,10 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - label: "Step 12b: Waiting after opening commissioning window" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml index ae3582acf90fb2..5b1e3340a78821 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml @@ -39,6 +39,9 @@ config: payload: type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically + PIXIT.CADMIN.CwDuration: + type: int16u + defaultValue: 180 tests: - label: "Precondition: Reset Devices to factory defaults" @@ -60,6 +63,17 @@ tests: value: "y" - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE" + cluster: "CommissionerCommands" + command: "PairWithCode" + PICS: CADMIN.S + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + + - label: "Step 1a: TH_CR1 commissioned with DUT_CE" cluster: "DelayCommands" command: "WaitForCommissionee" PICS: CADMIN.S @@ -77,43 +91,25 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - #Check for DNS-SD advertisement CM is not possible in YAML - label: "Step 3: Verify that the DNS-SD advertisement shows CM=1" - verification: | - On TH_CR1 send the below command - - avahi-browse -rt _matterc._udp - + eth0 IPv6 05EB1D3652D2F544 _matterc._udp local - + eth0 IPv6 7869CD25CBF12D42 _matterc._udp local - = eth0 IPv6 7869CD25CBF12D42 _matterc._udp local - hostname = [E45F010F27530000.local] - address = [fe80::e65f:1ff:fe0f:2753] - port = [5540] - txt = ["PI=" "PH=33" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"] - = eth0 IPv6 05EB1D3652D2F544 _matterc._udp local - hostname = [E45F010F27530000.local] - address = [fe80::e65f:1ff:fe0f:2753] - port = [5540] - txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"] - cluster: "LogCommands" - command: "UserPrompt" - PICS: PICS_SKIP_SAMPLE_APP - arguments: + PICS: CADMIN.S.C01.Rsp + cluster: "DiscoveryCommands" + command: "FindCommissionable" + response: values: - - name: "message" - value: "enter 'y' after success" - - name: "expectedValue" - value: "y" + - name: "commissioningMode" + value: 1 - label: "Wait for PIXIT.CADMIN.CwDuration + 10" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: values: - name: "ms" - value: 190000 + value: ( PIXIT.CADMIN.CwDuration + 10 ) * 1000 - label: "Step 4: TH_CR2 starts a commissioning process with DUT_CE" identity: "beta" @@ -137,9 +133,10 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - label: "Waiting after opening commissioning window" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: @@ -203,9 +200,10 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration - label: "Waiting after opening commissioning window" + PICS: CADMIN.S.C01.Rsp cluster: "DelayCommands" command: "WaitForMs" arguments: @@ -222,7 +220,7 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 180 + value: PIXIT.CADMIN.CwDuration response: error: FAILURE clusterError: 2