Added updated Manual and Automated scripts

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

@@ -3046,6 +3046,9 @@ PICS:
     - label: "Does the DUT(Client) implement sending Keysetwrite command?"
       id: GRPKEY.C.C00.Tx
 
+    - label: "Does the DUT(Client) implement sending Keysetread Command?"
+      id: GRPKEY.C.C01.Tx
+
     - label: "Does the DUT(Client) implement sending AddGroup command?"
       id: G.C.C00.Tx
 
@@ -5154,6 +5157,12 @@ PICS:
     - label: "Does the Controller DUT support Service Advertising?"
       id: MCORE.SC.ADV
 
+    - label: "Does the DUT(Client) implement sending Keysetwrite Command?"
+      id: GRPKEY.C.C00.Tx
+
+    - label: "Does the DUT(Client) support the GroupKeyMap attribute?"
+      id: GRPKEY.C.A0000
+
     #133.1. Bridged Device Basic Information Cluster
     - label: "Does the DUT(server) support the DataModelRevision attribute?"
       id: BRBINFO.S.A0000

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

@@ -300,13 +300,13 @@ tests:
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On first controller chip tool, open commissioning window using ECM
+          On DUT_CR1 (chip tool) , open commissioning window using ECM
 
-            Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
+          Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
           ./chip-tool pairing open-commissioning-window 1 1 300 1000 3840
 
-          Verify Manual pairing code on TH1(all-clusters-app) Log
+          Verify Manual pairing code on DUT_CR1(chip-tool) Log
 
 
           [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
@@ -327,7 +327,7 @@ tests:
       verification: |
           On TH_CR2  using chip tool connect to the accessory
 
-            Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
+          Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
 
           ./chip-tool pairing code 1 36217551633  --commissioner-name beta
@@ -342,9 +342,9 @@ tests:
       verification: |
           On TH_CR2 , read fabrics list
 
-            Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
+          Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0  --commissioner-name beta
+          ./chip-tool operationalcredentials read fabrics 2 0 --fabric-filtered 0  --commissioner-name beta
 
           Verify TH_CE receives and processes the command successfully on TH_CE (all-clusters-app) log
 

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

@@ -51,7 +51,7 @@ tests:
       verification: |
           On DUT_CR1 (chip tool), open commissioning window using BCM
 
-            Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
+          Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
@@ -95,11 +95,12 @@ tests:
       verification: |
           On TH_CR2 using chip tool connect to the accessory
 
-            Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
+          Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
 
           ./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta
 
+
           Verify you got below message on TH_CE (all-clusters-app) log
           Device commissioning completed with success
       disabled: true
@@ -114,7 +115,7 @@ tests:
             Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
 
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
           Verify success response On TH_CE (all-clusters-app) Log
 
@@ -172,7 +173,7 @@ tests:
 
             Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
+          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
           Verify TH_CE receives and processes the command successfully on TH_CE (all-clusters-app) log
 
@@ -215,7 +216,7 @@ tests:
 
           Verify TH_CE responses with NOCResponse with a StatusCode OK on TH_CE (all-clusters-app) log
 
-          ./chip-tool operationalcredentials remove-fabric 2 1 0 --commissioner-name beta
+          ./chip-tool operationalcredentials remove-fabric 2 1 0
 
           CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
@@ -259,7 +260,7 @@ tests:
 
           Verify TH_CE receives and processes the command successfully on TH_CE (all-clusters-app)
 
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
+          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995219
           [1647863260.286772][9294:9299] CHIP:TOO:   Fabrics: 2 entries
@@ -282,7 +283,9 @@ tests:
           [1647863260.287515][9294:9299] CHIP:EM: Sending Standalone Ack for MessageCounter:11301761 on exchange 13180i
       disabled: true
 
-    - label: ""
+    - label:
+          "Verify TH_CE is now discoverable over DNS-SD with 2 Operational
+          service records (_matter._tcp SRV records)."
       verification: |
           Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
@@ -314,7 +317,7 @@ tests:
             Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
           For BCM,
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
           Verify success response On TH_CE (all-clusters-app) Log
 
@@ -372,7 +375,7 @@ tests:
 
             Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0 --commissioner-name beta
+          ./chip-tool operationalcredentials read fabrics 2 0 --fabric-filtered 0 --commissioner-name beta
 
           Verify TH_CE receives and processes the command successfully on TH_CE (all-clusters-app) log
 

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

@@ -161,7 +161,7 @@ tests:
               maxLength: 32
 
     - label:
-          "TH_CR1 writes the Basic Information Clusters NodeLabel mandatory
+          "TH_CR2 writes the Basic Information Clusters NodeLabel mandatory
           attribute of DUT_CE"
       identity: "beta"
       command: "writeAttribute"
@@ -172,7 +172,7 @@ tests:
           value: "chiptest"
 
     - label:
-          "TH_CR1 reads the Basic Information Clusters NodeLabel mandatory
+          "TH_CR2 reads the Basic Information Clusters NodeLabel mandatory
           attribute of DUT_CE"
       identity: "beta"
       command: "readAttribute"

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

@@ -180,7 +180,7 @@ tests:
       response:
           error: FAILURE
 
-    - label: "Commission from beta"
+    - label: "TH_CR2 starts a commissioning process on DUT_CE"
       identity: "beta"
       cluster: "CommissionerCommands"
       command: "PairWithCode"
@@ -191,7 +191,7 @@ tests:
               - name: "payload"
                 value: payload
 
-    - label: "TH_CR2 starts a commissioning process on DUT_CE"
+    - label: "DUT_CE is commissioned by TH_CR2"
       identity: "beta"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"