Merge 53415c2 into cd4ab7c

project-chip · Jul 16, 2022 · 4471825 · 4471825
2 parents cd4ab7c + 53415c2
commit 4471825
Show file tree

Hide file tree

Showing 61 changed files with 4,829 additions and 3,085 deletions.
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -1740,6 +1740,55 @@ PICS:
     - label: "Does the DUT support Basic Commissioning Method (BCM)?"
       id: PICS_MF_BCM
 
+    - label: "Does the Device support User Interface Display"
+      id: CADMIN.UserInterfaceDisplay
+
+    - label: "Does the Device support Audio Interface"
+      id: CADMIN.AudioInterface
+    #server
+    - label: "Does the Device support Enhanced Commissioning Method (ECM)?"
+      id: CADMIN.S.C0000
+
+    - label: "Does the Device support Basic Commissioning Method (BCM)?"
+      id: CADMIN.S.C0001
+
+    - label: "Does the Device support revoking commissioning window?"
+      id: CADMIN.S.C0002
+
+    - label: "Does the Device implement receiving the RemoveFabric command?"
+      id: OPCREDS.S.C0a.Rsp
+    #attributes
+    - label: "Does the Device support Fabrics attribute?"
+      id: OPCREDS.S.A0001
+
+    - label: "Does the Device support NodeLabel attribute?"
+      id: BINFO.S.A0005
+
+    - label: "Does the Device support WindowStatus attribute?"
+      id: CADMIN.S.A0000
+
+    #client
+    - label: "Does the Device support Enhanced Commissioning Method (ECM)?"
+      id: CADMIN.C.C0000
+
+    - label: "Does the Device support Basic Commissioning Method (BCM)?"
+      id: CADMIN.C.C0001
+
+    - label: "Does the Device support revoking commissioning window?"
+      id: CADMIN.C.C0002
+
+    - label: "Does the Device implement receiving the RemoveFabric command?"
+      id: OPCREDS.C.C0a.Tx
+    #attributes
+    - label: "Does the Device support Fabrics attribute?"
+      id: OPCREDS.C.A0001
+
+    - label: "Does the Device support NodeLabel attribute?"
+      id: BINFO.C.A0005
+
+    - label: "Does the Device support WindowStatus attribute?"
+      id: CADMIN.C.A0000
+
     #User Label cluster
     - label: "Does the DUT Server support LabelList attribute?"
       id: ULABEL.S.A0000
@@ -1790,6 +1839,11 @@ PICS:
           feature?"
       id: MEDIAINPUT.S.NU
 
+    - label:
+          "Does the DUT support the Media Input server cluster Name Updates
+          feature?"
+      id: MC_MEDIAINPUT.S.NU
+
     - label:
           "Does the DUT support the Channel server cluster Channel List feature?"
       id: CHANNEL.S.CL
@@ -4425,6 +4479,7 @@ PICS:
     - label: "Does the DUT support the AccessControlExtensionChanged Event?"
       id: ACL.S.E01
 
+    #Mode select
     #Mode select
     - label: "Does the DUT support the StartUpMode attribute?"
       id: MOD.S.A0004

diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_5.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_5.yaml
@@ -29,22 +29,11 @@ tests:
                 value: nodeId
 
     # Issue 13029
+    #this step implicitly validating the attribute(CatalogList)constraints, as long as the payload is being parsed successfully
     - label:
           "TH reads CatalogList attribute from the DUT and where each entry in
           the list is a CSA-issued Vendor Id of type unsigned 16 bit integer
           ranging between 0-65536 for the catalog"
-      verification: |
-          ./chip-tool applicationlauncher read catalog-list 1 1
-          [1651053952.328482][155084:155089] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_050C Attribute 0x0000_0000 DataVersion: 3275104958
-          [1651053952.328551][155084:155089] CHIP:TOO:   CatalogList: 2 entries
-          [1651053952.328589][155084:155089] CHIP:TOO:     [1]: 123
-          [1651053952.328620][155084:155089] CHIP:TOO:     [2]: 456
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && APPLAUNCHER.S.A0000
-      arguments:
-          values:
-              - name: "message"
-                value: "Please enter 'y' for success"
-              - name: "expectedValue"
-                value: "y"
+      PICS: APPLAUNCHER.S.A0000
+      command: "readAttribute"
+      attribute: "CatalogList"
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_6.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_6.yaml
@@ -29,22 +29,12 @@ tests:
                 value: nodeId
 
     # Issue 13029
+    #this step implicitly validating the attribute(CurrentApp)constraints, as long as the payload is being parsed successfully
     - label:
           "TH reads CurrentApp attribute from the DUT and Verify the in-focus
           application attributes, which should include the display Application
           ID(type:uint16) Catalog Vendor ID(type:string) or Null if there is no
           current in-focus application"
-      verification: |
-          ./chip-tool applicationlauncher read current-app 1 1
-          [1653909423.450195][16364:16369] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_050C Attribute 0x0000_0001 DataVersion: 2386582479
-          [1653909423.450227][16364:16369] CHIP:TOO:   CurrentApp: null
-          [1653909423.450318][16364:16369] CHIP:EM: Sending Standalone Ack for MessageCounter:2071603 on exchange 4134i
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && APPLAUNCHER.S.A0001
-      arguments:
-          values:
-              - name: "message"
-                value: "Please enter 'y' for success"
-              - name: "expectedValue"
-                value: "y"
+      PICS: APPLAUNCHER.S.A0001
+      command: "readAttribute"
+      attribute: "CurrentApp"
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
@@ -33,6 +33,5 @@ tests:
       command: "readAttribute"
       attribute: "StateValue"
       response:
-          value: 0
           constraints:
               type: bool
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
@@ -14,7 +14,8 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    24.1.1. [TC-CADMIN-1.1] Administrator Behavior using ECM [DUT -Commissioner]
+    24.1.1. [TC-CADMIN-1.1] Administrator Behavior using ECM [DUT -
+    Commissioner]
 
 config:
     nodeId: 0x12344321
@@ -24,13 +25,15 @@ config:
 tests:
     - label: "TH_CR1 starts a commissioning process with TH_CE"
       verification: |
-          "1. Provision the device using 1st controller chip-tool  on the raspi (use above instructions)"
+          "1. Provision the device using 1st controller chip-tool  on the raspi (use above instructions)
+          "
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on TH_CE using a commissioning
-          timeout of PIXIT_COMM_WIN seconds using ECM (Enhanced Commissioning
-          Method)."
+          "TH_CR1 sends command to TH_CE to open a commissioning window with a
+          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM
+          (Enhanced Commissioning Method)"
+      PICS: CADMIN.C.C0000
       verification: |
           On 1st controller using chip tool, open commissioning window using ECM
 
@@ -59,13 +62,14 @@ tests:
           [1635687658.687201][3792:3792] CHIP:DIS: Broadcasting mDns reply for query from 192.168.0.225
       disabled: true
 
-    - label: "TH_CR1 reads the list of Fabrics on TH_CE"
+    - label: "TH_CR1 sends command to TH_CE to read the list of Fabrics"
+      PICS: OPCREDS.C.A0001
       verification: |
           On 1st controller using chip tool read fabricList
 
           ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
-           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3621507058
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3621507058
           [1649245801.244173][10091:10096] CHIP:TOO:   Fabrics: 1 entries
           [1649245801.244305][10091:10096] CHIP:TOO:     [1]: {
           [1649245801.244348][10091:10096] CHIP:TOO:       RootPublicKey: 045541017FCEFD0D83963C9ED7F21380C6B789EB989B5D20DC318FAE92D60D0F685666505E9C4F86C49ADC71AB3A8B9B44FD43214CF9BE2B6D47DE01F28FE1544F
@@ -84,14 +88,34 @@ tests:
           Below is the example when using chip tool as controller (considering 35998938564 as the manual code generated by 1st controller)
           ./chip-tool pairing code 2 35998938564
 
-           Verify whether you got below message in the log of TH
+          Verify whether you got below message in the log of TH
 
           Device commissioning completed with success
       disabled: true
 
+    - label: "Verify TH_CE is now discoverable over DNS-SD with two SRV Records"
+      verification: |
+          On the raspi , Verify if the DUT is broadcasting using
+
+          ubuntu@ubuntu:~/may10_cntrl2/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
+          +   eth0 IPv6 E0AF53B23E580769-0000000000000002             _matter._tcp         local
+          +   eth0 IPv6 7FF84D214A19B581-0000000000000001             _matter._tcp         local
+          =   eth0 IPv6 E0AF53B23E580769-0000000000000002             _matter._tcp         local
+             hostname = [E45F010F3BAF0000.local]
+             address = [fe80::e65f:1ff:fe0f:3baf]
+             port = [5540]
+             txt = ["T=1" "CRA=300" "CRI=5000"]
+          =   eth0 IPv6 7FF84D214A19B581-0000000000000001             _matter._tcp         local
+             hostname = [E45F010F3BAF0000.local]
+             address = [fe80::e65f:1ff:fe0f:3baf]
+             port = [5540]
+             txt = ["T=1" "CRA=300" "CRI=5000"]
+      disabled: true
+
     - label:
-          "DUT_CR2 writes and reads the Basic Information Clusters NodeLabel
-          mandatory attribute of TH_CE"
+          "DUT_CR2 sends command to TH_CE to write and read the Basic
+          Information Clusters NodeLabel mandatory attribute"
+      PICS: BINFO.C.A0005
       verification: |
           Using your DUT controller, write attribute and read attribute to and from TH_CE
 
@@ -163,7 +187,8 @@ tests:
           [1649671466.310704][20969:20974] CHIP:EM: Sending Standalone Ack for MessageCounter:15357338 on exchange 20724i
       disabled: true
 
-    - label: "DUT_CR2 reads the list of Fabrics on TH_CE"
+    - label: "DUT_CR2 sends command to TH_CE to read the list of Fabrics"
+      PICS: OPCREDS.C.A0001
       verification: |
           On your DUT controller read fabricList
 
@@ -193,8 +218,9 @@ tests:
       disabled: true
 
     - label:
-          "TH_CR1 writes and reads the Basic Information Clusters NodeLabel
-          mandatory attribute of TH_CE using CASE"
+          "TH_CR1 sends command to TH_CE to write and read the Basic Information
+          Clusters NodeLabel mandatory attribute"
+      PICS: BINFO.C.A0005
       verification: |
           On 1st controller using chip tool, write attribute and read attribute
 
@@ -237,8 +263,9 @@ tests:
       disabled: true
 
     - label:
-          "DUT_CR2 reads, writes and then reads the Basic Information Clusters
-          NodeLabel mandatory attribute of TH_CE"
+          "DUT_CR2 sends command to TH_CE to read, write and then read the Basic
+          Information Clusters NodeLabel mandatory attribute"
+      PICS: BINFO.C.A0005
       verification: |
           Using your DUT controller, read, write attribute and then read attribute to and from TH_CE
 
@@ -294,9 +321,10 @@ tests:
       disabled: true
 
     - label:
-          "DUT_CR2 opens a commissioning window on TH_CE using a commissioning
-          timeout of PIXIT_COMM_WIN seconds using ECM (Enhanced Commissioning
-          Method)"
+          "DUT_CR2 sends command to TH_CE to open a commissioning window using a
+          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM
+          (Enhanced Commissioning Method)"
+      PICS: CADMIN.C.C0000
       verification: |
           1. Using your DUT controller open commissioning window using ECM
 
@@ -314,8 +342,9 @@ tests:
       disabled: true
 
     - label:
-          "DUT_CR2 revokes the commissioning window on TH_CE using the Revoke
-          Commissioning command"
+          "DUT_CR2 sends command to TH_CE to revoke the commissioning window
+          using the Revoke Commissioning command"
+      PICS: CADMIN.C.C0002
       verification: |
           On your DUT controller, run revoke command
 
@@ -370,8 +399,9 @@ tests:
       disabled: true
 
     - label:
-          "DUT_CR2 writes and reads the Basic Information Clusters NodeLabel
-          mandatory attribute of TH_CE"
+          "DUT_CR2 sends command to TH_CE to write and read the Basic
+          Information Clusters NodeLabel mandatory attribute"
+      PICS: BINFO.C.A0005
       verification: |
           Using your DUT controller, write attribute and read attribute to and from TH_CE
 
@@ -414,7 +444,10 @@ tests:
           [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
       disabled: true
 
-    - label: "DUT_CR2 opens a commissioning window on TH_CE using ECM"
+    - label:
+          "DUT_CR2 sends command to TH_CE to open a commissioning window using
+          ECM"
+      PICS: CADMIN.C.C0000
       verification: |
           1. Using your DUT controller open commissioning window using ECM
 
@@ -437,7 +470,10 @@ tests:
           Wait for the timeout of commissioning window in the above step
       disabled: true
 
-    - label: "DUT_CR2 opens a commissioning window on TH_CE using ECM"
+    - label:
+          "DUT_CR2 sends command to TH_CE to open a commissioning window using
+          ECM"
+      PICS: CADMIN.C.C0000
       verification: |
           1. Using your DUT controller open commissioning window using ECM
 

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
@@ -51,6 +51,7 @@ tests:
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
       cluster: "AdministratorCommissioning"
       command: "OpenBasicCommissioningWindow"
+      PICS: CADMIN.S.C0000
       timedInteractionTimeoutMs: 10000
       arguments:
           values:
@@ -358,7 +359,7 @@ tests:
           error: FAILURE
 
     - label:
-          "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup
+          "TH_CR2 starts a commissioning process with DUT_CE using valid setup
           code"
       identity: "beta"
       cluster: "CommissionerCommands"
@@ -368,7 +369,7 @@ tests:
               - name: "nodeId"
                 value: nodeId2
               - name: "payload"
-                value: payload2
+                value: payload
       response:
           error: FAILURE