Add support for configuring terms and conditions in device commissioning

test_collections/matter/sdk_tests/support/performance_tests/utils.py

@@ -258,7 +258,6 @@ def generate_summary(
     summary_dict["test_summary_record"][
         "number_of_iterations_failed"
     ] = compute_count_state(execution_status, False)
-    summary_dict["test_summary_record"]["platform"] = "rpi"
     summary_dict["test_summary_record"]["commissioning_method"] = commissioning_method
     summary_dict["test_summary_record"]["list_of_iterations_failed"] = []
     summary_dict["test_summary_record"]["analytics_parameters"] = [

test_collections/matter/sdk_tests/support/python_testing/models/utils.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Project CHIP Authors
+# Copyright (c) 2023-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.
@@ -55,7 +55,19 @@ async def generate_command_arguments(
     if dut_config.trace_log:
         arguments.append("--trace-to json:log")
 
-    if not omit_commissioning_method:
+    if dut_config.enhanced_setup_flow:
+        arguments.append("--require-tc-acknowledgements 1")
+        arguments.append(
+            f"--tc-acknowledgements {dut_config.enhanced_setup_flow.tc_user_response}"
+        )
+        arguments.append(
+            f"--tc-acknowledgements-version {dut_config.enhanced_setup_flow.tc_version}"
+        )
+
+    if omit_commissioning_method:
+        arguments.append(f"--in-test-commissioning-method {pairing_mode}")
+
+    else:
         arguments.append(f"--commissioning-method {pairing_mode}")
 
         if pairing_mode == DutPairingModeEnum.BLE_WIFI:

test_collections/matter/test_environment_config.py

@@ -46,13 +46,19 @@
     thread: Union[ThreadAutoConfig, ThreadExternalConfig]
 
 
+class EnhancedSetupFlowConfig(BaseModel):
+    tc_version: int
+    tc_user_response: int
+
+
 class DutConfig(BaseModel):
     discriminator: str
     setup_code: str
     pairing_mode: DutPairingModeEnum
     chip_timeout: Optional[str]
     chip_use_paa_certs: bool = False
     trace_log: bool = True
+    enhanced_setup_flow: Optional[EnhancedSetupFlowConfig] = None
 
 
 class TestEnvironmentConfigMatter(TestEnvironmentConfig):
@@ -96,9 +102,10 @@
                         f" {valid_properties}"
                     )
 
-            # All DutConfig fields but chip_timeout are mandatory
+            # All DutConfig fields but chip_timeout and enhanced_setup_flow are mandatory
             mandatory_fields = valid_properties.copy()
             mandatory_fields.remove("chip_timeout")
+            mandatory_fields.remove("enhanced_setup_flow")
             for field in mandatory_fields:
                 if field not in dut_config:
                     raise TestEnvironmentConfigMatterError(