From 562d74f032f8f33b9202113956154c82caf31c72 Mon Sep 17 00:00:00 2001
From: StephaneGUELEC <94045077+StephaneGUELEC@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:16:35 +0200
Subject: [PATCH 01/14] Add files via upload

Add yaml test script for TBRM
---
 .../certification/TEST_TC_TBRM_2.2.yaml       | 107 ++++++++++++++++++
 .../certification/TEST_TC_TBRM_2.3.yaml       | 106 +++++++++++++++++
 .../certification/TEST_TC_TBRM_2.4.yaml       |  59 ++++++++++
 .../certification/TEST_TC_TBRM_2.5.yaml       |   0
 4 files changed, 272 insertions(+)
 create mode 100644 src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
 create mode 100644 src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
 create mode 100644 src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
 create mode 100644 src/app/tests/suites/certification/TEST_TC_TBRM_2.5.yaml

diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
new file mode 100644
index 00000000000000..365ef9d08a7db3
--- /dev/null
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
@@ -0,0 +1,107 @@
+
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "[TC-TBRM-2.2] Initial Dataset configuration of Thread Border Router"
+
+PICS:
+    - TBRM.S
+
+config:
+    nodeId: 0x12344321
+    cluster: Thread Border Router Management
+    endpoint: 1
+    PIXIT.TBRM.THREAD_ACTIVE_DATASET:
+        type: octet_string
+        defaultValue: "hex:0e080000000000010000000300001235060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8031054687265616441637469766554657374"
+        ## DATASET VALUE:
+        # Active Timestamp: 1
+        # Channel: 18
+        # Channel Mask: 0x07fff800
+        # Ext PAN ID: 2ad51c02fe8f64f2
+        # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
+        # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
+        # Network Name: ThreadActiveTest
+        # PAN ID: 0xc4d9
+        # PSKc: 0a133626c411d7de02a570ca3c3d8047
+        # Security Policy: 672 onrc 0
+    
+
+
+# pre-requisis ??
+#    - label: "Wait for the commissioned device to be retrieved"
+#      cluster: DelayCommands
+#      command: WaitForCommissionee
+#      arguments:
+#          values:
+#              - name: nodeId
+#                value: nodeId
+
+    - label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: ActiveDatasetTimestamp
+      response:
+        value: null
+        constraints:
+          type: int64u
+
+    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: PendingDatasetTimestamp
+      response:
+        value: null
+        constraints:
+          type: int64u
+
+    - label: "TH sends an invalid ActiveDatasetRequest command to the DUT"
+      command: SetActiveDatasetRequest
+      arguments: 
+        values : 
+            - name: "ActiveDataset"
+              value: PIXIT.TBRM.THREAD_INVALID_DATASET
+      response:
+          error: INVALID_COMMAND
+
+    - label: "TH sends a valid ActiveDatasetRequest command to the DUT"
+      command: SetActiveDatasetRequest
+      arguments: 
+        values : 
+            - name: "ActiveDataset"
+              value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
+      response:
+          constraints:
+            contains: [0x00]
+
+    - label: "TH reads the InterfaceEnabled attribute from the DUT"
+      command: readAttribute
+      attribute: InterfaceEnabled
+      response:
+          constraints:
+              type: boolean
+              hasValue: true
+
+    - label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: ActiveDatasetTimestamp
+      response:
+          constraints:
+              type: int64u
+
+    - label: "TH sends a valid GetActiveDatasetRequest command to the DUT"
+      command: GetActiveDatasetRequest
+      response:
+        constraints:
+          type: octet_string
+          hasValue: true
+          value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
new file mode 100644
index 00000000000000..c952f12b69503b
--- /dev/null
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
@@ -0,0 +1,106 @@
+
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "[TC-TBRM-2.3] Change dataset configuration of Thread Border Router"
+
+PICS:
+    - TBRM.S
+
+config:
+    nodeId: 0x12344321
+    cluster: Thread Border Router Management
+    endpoint: 1
+    PIXIT.TBRM.THREAD_PENDING_DATASET:
+        type: octet_string
+        defaultValue: "hex:0e08000000000001000035060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8030d54687265616450656e64696e6734040000dd36000300000c33080000000000010000"
+    ## DATASET VALUE:
+    # Active Timestamp: 1
+    # Channel: 12
+    # Channel Mask: 0x07fff800
+    # Delay: 60000
+    # Ext PAN ID: 2ad51c02fe8f64f2
+    # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
+    # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
+    # Network Name: ThreadPending
+    # PAN ID: 0xc4d9
+    # PSKc: 0a133626c411d7de02a570ca3c3d8047
+    # Security Policy: 672 onrc 0
+    ## The name of the Thread Network anb channel MUST change before 1 min (limited duration to reduce the test time)
+
+# pre-requisis ??
+#    - label: "Wait for the commissioned device to be retrieved"
+#      cluster: DelayCommands
+#      command: WaitForCommissionee
+#      arguments:
+#          values:
+#              - name: nodeId
+#                value: nodeId
+
+    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: PendingDatasetTimestamp
+      response:
+      ## TODO : do we need to check if the value is null :
+      # value: null
+        saveAs: initialPendingTimestamp
+        constraints:
+          type: int64u
+          hasValue: true
+
+    - label: "TH sends a SetPendingDatasetRequest command to the DUT"
+     command: SetPendingDatasetRequest
+      arguments: 
+        values : 
+            - name: "PendingDataset"
+              value: PIXIT.TBRM.THREAD_PENDING_DATASET
+      response:
+          constraints:
+            contains: [0x00]
+
+    - label: "TH sends a GetPendingDatasetRequest command to the DUT"
+      command: GetPendingDatasetRequest
+      response:
+        constraints:
+          type: octet_string
+          hasValue: true
+          value: PIXIT.TBRM.THREAD_PENDING_DATASET
+
+    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
+      command: readAttribute
+      attribute: PendingDatasetTimestamp
+      response:
+          constraints:
+              type: int16u
+              hasValue: true
+              exclude: [initialPendingTimestamp]
+
+    - label: "TH subscribes to the ActiveDatasetTimestamp attribute from the DUT"
+      command: subscribeAttribute
+      attribute: ActiveDatasetTimestamp
+      minInterval: 1
+      maxInterval: 70
+      # We wait up to 70 seconds (60 sec of delay timer defined in the PIXIT.TBRM.THREAD_PENDING_DATASET + 10 sec of margin)
+      response:
+          constraints:
+              type: boolean
+              hasValue: true
+
+    - label: "TH reads the InterfaceEnabled attribute from the DUT"
+      command: readAttribute
+      attribute: InterfaceEnabled
+      response:
+          constraints:
+              type: boolean
+              hasValue: true
\ No newline at end of file
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
new file mode 100644
index 00000000000000..21aca886ca7c98
--- /dev/null
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
@@ -0,0 +1,59 @@
+
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "[TC-TBRM-2.4]  FAILSAFE_REQUIRED message Validation for SetActiveDatasetRequest"
+
+PICS:
+    - TBRM.S
+
+config:
+    nodeId: 0x12344321
+    cluster: Thread Border Router Management
+    endpoint: 1
+    PIXIT.TBRM.THREAD_ACTIVE_DATASET:
+        type: octet_string
+        defaultValue: "hex:0e080000000000010000000300001235060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8031054687265616441637469766554657374"
+    ## DATASET VALUE:
+    # Active Timestamp: 1
+    # Channel: 18
+    # Channel Mask: 0x07fff800
+    # Ext PAN ID: 2ad51c02fe8f64f2
+    # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
+    # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
+    # Network Name: ThreadActiveTest
+    # PAN ID: 0xc4d9
+    # PSKc: 0a133626c411d7de02a570ca3c3d8047
+    # Security Policy: 672 onrc 0
+
+# pre-requisis ??
+#    - label: "Wait for the commissioned device to be retrieved"
+#      cluster: DelayCommands
+#      command: WaitForCommissionee
+#      arguments:
+#          values:
+#              - name: nodeId
+#                value: nodeId
+
+    - label: "TH sends an SetActiveDatasetRequest command to the DUT with ActiveDataset field set to PIXIT.TBRM.THREAD_ACTIVE_DATASET and Breadcrumb field set to 1"
+      PICS: TBRM.S.C03.Rsp
+      command: SetActiveDatasetRequest
+      arguments: 
+        values : 
+            - name: "ActiveDataset"
+              value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
+            - name: "Breadcrumb"
+              value: 1
+      response:
+          error: FAILSAFE_REQUIRED
\ No newline at end of file
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.5.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.5.yaml
new file mode 100644
index 00000000000000..e69de29bb2d1d6

From 677460e40ecd0a31b31b7519c5e0d8be5af3988a Mon Sep 17 00:00:00 2001
From: StephaneGUELEC <94045077+StephaneGUELEC@users.noreply.github.com>
Date: Fri, 2 Aug 2024 17:02:15 +0200
Subject: [PATCH 02/14] Update TEST_TC_TBRM_2.2.yaml

---
 src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
index 365ef9d08a7db3..82a991c721d5f9 100644
--- a/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
@@ -38,7 +38,7 @@ config:
         # Security Policy: 672 onrc 0
     
 
-
+tests:
 # pre-requisis ??
 #    - label: "Wait for the commissioned device to be retrieved"
 #      cluster: DelayCommands

From 6b4ef88fb867247044ed30c52d3cc86f7ae1b496 Mon Sep 17 00:00:00 2001
From: StephaneGUELEC <94045077+StephaneGUELEC@users.noreply.github.com>
Date: Fri, 2 Aug 2024 17:13:08 +0200
Subject: [PATCH 03/14] Update TEST_TC_TBRM_2.3.yaml

---
 src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
index c952f12b69503b..f4c64c57084029 100644
--- a/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
@@ -39,6 +39,7 @@ config:
     # Security Policy: 672 onrc 0
     ## The name of the Thread Network anb channel MUST change before 1 min (limited duration to reduce the test time)
 
+tests:
 # pre-requisis ??
 #    - label: "Wait for the commissioned device to be retrieved"
 #      cluster: DelayCommands
@@ -60,9 +61,9 @@ config:
           hasValue: true
 
     - label: "TH sends a SetPendingDatasetRequest command to the DUT"
-     command: SetPendingDatasetRequest
+      command: SetPendingDatasetRequest
       arguments: 
-        values : 
+           values : 
             - name: "PendingDataset"
               value: PIXIT.TBRM.THREAD_PENDING_DATASET
       response:
@@ -103,4 +104,4 @@ config:
       response:
           constraints:
               type: boolean
-              hasValue: true
\ No newline at end of file
+              hasValue: true

From a46b0d78502ed3106e9b093363151f109de68883 Mon Sep 17 00:00:00 2001
From: StephaneGUELEC <94045077+StephaneGUELEC@users.noreply.github.com>
Date: Fri, 2 Aug 2024 17:16:44 +0200
Subject: [PATCH 04/14] Update TEST_TC_TBRM_2.4.yaml

---
 src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
index 21aca886ca7c98..f63477a80ab180 100644
--- a/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
+++ b/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
@@ -37,6 +37,7 @@ config:
     # PSKc: 0a133626c411d7de02a570ca3c3d8047
     # Security Policy: 672 onrc 0
 
+test:
 # pre-requisis ??
 #    - label: "Wait for the commissioned device to be retrieved"
 #      cluster: DelayCommands
@@ -56,4 +57,4 @@ config:
             - name: "Breadcrumb"
               value: 1
       response:
-          error: FAILSAFE_REQUIRED
\ No newline at end of file
+          error: FAILSAFE_REQUIRED

From df465ffdad3f18f333960c70a0eab10611b8b2c8 Mon Sep 17 00:00:00 2001
From: marchemi <mikael.marche@orange.com>
Date: Thu, 22 Aug 2024 17:53:13 +0200
Subject: [PATCH 05/14] Test script consitancy wit test plan after TE2

---
 .../matter_chip_tool_adapter/encoder.py       |   8 ++
 .../clusters/commissioner_commands.py         |   5 +
 .../certification/TEST_TC_TBRM_2.2.yaml       | 107 ------------------
 .../certification/TEST_TC_TBRM_2.3.yaml       | 107 ------------------
 .../certification/TEST_TC_TBRM_2.4.yaml       |  60 ----------
 .../certification/TEST_TC_TBRM_2.5.yaml       |   0
 .../certification/Test_TC_TBRM_2_2.yaml       |  22 +++-
 .../certification/Test_TC_TBRM_2_3.yaml       |  29 +++--
 .../Test_TC_TBRM_3_1_Simulated.yaml           |  44 +++++++
 9 files changed, 97 insertions(+), 285 deletions(-)
 delete mode 100644 src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
 delete mode 100644 src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
 delete mode 100644 src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
 delete mode 100644 src/app/tests/suites/certification/TEST_TC_TBRM_2.5.yaml
 create mode 100644 src/app/tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml

diff --git a/examples/chip-tool/py_matter_chip_tool_adapter/matter_chip_tool_adapter/encoder.py b/examples/chip-tool/py_matter_chip_tool_adapter/matter_chip_tool_adapter/encoder.py
index f4e8e6711d7105..252d23c0375836 100644
--- a/examples/chip-tool/py_matter_chip_tool_adapter/matter_chip_tool_adapter/encoder.py
+++ b/examples/chip-tool/py_matter_chip_tool_adapter/matter_chip_tool_adapter/encoder.py
@@ -130,6 +130,14 @@
                 'has_destination': False,
                 'has_endpoint': False,
             },
+            'EstablishPASESession': {
+                'alias': 'code-paseonly',
+                'arguments': {
+                    'nodeId': 'node-id'
+                },
+                'has_destination': False,
+                'has_endpoint': False,
+            },
             'GetCommissionerNodeId': {
                 'has_destination': False,
                 'has_endpoint': False,
diff --git a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/commissioner_commands.py b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/commissioner_commands.py
index d3cc92b7aa10b9..7cc46e582d3909 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/commissioner_commands.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/commissioner_commands.py
@@ -56,6 +56,11 @@
       <arg name="RCAC" type="octet_string"/>
       <arg name="IPK" type="octet_string"/>
     </command>
+  
+    <command source="client" code="5" name="EstablishPASESession">
+      <arg name="nodeId" type="node_id"/>
+      <arg name="payload" type="char_string"/>
+    </command>
 
 </cluster>
 </configurator>
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
deleted file mode 100644
index 82a991c721d5f9..00000000000000
--- a/src/app/tests/suites/certification/TEST_TC_TBRM_2.2.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-# Copyright (c) 2024 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: "[TC-TBRM-2.2] Initial Dataset configuration of Thread Border Router"
-
-PICS:
-    - TBRM.S
-
-config:
-    nodeId: 0x12344321
-    cluster: Thread Border Router Management
-    endpoint: 1
-    PIXIT.TBRM.THREAD_ACTIVE_DATASET:
-        type: octet_string
-        defaultValue: "hex:0e080000000000010000000300001235060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8031054687265616441637469766554657374"
-        ## DATASET VALUE:
-        # Active Timestamp: 1
-        # Channel: 18
-        # Channel Mask: 0x07fff800
-        # Ext PAN ID: 2ad51c02fe8f64f2
-        # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
-        # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
-        # Network Name: ThreadActiveTest
-        # PAN ID: 0xc4d9
-        # PSKc: 0a133626c411d7de02a570ca3c3d8047
-        # Security Policy: 672 onrc 0
-    
-
-tests:
-# pre-requisis ??
-#    - label: "Wait for the commissioned device to be retrieved"
-#      cluster: DelayCommands
-#      command: WaitForCommissionee
-#      arguments:
-#          values:
-#              - name: nodeId
-#                value: nodeId
-
-    - label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
-      command: readAttribute
-      attribute: ActiveDatasetTimestamp
-      response:
-        value: null
-        constraints:
-          type: int64u
-
-    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
-      command: readAttribute
-      attribute: PendingDatasetTimestamp
-      response:
-        value: null
-        constraints:
-          type: int64u
-
-    - label: "TH sends an invalid ActiveDatasetRequest command to the DUT"
-      command: SetActiveDatasetRequest
-      arguments: 
-        values : 
-            - name: "ActiveDataset"
-              value: PIXIT.TBRM.THREAD_INVALID_DATASET
-      response:
-          error: INVALID_COMMAND
-
-    - label: "TH sends a valid ActiveDatasetRequest command to the DUT"
-      command: SetActiveDatasetRequest
-      arguments: 
-        values : 
-            - name: "ActiveDataset"
-              value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
-      response:
-          constraints:
-            contains: [0x00]
-
-    - label: "TH reads the InterfaceEnabled attribute from the DUT"
-      command: readAttribute
-      attribute: InterfaceEnabled
-      response:
-          constraints:
-              type: boolean
-              hasValue: true
-
-    - label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
-      command: readAttribute
-      attribute: ActiveDatasetTimestamp
-      response:
-          constraints:
-              type: int64u
-
-    - label: "TH sends a valid GetActiveDatasetRequest command to the DUT"
-      command: GetActiveDatasetRequest
-      response:
-        constraints:
-          type: octet_string
-          hasValue: true
-          value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
deleted file mode 100644
index f4c64c57084029..00000000000000
--- a/src/app/tests/suites/certification/TEST_TC_TBRM_2.3.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-# Copyright (c) 2024 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: "[TC-TBRM-2.3] Change dataset configuration of Thread Border Router"
-
-PICS:
-    - TBRM.S
-
-config:
-    nodeId: 0x12344321
-    cluster: Thread Border Router Management
-    endpoint: 1
-    PIXIT.TBRM.THREAD_PENDING_DATASET:
-        type: octet_string
-        defaultValue: "hex:0e08000000000001000035060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8030d54687265616450656e64696e6734040000dd36000300000c33080000000000010000"
-    ## DATASET VALUE:
-    # Active Timestamp: 1
-    # Channel: 12
-    # Channel Mask: 0x07fff800
-    # Delay: 60000
-    # Ext PAN ID: 2ad51c02fe8f64f2
-    # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
-    # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
-    # Network Name: ThreadPending
-    # PAN ID: 0xc4d9
-    # PSKc: 0a133626c411d7de02a570ca3c3d8047
-    # Security Policy: 672 onrc 0
-    ## The name of the Thread Network anb channel MUST change before 1 min (limited duration to reduce the test time)
-
-tests:
-# pre-requisis ??
-#    - label: "Wait for the commissioned device to be retrieved"
-#      cluster: DelayCommands
-#      command: WaitForCommissionee
-#      arguments:
-#          values:
-#              - name: nodeId
-#                value: nodeId
-
-    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
-      command: readAttribute
-      attribute: PendingDatasetTimestamp
-      response:
-      ## TODO : do we need to check if the value is null :
-      # value: null
-        saveAs: initialPendingTimestamp
-        constraints:
-          type: int64u
-          hasValue: true
-
-    - label: "TH sends a SetPendingDatasetRequest command to the DUT"
-      command: SetPendingDatasetRequest
-      arguments: 
-           values : 
-            - name: "PendingDataset"
-              value: PIXIT.TBRM.THREAD_PENDING_DATASET
-      response:
-          constraints:
-            contains: [0x00]
-
-    - label: "TH sends a GetPendingDatasetRequest command to the DUT"
-      command: GetPendingDatasetRequest
-      response:
-        constraints:
-          type: octet_string
-          hasValue: true
-          value: PIXIT.TBRM.THREAD_PENDING_DATASET
-
-    - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
-      command: readAttribute
-      attribute: PendingDatasetTimestamp
-      response:
-          constraints:
-              type: int16u
-              hasValue: true
-              exclude: [initialPendingTimestamp]
-
-    - label: "TH subscribes to the ActiveDatasetTimestamp attribute from the DUT"
-      command: subscribeAttribute
-      attribute: ActiveDatasetTimestamp
-      minInterval: 1
-      maxInterval: 70
-      # We wait up to 70 seconds (60 sec of delay timer defined in the PIXIT.TBRM.THREAD_PENDING_DATASET + 10 sec of margin)
-      response:
-          constraints:
-              type: boolean
-              hasValue: true
-
-    - label: "TH reads the InterfaceEnabled attribute from the DUT"
-      command: readAttribute
-      attribute: InterfaceEnabled
-      response:
-          constraints:
-              type: boolean
-              hasValue: true
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
deleted file mode 100644
index f63477a80ab180..00000000000000
--- a/src/app/tests/suites/certification/TEST_TC_TBRM_2.4.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-# Copyright (c) 2024 Project CHIP Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: "[TC-TBRM-2.4]  FAILSAFE_REQUIRED message Validation for SetActiveDatasetRequest"
-
-PICS:
-    - TBRM.S
-
-config:
-    nodeId: 0x12344321
-    cluster: Thread Border Router Management
-    endpoint: 1
-    PIXIT.TBRM.THREAD_ACTIVE_DATASET:
-        type: octet_string
-        defaultValue: "hex:0e080000000000010000000300001235060004001fffe002082ad51c02fe8f64f20708fddb8af85255f93a051083e2b9b2cc609b00125adbf823ea2ab20102c4d904100a133626c411d7de02a570ca3c3d80470c0402a0f7f8031054687265616441637469766554657374"
-    ## DATASET VALUE:
-    # Active Timestamp: 1
-    # Channel: 18
-    # Channel Mask: 0x07fff800
-    # Ext PAN ID: 2ad51c02fe8f64f2
-    # Mesh Local Prefix: fddb:8af8:5255:f93a::/64
-    # Network Key: 83e2b9b2cc609b00125adbf823ea2ab2
-    # Network Name: ThreadActiveTest
-    # PAN ID: 0xc4d9
-    # PSKc: 0a133626c411d7de02a570ca3c3d8047
-    # Security Policy: 672 onrc 0
-
-test:
-# pre-requisis ??
-#    - label: "Wait for the commissioned device to be retrieved"
-#      cluster: DelayCommands
-#      command: WaitForCommissionee
-#      arguments:
-#          values:
-#              - name: nodeId
-#                value: nodeId
-
-    - label: "TH sends an SetActiveDatasetRequest command to the DUT with ActiveDataset field set to PIXIT.TBRM.THREAD_ACTIVE_DATASET and Breadcrumb field set to 1"
-      PICS: TBRM.S.C03.Rsp
-      command: SetActiveDatasetRequest
-      arguments: 
-        values : 
-            - name: "ActiveDataset"
-              value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
-            - name: "Breadcrumb"
-              value: 1
-      response:
-          error: FAILSAFE_REQUIRED
diff --git a/src/app/tests/suites/certification/TEST_TC_TBRM_2.5.yaml b/src/app/tests/suites/certification/TEST_TC_TBRM_2.5.yaml
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
index 852e18a73adc8a..6e2a59c57a6c50 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
@@ -41,19 +41,21 @@ tests:
           values:
               - name: nodeId
                 value: nodeId
-
+    # Step 1
     - label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
       command: readAttribute
       attribute: ActiveDatasetTimestamp
       response:
           value: null
 
+    # Step 2
     - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
       command: readAttribute
       attribute: PendingDatasetTimestamp
       response:
           value: null
 
+    # Step 3
     - label:
           "TH sends a valid ActiveDatasetRequest command to the DUT without
           having armed the fail-safe"
@@ -65,6 +67,7 @@ tests:
       response:
           error: FAILSAFE_REQUIRED
 
+    # Step 4
     - label: "TH sends ArmFailSafe command to the DUT"
       cluster: General Commissioning
       command: ArmFailSafe
@@ -76,6 +79,7 @@ tests:
               - name: Breadcrumb
                 value: 1
 
+    # Step 5
     - label: "TH sends an invalid ActiveDatasetRequest command to the DUT"
       command: SetActiveDatasetRequest
       arguments:
@@ -85,6 +89,7 @@ tests:
       response:
           error: INVALID_COMMAND
 
+    # Step 6
     - label: "TH sends a valid ActiveDatasetRequest command to the DUT"
       command: SetActiveDatasetRequest
       arguments:
@@ -92,12 +97,24 @@ tests:
               - name: ActiveDataset
                 value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
 
+    # Step 7
+    - label: "TH sends CommissioningComplete command to the DUT"
+      cluster: General Commissioning
+      command: CommissioningComplete
+      endpoint: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0 # SUCCESS
+
+    # Step 8
     - label: "TH reads the InterfaceEnabled attribute from the DUT"
       command: readAttribute
       attribute: InterfaceEnabled
       response:
           value: true
 
+    # Step 9
     - label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
       command: readAttribute
       attribute: ActiveDatasetTimestamp
@@ -106,7 +123,8 @@ tests:
           constraints:
               type: int64u
 
-    - label: "TH sends a valid GetActiveDatasetRequest command to the DUT"
+    # Step 10
+    - label: "TH send a GetActiveDatasetRequest command to the DUT"
       command: GetActiveDatasetRequest
       response:
           values:
diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
index 7a55191f471f0b..ec084588b6e901 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
@@ -49,7 +49,7 @@ tests:
           constraints:
               type: int64u
 
-    - label: "If the ActiveDatasetTimestamp attribute not null, go to step 4"
+    - label: "If the ActiveDatasetTimestamp attribute not null, go to step 5"
       cluster: EqualityCommands
       command: UnsignedNumberEquals
       arguments:
@@ -86,6 +86,17 @@ tests:
                 value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
 
     # Step 4
+    - label: "TH sends CommissioningComplete command to the DUT"
+      runIf: noActiveDataset
+      cluster: General Commissioning
+      command: CommissioningComplete
+      endpoint: 0
+      response:
+          values:
+              - name: "ErrorCode"
+                value: 0 # SUCCESS
+
+    # Step 5
     - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
       command: readAttribute
       attribute: PendingDatasetTimestamp
@@ -94,7 +105,7 @@ tests:
           constraints:
               type: int64u
 
-    # Step 5
+    # Step 6
     - label: "TH sends a SetPendingDatasetRequest command to the DUT"
       command: SetPendingDatasetRequest
       arguments:
@@ -102,7 +113,7 @@ tests:
               - name: PendingDataset
                 value: PIXIT.TBRM.THREAD_PENDING_DATASET
 
-    # Step 6
+    # Step 7
     - label: "TH sends a GetPendingDatasetRequest command to the DUT"
       command: GetPendingDatasetRequest
       response:
@@ -112,7 +123,7 @@ tests:
                     type: octet_string
                     # TODO: This should be PIXIT.TBRM.THREAD_PENDING_DATASET but ignoring the Delay Timer element if present
 
-    # Step 7
+    # Step 8
     - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
       command: readAttribute
       attribute: PendingDatasetTimestamp
@@ -121,7 +132,7 @@ tests:
               type: int64u
               notValue: initialPendingTimestamp
 
-    # Step 8
+    # Step 9
     - label:
           "TH subscribes to the ActiveDatasetTimestamp attribute from the DUT"
       command: subscribeAttribute
@@ -141,15 +152,15 @@ tests:
           constraints:
               hasValue: true
 
-    # Step 9
+    # Step 10
     - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
       command: readAttribute
       attribute: PendingDatasetTimestamp
       response:
           value: null
 
-    # Step 10
-    - label: "TH sends a valid GetActiveDatasetRequest command to the DUT"
+    # Step 11
+    - label: "TH sends a GetActiveDatasetRequest command to the DUT"
       command: GetActiveDatasetRequest
       response:
           values:
@@ -158,7 +169,7 @@ tests:
                 constraints:
                     type: octet_string
 
-    # Step 11
+    # Step 12
     - label: "TH reads the InterfaceEnabled attribute from the DUT"
       command: readAttribute
       attribute: InterfaceEnabled
diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml
new file mode 100644
index 00000000000000..86e861720d5d1e
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml
@@ -0,0 +1,44 @@
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "[TC-TBRM-3.1] Functionality with client as DUT"
+
+PICS:
+    - TBRM.C
+
+config:
+    nodeId: 0x12344321
+    cluster: Thread Border Router Management
+    endpoint: 1
+
+tests:
+    # Step 1
+    - label: "DUT send SetActiveDatasetRequest to TH"
+      PICS: TBRM.C.C03.Tx
+      wait: "SetActiveDatasetRequest"
+
+    # Step 2
+    - label: "DUT send SetPendingDatasetRequest to TH"
+      PICS: TBRM.C.C04.Tx
+      wait: "SetPendingDatasetRequest"
+
+    # Step 3
+    - label: "DUT send GetActiveDatasetRequest to TH"
+      PICS: TBRM.C.C00.Tx
+      wait: "GetActiveDatasetRequest"
+    
+    # Step 4
+    - label: "DUT send GetPendingDatasetRequest to TH"
+      PICS: TBRM.C.C01.Tx
+      wait: "GetPendingDatasetRequest"

From ecd90c70e319854dc52483e75288d9610ea57777 Mon Sep 17 00:00:00 2001
From: marchemi <mikael.marche@orange.com>
Date: Thu, 22 Aug 2024 18:04:42 +0200
Subject: [PATCH 06/14] Test script consitancy wit test plan after TE2

---
 .../certification/Test_TC_TBRM_2_4.yaml       | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml

diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
new file mode 100644
index 00000000000000..cc427bb363b033
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
@@ -0,0 +1,41 @@
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "[TC-TBRM-2.4] Verify that getting Active or Pending Dataset in the PASE session results in unsupported access"
+
+PICS:
+    - TBRM.S
+
+config:
+    nodeId: 0x12344321
+    payload: MT:Y.K9042C00KA0648G00
+
+tests:
+    - label: "TH EstablishPASESession"
+      cluster: CommissionerCommands
+      endpoint: 0
+      command: EstablishPASESession
+      arguments:
+          values:
+              - name: nodeId
+                value: nodeId
+              - name: payload
+                value: payload
+
+    - label: "TH send GetActiveDatasetRequest command to the DUT in PASE session"
+      cluster: Thread Border Router Management
+      endpoint: 1
+      command: GetActiveDatasetRequest
+      response:
+          error: UNSUPPORTED_ACCESS

From e44455ade992f758661aa9b9b1e9cde3d4478cda Mon Sep 17 00:00:00 2001
From: marchemi <56955785+marchemi@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:56:50 +0200
Subject: [PATCH 07/14] Update
 src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml

Co-authored-by: Karsten Sperling <113487422+ksperling-apple@users.noreply.github.com>
---
 src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
index ec084588b6e901..79edea4220db81 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
@@ -91,10 +91,6 @@ tests:
       cluster: General Commissioning
       command: CommissioningComplete
       endpoint: 0
-      response:
-          values:
-              - name: "ErrorCode"
-                value: 0 # SUCCESS
 
     # Step 5
     - label: "TH reads the PendingDatasetTimestamp attribute from the DUT"

From 722c4990bfd12bfb951acbdbed72c3e1bc9b54e8 Mon Sep 17 00:00:00 2001
From: marchemi <56955785+marchemi@users.noreply.github.com>
Date: Mon, 26 Aug 2024 09:56:58 +0200
Subject: [PATCH 08/14] Update
 src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml

Co-authored-by: Karsten Sperling <113487422+ksperling-apple@users.noreply.github.com>
---
 src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
index 6e2a59c57a6c50..7c9937ae12de10 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
@@ -102,10 +102,6 @@ tests:
       cluster: General Commissioning
       command: CommissioningComplete
       endpoint: 0
-      response:
-          values:
-              - name: "ErrorCode"
-                value: 0 # SUCCESS
 
     # Step 8
     - label: "TH reads the InterfaceEnabled attribute from the DUT"

From 9f580022ee8deb1fba8cc47e1cd57ef9d1a562c6 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 26 Aug 2024 07:57:13 +0000
Subject: [PATCH 09/14] Restyled by whitespace

---
 .../tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml
index 86e861720d5d1e..095711a0fcee95 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_3_1_Simulated.yaml
@@ -37,7 +37,7 @@ tests:
     - label: "DUT send GetActiveDatasetRequest to TH"
       PICS: TBRM.C.C00.Tx
       wait: "GetActiveDatasetRequest"
-    
+
     # Step 4
     - label: "DUT send GetPendingDatasetRequest to TH"
       PICS: TBRM.C.C01.Tx

From 2c8c0b7baab4a5f51082bfeae3286477de2ae687 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 26 Aug 2024 07:57:14 +0000
Subject: [PATCH 10/14] Restyled by prettier-yaml

---
 src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
index cc427bb363b033..6162413b39cef5 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: "[TC-TBRM-2.4] Verify that getting Active or Pending Dataset in the PASE session results in unsupported access"
+name:
+    "[TC-TBRM-2.4] Verify that getting Active or Pending Dataset in the PASE
+    session results in unsupported access"
 
 PICS:
     - TBRM.S
@@ -33,7 +35,8 @@ tests:
               - name: payload
                 value: payload
 
-    - label: "TH send GetActiveDatasetRequest command to the DUT in PASE session"
+    - label:
+          "TH send GetActiveDatasetRequest command to the DUT in PASE session"
       cluster: Thread Border Router Management
       endpoint: 1
       command: GetActiveDatasetRequest

From 45b6ed258cea448f31261ac796c10432a005d9a2 Mon Sep 17 00:00:00 2001
From: Mikael Marche <mikael.marche@orange.com>
Date: Tue, 27 Aug 2024 14:37:24 +0200
Subject: [PATCH 11/14] Test_TC_TBRM_2_4. synchronisation with TC-THNETDIR-2.3
 according test Plan

---
 .../certification/Test_TC_TBRM_2_4.yaml       | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
index 6162413b39cef5..57220619cf5bd6 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
@@ -22,9 +22,40 @@ PICS:
 config:
     nodeId: 0x12344321
     payload: MT:Y.K9042C00KA0648G00
+    discriminator: 3840
+    PakeVerifier:
+        type: octet_string
+        defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
 
 tests:
-    - label: "TH EstablishPASESession"
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: DelayCommands
+      command: WaitForCommissionee
+      arguments:
+          values:
+              - name: nodeId
+                value: nodeId
+
+    - label: "Open Commissioning Window"
+      endpoint: 0
+      cluster: Administrator Commissioning
+      command: OpenCommissioningWindow
+      timedInteractionTimeoutMs: 2000
+      arguments:
+          values:
+              - name: CommissioningTimeout
+                value: 180
+              - name: PAKEPasscodeVerifier
+                value: PakeVerifier
+              - name: Discriminator
+                value: discriminator
+              - name: Iterations
+                value: 1000
+              - name: Salt
+                value: "SPAKE2P Key Salt"
+
+    - label: "TH2  establishes a PASE session with the DUT"
+      identity: beta   
       cluster: CommissionerCommands
       endpoint: 0
       command: EstablishPASESession
@@ -36,9 +67,19 @@ tests:
                 value: payload
 
     - label:
-          "TH send GetActiveDatasetRequest command to the DUT in PASE session"
+          "TH2 send GetActiveDatasetRequest command to the DUT in PASE session"
+      identity: beta 
       cluster: Thread Border Router Management
       endpoint: 1
       command: GetActiveDatasetRequest
       response:
           error: UNSUPPORTED_ACCESS
+
+    - label:
+          "TH2 send GetPendingDatasetRequest command to the DUT in PASE session"
+      identity: beta 
+      cluster: Thread Border Router Management
+      endpoint: 1
+      command: GetPendingDatasetRequest
+      response:
+          error: UNSUPPORTED_ACCESS

From 014a9aeb6169f0f1a2a9924325fec3af17721cc5 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Tue, 27 Aug 2024 12:37:47 +0000
Subject: [PATCH 12/14] Restyled by whitespace

---
 src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
index 57220619cf5bd6..14c83f266cf001 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
@@ -55,7 +55,7 @@ tests:
                 value: "SPAKE2P Key Salt"
 
     - label: "TH2  establishes a PASE session with the DUT"
-      identity: beta   
+      identity: beta
       cluster: CommissionerCommands
       endpoint: 0
       command: EstablishPASESession
@@ -68,7 +68,7 @@ tests:
 
     - label:
           "TH2 send GetActiveDatasetRequest command to the DUT in PASE session"
-      identity: beta 
+      identity: beta
       cluster: Thread Border Router Management
       endpoint: 1
       command: GetActiveDatasetRequest
@@ -77,7 +77,7 @@ tests:
 
     - label:
           "TH2 send GetPendingDatasetRequest command to the DUT in PASE session"
-      identity: beta 
+      identity: beta
       cluster: Thread Border Router Management
       endpoint: 1
       command: GetPendingDatasetRequest

From 202148a646df5820f09944283b2bafb127f51e8f Mon Sep 17 00:00:00 2001
From: Karsten Sperling <ksperling@apple.com>
Date: Thu, 29 Aug 2024 06:42:11 +1200
Subject: [PATCH 13/14] Test tweaks to get CI to pass

- Use pairing payload matching the other parameters
- Check response of ArmFailSafe commands
- Fix bad merge in commissioner_commands.py
---
 .../pseudo_clusters/clusters/commissioner_commands.py      | 5 -----
 src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml   | 7 +++++--
 src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml   | 4 ++++
 src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml   | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/commissioner_commands.py b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/commissioner_commands.py
index a2afae428f5172..451d1ee188ff88 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/commissioner_commands.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/commissioner_commands.py
@@ -56,11 +56,6 @@
       <arg name="RCAC" type="octet_string"/>
       <arg name="IPK" type="octet_string"/>
     </command>
-  
-    <command source="client" code="5" name="EstablishPASESession">
-      <arg name="nodeId" type="node_id"/>
-      <arg name="payload" type="char_string"/>
-    </command>
 
     <command source="client" code="5" name="EstablishPASESession">
       <arg name="nodeId" type="node_id"/>
diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
index 7c9937ae12de10..0584572b0c8b37 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
@@ -56,8 +56,7 @@ tests:
           value: null
 
     # Step 3
-    - label:
-          "TH sends a valid ActiveDatasetRequest command to the DUT without
+    - label: "TH sends a valid ActiveDatasetRequest command to the DUT without
           having armed the fail-safe"
       command: SetActiveDatasetRequest
       arguments:
@@ -78,6 +77,10 @@ tests:
                 value: 60
               - name: Breadcrumb
                 value: 1
+      response:
+          values:
+              - name: ErrorCode
+                value: CommissioningErrorEnum.OK
 
     # Step 5
     - label: "TH sends an invalid ActiveDatasetRequest command to the DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
index 79edea4220db81..a0ecd11693ef8d 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml
@@ -75,6 +75,10 @@ tests:
                 value: 60
               - name: Breadcrumb
                 value: 1
+      response:
+          values:
+              - name: ErrorCode
+                value: CommissioningErrorEnum.OK
 
     # Step 3
     - label: "TH sends a valid ActiveDatasetRequest command to the DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
index 14c83f266cf001..d1483c1c5a930a 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml
@@ -21,7 +21,8 @@ PICS:
 
 config:
     nodeId: 0x12344321
-    payload: MT:Y.K9042C00KA0648G00
+
+    payload: "MT:-24J0AFN00KA0648G00"
     discriminator: 3840
     PakeVerifier:
         type: octet_string

From 033f8020601f3a5b4a5d170732561c3936818a8f Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Wed, 28 Aug 2024 19:31:44 +0000
Subject: [PATCH 14/14] Restyled by prettier-yaml

---
 src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
index 0584572b0c8b37..a6b54026729c8f 100644
--- a/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml
@@ -56,7 +56,8 @@ tests:
           value: null
 
     # Step 3
-    - label: "TH sends a valid ActiveDatasetRequest command to the DUT without
+    - label:
+          "TH sends a valid ActiveDatasetRequest command to the DUT without
           having armed the fail-safe"
       command: SetActiveDatasetRequest
       arguments: