4242import matter .testing .global_stash as global_stash
4343from matter .clusters import Attribute
4444# Add imports for argument parsing dependencies
45+ from matter .testing .defaults import TestingDefaults
46+ # Add imports for argument parsing dependencies
4547from matter .testing .pics import read_pics_from_file
4648
4749try :
@@ -67,15 +69,6 @@ def StartFromString(self, destination):
6769if TYPE_CHECKING :
6870 from matter .testing .matter_test_config import MatterTestConfig
6971
70- _DEFAULT_LOG_PATH = "/tmp/matter_testing/logs"
71-
72- # Default constants for argument parsing
73- _DEFAULT_ADMIN_VENDOR_ID = 0xFFF1
74- _DEFAULT_STORAGE_PATH = "admin_storage.json"
75- _DEFAULT_CONTROLLER_NODE_ID = 112233
76- _DEFAULT_DUT_NODE_ID = 0x12344321
77- _DEFAULT_TRUST_ROOT_INDEX = 1
78-
7972
8073def default_paa_rootstore_from_root (root_path : pathlib .Path ) -> Optional [pathlib .Path ]:
8174 """Attempt to find a PAA trust store following SDK convention at `root_path`
@@ -287,7 +280,7 @@ def generate_mobly_test_config(matter_test_config):
287280 test_run_config .testbed_name = "MatterTest"
288281
289282 log_path = matter_test_config .logs_path
290- log_path = _DEFAULT_LOG_PATH if log_path is None else log_path
283+ log_path = TestingDefaults . LOG_PATH if log_path is None else log_path
291284 if ENV_MOBLY_LOGPATH in os .environ :
292285 log_path = os .environ [ENV_MOBLY_LOGPATH ]
293286
@@ -659,7 +652,7 @@ def populate_commissioning_args(args: argparse.Namespace, config) -> bool:
659652 device_descriptors = config .qr_code_content + config .manual_code + config .discriminators
660653
661654 if not config .dut_node_ids :
662- config .dut_node_ids = [_DEFAULT_DUT_NODE_ID ]
655+ config .dut_node_ids = [TestingDefaults . DUT_NODE_ID ]
663656
664657 if args .commissioning_method is None :
665658 return True
@@ -733,8 +726,8 @@ def convert_args_to_matter_config(args: argparse.Namespace):
733726 if not populate_commissioning_args (args , config ):
734727 sys .exit (1 )
735728
736- config .storage_path = pathlib .Path (_DEFAULT_STORAGE_PATH ) if args .storage_path is None else args .storage_path
737- config .logs_path = pathlib .Path (_DEFAULT_LOG_PATH ) if args .logs_path is None else args .logs_path
729+ config .storage_path = pathlib .Path (TestingDefaults . STORAGE_PATH ) if args .storage_path is None else args .storage_path
730+ config .logs_path = pathlib .Path (TestingDefaults . LOG_PATH ) if args .logs_path is None else args .logs_path
738731 config .paa_trust_store_path = args .paa_trust_store_path
739732 config .ble_controller = args .ble_controller
740733 if args .PICS is None :
@@ -802,12 +795,12 @@ def parse_matter_test_args(argv: Optional[List[str]] = None):
802795 metavar = "CONTROLLER_ID" , help = "BLE controller selector, see example or platform docs for details" )
803796 basic_group .add_argument ('-N' , '--controller-node-id' , type = int_decimal_or_hex ,
804797 metavar = 'NODE_ID' ,
805- default = _DEFAULT_CONTROLLER_NODE_ID ,
806- help = 'NodeID to use for initial/default controller (default: %d)' % _DEFAULT_CONTROLLER_NODE_ID )
798+ default = TestingDefaults . CONTROLLER_NODE_ID ,
799+ help = 'NodeID to use for initial/default controller (default: %d)' % TestingDefaults . CONTROLLER_NODE_ID )
807800 basic_group .add_argument ('-n' , '--dut-node-id' , '--nodeId' , type = int_decimal_or_hex ,
808801 metavar = 'NODE_ID' , dest = 'dut_node_ids' , default = [],
809802 help = 'Node ID for primary DUT communication, '
810- 'and NodeID to assign if commissioning (default: %d)' % _DEFAULT_DUT_NODE_ID , nargs = "+" )
803+ 'and NodeID to assign if commissioning (default: %d)' % TestingDefaults . DUT_NODE_ID , nargs = "+" )
811804 basic_group .add_argument ('--endpoint' , type = int , default = None , help = "Endpoint under test" )
812805 basic_group .add_argument ('--app-pipe' , type = str , default = None , help = "The full path of the app to send an out-of-band command" )
813806 basic_group .add_argument ('--timeout' , type = int , help = "Test timeout in seconds" )
@@ -848,9 +841,9 @@ def parse_matter_test_args(argv: Optional[List[str]] = None):
848841 metavar = 'OPERATIONAL_DATASET_HEX' ,
849842 help = 'Thread operational dataset as a hex string for ble-thread commissioning' )
850843
851- commission_group .add_argument ('--admin-vendor-id' , action = "store" , type = int_decimal_or_hex , default = _DEFAULT_ADMIN_VENDOR_ID ,
844+ commission_group .add_argument ('--admin-vendor-id' , action = "store" , type = int_decimal_or_hex , default = TestingDefaults . ADMIN_VENDOR_ID ,
852845 metavar = "VENDOR_ID" ,
853- help = "VendorID to use during commissioning (default 0x%04X)" % _DEFAULT_ADMIN_VENDOR_ID )
846+ help = "VendorID to use during commissioning (default 0x%04X)" % TestingDefaults . ADMIN_VENDOR_ID )
854847 commission_group .add_argument ('--case-admin-subject' , action = "store" , type = int_decimal_or_hex ,
855848 metavar = "CASE_ADMIN_SUBJECT" ,
856849 help = "Set the CASE admin subject to an explicit value (default to commissioner Node ID)" )
@@ -876,9 +869,9 @@ def parse_matter_test_args(argv: Optional[List[str]] = None):
876869 help = 'Fabric ID on which to operate under the root of trust' )
877870
878871 fabric_group .add_argument ('-r' , '--root-index' , type = root_index ,
879- metavar = 'ROOT_INDEX_OR_NAME' , default = _DEFAULT_TRUST_ROOT_INDEX ,
872+ metavar = 'ROOT_INDEX_OR_NAME' , default = TestingDefaults . TRUST_ROOT_INDEX ,
880873 help = 'Root of trust under which to operate/commission for single-fabric basic usage. '
881- 'alpha/beta/gamma are aliases for 1/2/3. Default (%d)' % _DEFAULT_TRUST_ROOT_INDEX )
874+ 'alpha/beta/gamma are aliases for 1/2/3. Default (%d)' % TestingDefaults . TRUST_ROOT_INDEX )
882875
883876 fabric_group .add_argument ('-c' , '--chip-tool-credentials-path' , type = pathlib .Path ,
884877 metavar = 'PATH' ,
0 commit comments