Skip to content

Commit

Permalink
Modifying the existing DD YAMLs to also include the steps for WiFi-PA…
Browse files Browse the repository at this point in the history
…F… (project-chip#34651)

* Modifying the exising DD YAMLs to also include the steps for WiFi-PAF feature

* Restyle Modifying the existing DD YAMLs to also include the steps for WiFi-PAF… (project-chip#34654)

* Restyled by whitespace

* Restyled by prettier-yaml

---------

Co-authored-by: Restyled.io <[email protected]>

---------

Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
3 people authored Jul 31, 2024
1 parent 91d1a28 commit d5f3db3
Show file tree
Hide file tree
Showing 7 changed files with 197 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/app/tests/suites/certification/PICS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ PICS:
- label: "Does the commissioner support Discovery Capability over SoftAP?"
id: MCORE.DD.DISCOVERY_SOFTAP

- label: "Does the commissioner support Discovery Capability over Wifi-PAF?"
id: MCORE.DD.DISCOVERY_PAF

- label: "Does the DUT support Standard Commissioning Flow?"
id: MCORE.DD.STANDARD_COMM_FLOW

Expand Down
23 changes: 23 additions & 0 deletions src/app/tests/suites/certification/Test_TC_DD_2_2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,29 @@ tests:
SoftAP commissioning not currently supported on TH=all-clusters-app
disabled: true

- label:
"Step 3c: TH is configured with the default channel to be Channel 6 in
2.4GHz. If TH has a 5GHz Wi-Fi radio, TH is configured with an
additional channel list that includes Channel 44 and the operating
channel Wi-Fi network the DUT is on if it is operating in non-ETSI
regulatory domains and includes Channel 149 if it is operating in ETSI
regulatory domains."
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
TH must start sending Wi-Fi PAF Publish Frames on the default channel and the channel list.
2.4g - $sudo ./chip-all-clusters-app --wifi --wifipaf freq_list=2437
5g - FCC - $sudo ./chip-all-clusters-app --wifi --wifipaf freq_list=5220
5g ETSI - $sudo ./chip-all-clusters-app --wifi --wifipaf freq_list=5745
disabled: true

- label: "Step 3d: DUT starts Wi-Fi PAF scan in its commissioning channel"
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
DUT must find TH and provide onboarding data to for validation. Pass Criteria: DUT is able to report the Onboarding payload as set on TH
$ sudo ./chip-tool pairing wifipaf-wifi 1 n_m_2g nxp12345 20202021 3840
disabled: true

- label: "Step 4a: DUT scans using Wi-Fi in background"
PICS: MCORE.DD.DISCOVERY_SOFTAP
verification: |
Expand Down
40 changes: 40 additions & 0 deletions src/app/tests/suites/certification/Test_TC_DD_3_11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,46 @@ tests:
[1651105530.973215][27371:27371] CHIP:DIS: Updating services using commissioning mode 0
disabled: true

- label: "Step 2d: Scan the QR code from the previous step using the DUT."
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
1. User has a QR code to pass into DUT
# ./chip-all-clusters-app --wifi --wifipaf --custom-flow 0 --capabilities 8
[1719392550.248867][1563:1563] CHIP:SVR: SetupQRCode: [MT:-24J0M3810KA0648G00]
[1719392550.248883][1563:1563] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
[1719392550.248892][1563:1563] CHIP:SVR: https://project-chip.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0M3810KA0648G00
[1719392550.248911][1563:1563] CHIP:SVR: Manual pairing code: [34970112332]
disabled: true

- label: "Step 2e: Verify the QR code has been scanned successfully."
PICS: MCORE.DD.SCAN_QR_CODE
verification: |
1. Verify the QR code has been scanned successfully.
$ sudo ./chip-tool payload parse-setup-payload MT:-24J0M3810KA0648G00
[1719392883.120482][28468:28468] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_tool_kvs
[1719392883.120687][28468:28468] CHIP:SPL: Parsing base38Representation: MT:-24J0M3810KA0648G00
[1719392883.120839][28468:28468] CHIP:SPL: Version: 0
[1719392883.120859][28468:28468] CHIP:SPL: VendorID: 65521
[1719392883.120874][28468:28468] CHIP:SPL: ProductID: 32769
[1719392883.120890][28468:28468] CHIP:SPL: Custom flow: 0 (STANDARD)
[1719392883.120910][28468:28468] CHIP:SPL: Discovery Bitmask: 0x08 (Wi-Fi PAF)
[1719392883.120928][28468:28468] CHIP:SPL: Long discriminator: 3840 (0xf00)
[1719392883.120944][28468:28468] CHIP:SPL: Passcode: 20202021
disabled: true

- label:
"Step 2f: Using the DUT, parse the TH’s QR code and follow any steps
needed for the Commissioner/Commissionee to complete the commissioning
process using Wi-Fi PAF"
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
1. DUT parses QR code and DUT commissions TH to the Matter network
$ sudo ./chip-tool pairing code-wifi 1 n_m_2g nxp12345 MT:-24J0M3810KA0648G00
disabled: true

- label:
"Step 3a: Standard Commissioning Flow: Use a Commissionee with a QR
code that has the Custom Flow field set to 0 and supports SoftAP for
Expand Down
48 changes: 48 additions & 0 deletions src/app/tests/suites/certification/Test_TC_DD_3_12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,54 @@ tests:
[1657234324847] [31475:16824564] CHIP: [TOO] Device commissioning completed with success
disabled: true

- label:
"Step 2e: User-Intent Commissioning Flow: Use a Commissionee with a QR
code that has the Custom Flow field set to 1 and supports Wi-Fi PAF
for its Discovery Capability. "
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
User has a QR code to pass into DUT.
# ./chip-all-clusters-app --wifi --wifipaf --custom-flow 1 --capabilities 8
[1719393010.693198][1592:1592] CHIP:SVR: SetupQRCode: [MT:-24J0IJ910KA0648G00]
[1719393010.693213][1592:1592] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
[1719393010.693222][1592:1592] CHIP:SVR: https://project-chip.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0IJ910KA0648G00
[1719393010.693246][1592:1592] CHIP:SVR: Manual pairing code: [749701123365521327694]
disabled: true

- label: "Step 2f: Scan the QR code from the previous step using the DUT."
PICS: MCORE.DD.SCAN_QR_CODE
verification: |
Verify the QR code has been scanned successfully.
disabled: true

- label: "Step 2g: DUT parses QR code."
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
Verify DUT has parsed the QR code. Verify TH has not been commissioned to the Matter network.
$ sudo ./chip-tool payload parse-setup-payload MT:-24J0IJ910KA0648G00
[1719393067.811966][28514:28514] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_tool_kvs
[1719393067.812195][28514:28514] CHIP:DL: writing settings to file (/tmp/chip_tool_kvs-PRUpuW)
[1719393067.812351][28514:28514] CHIP:DL: renamed tmp file to file (/tmp/chip_tool_kvs)
[1719393067.812455][28514:28514] CHIP:SPL: Parsing base38Representation: MT:-24J0IJ910KA0648G00
[1719393067.812626][28514:28514] CHIP:SPL: Version: 0
[1719393067.812647][28514:28514] CHIP:SPL: VendorID: 65521
[1719393067.812664][28514:28514] CHIP:SPL: ProductID: 32769
[1719393067.812679][28514:28514] CHIP:SPL: Custom flow: 1 (USER ACTION REQUIRED)
[1719393067.812698][28514:28514] CHIP:SPL: Discovery Bitmask: 0x08 (Wi-Fi PAF)
[1719393067.812714][28514:28514] CHIP:SPL: Long discriminator: 3840 (0xf00)
[1719393067.812729][28514:28514] CHIP:SPL: Passcode: 20202021
disabled: true

- label:
"Step 2h: User should follow any TH-specific steps for putting the TH
Commissionee device into commissioning mode and to complete the
commissioning process using Wi-Fi PAF."
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
DUT commissions TH to the Matter network.
$ sudo ./chip-tool pairing code-wifi 1 n_m_2g nxp12345 MT:-24J0IJ910KA0648G00
disabled: true

- label:
"Step 3a: User-Intent Commissioning Flow: Use a Commissionee with a QR
code that has the Custom Flow field set to 1 and supports SoftAP for
Expand Down
53 changes: 53 additions & 0 deletions src/app/tests/suites/certification/Test_TC_DD_3_13.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,59 @@ tests:
[1657235198856] [31506:16834043] CHIP: [TOO] Device commissioning completed with success
disabled: true

- label:
"Step 2e: Custom Commissioning Flow: Use a Commissionee with a QR code
that has the Custom Flow field set to 2 and supports Wi-Fi PAF for its
Discovery Capability. Commissionee is NOT in commissioning mode.
Ensure the Version bit string follows the current Matter spec.
documentation."
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
1. User has a QR code to pass into DUT.
# ./chip-all-clusters-app --wifi --wifipaf --custom-flow 2 --capabilities 8
[1719393349.405047][1623:1623] CHIP:SVR: SetupQRCode: [MT:-24J0EZA10KA0648G00]
[1719393349.405062][1623:1623] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
[1719393349.405071][1623:1623] CHIP:SVR: https://project-chip.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0EZA10KA0648G00
[1719393349.405095][1623:1623] CHIP:SVR: Manual pairing code: [749701123365521327694]
disabled: true

- label: "Step 2f: Scan the QR code from the previous step using the DUT."
PICS: MCORE.DD.SCAN_QR_CODE
verification: |
1. Verify the QR code has been scanned successfully.
disabled: true

- label: "Step 2g: DUT parses QR code."
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
1. Verify DUT has parsed the QR code. Verify TH has not been commissioned to the Matter network.
$ sudo ./chip-tool payload parse-setup-payload MT:-24J0EZA10KA0648G00
CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_tool_kvs
CHIP:DL: writing settings to file (/tmp/chip_tool_kvs-UQIGvf)
CHIP:DL: renamed tmp file to file (/tmp/chip_tool_kvs)
CHIP:SPL: Parsing base38Representation: MT:-24J0EZA10KA0648G00
CHIP:SPL: Version: 0
CHIP:SPL: VendorID: 65521
CHIP:SPL: ProductID: 32769
CHIP:SPL: Custom flow: 2 (CUSTOM)
CHIP:SPL: Discovery Bitmask: 0x08 (Wi-Fi PAF)
CHIP:SPL: Long discriminator: 3840 (0xf00)
CHIP:SPL: Passcode: 20202021
disabled: true

- label:
"Step 2h: User should follow any TH-specific steps, unless the DUT has
alternative means to guide the user to successful commissioning, for
putting the TH Commissionee into commissioning mode, for triggering
the DUT Commissioner for commissioning, and for completing the
commissioning process using BLE."
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
1. DUT commissions TH to the Matter network.
$ sudo ./chip-tool pairing code-wifi 1 n_m_2g nxp12345 MT:-24J0EZA10KA0648G00
disabled: true

- label:
"Step 3a: Custom Commissioning Flow: Use a Commissionee with a QR code
that has the Custom Flow field set to 2 and supports SoftAP for its
Expand Down
29 changes: 29 additions & 0 deletions src/app/tests/suites/certification/Test_TC_DD_3_14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,35 @@ tests:
Run command failure: ../../third_party/connectedhomeip/src/controller/SetUpCodePairer.cpp:50: CHIP Error 0x0000002F: Invalid argument
disabled: true

- label:
"Step 4c: Using the QR code from Step 1, ensure the TH’s Discovery
Capability bit string is NOT set to Wi-Fi PAF for discovery (i.e. set
to OnNetwork discovery capability)"
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
User has a QR code generated to pass into DUT. Using the example provided above, the payload would be "MT:-24J029Q00KA0648G00".
$ ./out/all-clusters-app/chip-all-clusters-app --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --custom-flow 2 --capabilities 4 --discriminator 3840 --passcode 20202021
[1657235470.970680][371041:371041] CHIP:DL: Device Configuration:
[1657235470.970772][371041:371041] CHIP:DL: Serial Number: (not set)
[1657235470.970811][371041:371041] CHIP:DL: Vendor Id: 65521 (0xFFF1)
[1657235470.970845][371041:371041] CHIP:DL: Product Id: 32769 (0x8001)
[1657235470.970892][371041:371041] CHIP:DL: Hardware Version: 0
[1657235470.970929][371041:371041] CHIP:DL: Setup Pin Code (0 for UNKNOWN/ERROR): 20202021
[1657235470.970984][371041:371041] CHIP:DL: Setup Discriminator (0xFFFF for UNKNOWN/ERROR): 3840 (0xF00)
[1657235470.971031][371041:371041] CHIP:DL: Manufacturing Date: (not set)
[1657235470.971095][371041:371041] CHIP:DL: Device Type: 65535 (0xFFFF)
[1657235470.971147][371041:371041] CHIP:-: ==== Onboarding payload for Standard Commissioning Flow ====
[1657235470.971199][371041:371041] CHIP:SVR: SetupQRCode: [MT:-24J029Q00KA0648G00]
[1657235470.971258][371041:371041] CHIP:SVR: Copy/paste the below URL in a browser to see the QR Code:
[1657235470.971293][371041:371041] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J029Q00KA0648G00"
disabled: true

- label: "Step 4d: Scan/read the QR code of the TH device using the DUT"
PICS: MCORE.DD.DISCOVERY_PAF
verification: |
If TH Commissionee’s Discovery Capabilities do not support Wi-Fi PAF, ensure that the DUT commissions the TH onto the Matter network over a capability that is NOT BLE. In this example, over OnNetwork.
disabled: true

- label:
"Step 5a: Prefix: Using the QR code from Step 1, generate a new QR
code but substituting out the current Prefix with an invalid Prefix
Expand Down
1 change: 1 addition & 0 deletions src/app/tests/suites/certification/ci-pics-values
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,7 @@ BIND.C=0

# Device Discovery
MCORE.DD.DISCOVERY_SOFTAP=0
MCORE.DD.DISCOVERY_PAF=0
MCORE.DD.CHIP_DEV=1
MCORE.DD.DEV_LOCK=1
MCORE.DD.DEV_BARRIER=1
Expand Down

0 comments on commit d5f3db3

Please sign in to comment.