From 3e65669e6c1042fb5e4f47c681700daa24d470be Mon Sep 17 00:00:00 2001 From: yunhanw Date: Wed, 1 May 2024 14:29:06 -0700 Subject: [PATCH 01/14] [Chip-tool]Not register LIT at default --- examples/chip-tool/commands/pairing/PairingCommand.cpp | 2 +- examples/chip-tool/commands/pairing/PairingCommand.h | 2 +- scripts/tests/chiptest/test_definition.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp index 31da1329308c5b..b31fc89b573d12 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.cpp +++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp @@ -136,7 +136,7 @@ CommissioningParameters PairingCommand::GetCommissioningParameters() params.SetDSTOffsets(mDSTOffsetList); } - if (!mSkipICDRegistration.ValueOr(false)) + if (!mSkipICDRegistration.ValueOr(true)) { params.SetICDRegistrationStrategy(ICDRegistrationStrategy::kBeforeComplete); diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h index 4df17f7dee40b5..ab1f6240e42312 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.h +++ b/examples/chip-tool/commands/pairing/PairingCommand.h @@ -66,7 +66,7 @@ class PairingCommand : public CHIPCommand, " If true, the commissioning will continue in case of attestation verification failure."); AddArgument("case-auth-tags", 1, UINT32_MAX, &mCASEAuthTags, "The CATs to be encoded in the NOC sent to the commissionee"); AddArgument("skip-icd-registration", 0, 1, &mSkipICDRegistration, - "Skip registering for check-ins from ICDs during commissioning. Default: false"); + "Skip registering for check-ins from ICDs during commissioning. Default: true"); AddArgument("icd-check-in-nodeid", 0, UINT64_MAX, &mICDCheckInNodeId, "The check-in node id for the ICD, default: node id of the commissioner."); AddArgument("icd-monitored-subject", 0, UINT64_MAX, &mICDMonitoredSubject, diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index 12c59cfad0cc41..bff75cd104c132 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -372,7 +372,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, runner.RunSubprocess(python_cmd, name='CHIP_REPL_YAML_TESTER', dependencies=[apps_register], timeout_seconds=timeout_seconds) else: - pairing_cmd = paths.chip_tool_with_python_cmd + ['pairing', 'code', TEST_NODE_ID, setupCode] + pairing_cmd = paths.chip_tool_with_python_cmd + ['skip-icd-registration', 0, 'pairing', 'code', TEST_NODE_ID, setupCode] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From 27371d9440844abf4050afd74c4348867a94f5c2 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 1 May 2024 21:34:59 +0000 Subject: [PATCH 02/14] Restyled by autopep8 --- scripts/tests/chiptest/test_definition.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index bff75cd104c132..fb72c3aad34de9 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -372,7 +372,8 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, runner.RunSubprocess(python_cmd, name='CHIP_REPL_YAML_TESTER', dependencies=[apps_register], timeout_seconds=timeout_seconds) else: - pairing_cmd = paths.chip_tool_with_python_cmd + ['skip-icd-registration', 0, 'pairing', 'code', TEST_NODE_ID, setupCode] + pairing_cmd = paths.chip_tool_with_python_cmd + \ + ['skip-icd-registration', 0, 'pairing', 'code', TEST_NODE_ID, setupCode] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From e4a3b579d08f18c5d1bb666b03164edf7247b673 Mon Sep 17 00:00:00 2001 From: yunhanw Date: Thu, 2 May 2024 09:39:36 -0700 Subject: [PATCH 03/14] fix test --- scripts/tests/chiptest/test_definition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index fb72c3aad34de9..1ba1bc899a4f29 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -373,7 +373,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, dependencies=[apps_register], timeout_seconds=timeout_seconds) else: pairing_cmd = paths.chip_tool_with_python_cmd + \ - ['skip-icd-registration', 0, 'pairing', 'code', TEST_NODE_ID, setupCode] + ['skip-icd-registration', '0', 'pairing', 'code', TEST_NODE_ID, setupCode] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From fdad1dcb12d75b7c8fd01aee3648dee67863ab99 Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Thu, 2 May 2024 11:20:48 -0700 Subject: [PATCH 04/14] Update test_definition.py --- scripts/tests/chiptest/test_definition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index 1ba1bc899a4f29..6cb45e350fd08e 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -373,7 +373,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, dependencies=[apps_register], timeout_seconds=timeout_seconds) else: pairing_cmd = paths.chip_tool_with_python_cmd + \ - ['skip-icd-registration', '0', 'pairing', 'code', TEST_NODE_ID, setupCode] + ['pairing', 'code', TEST_NODE_ID, setupCode, 'skip-icd-registration', '0'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From 47e720a381d5e957b0ee0fc0f24c8479fda97ec5 Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Thu, 2 May 2024 13:42:28 -0700 Subject: [PATCH 05/14] Update test_definition.py --- scripts/tests/chiptest/test_definition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index 6cb45e350fd08e..23199b3290a4da 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -373,7 +373,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, dependencies=[apps_register], timeout_seconds=timeout_seconds) else: pairing_cmd = paths.chip_tool_with_python_cmd + \ - ['pairing', 'code', TEST_NODE_ID, setupCode, 'skip-icd-registration', '0'] + ['pairing', 'code', TEST_NODE_ID, setupCode, '--skip-icd-registration', '0'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From 414febb4115e6ce41386123eda5e5cbcd5cd6f7c Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Mon, 6 May 2024 11:19:02 -0700 Subject: [PATCH 06/14] Update test_definition.py --- scripts/tests/chiptest/test_definition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index 23199b3290a4da..c8d6794bb58f22 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -373,7 +373,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, dependencies=[apps_register], timeout_seconds=timeout_seconds) else: pairing_cmd = paths.chip_tool_with_python_cmd + \ - ['pairing', 'code', TEST_NODE_ID, setupCode, '--skip-icd-registration', '0'] + ['pairing', 'code', TEST_NODE_ID, setupCode, '--skip-icd-registration', 'false'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From 906b4c3af28f409741b86340ebd030b8053130fe Mon Sep 17 00:00:00 2001 From: yunhanw Date: Mon, 6 May 2024 13:34:46 -0700 Subject: [PATCH 07/14] address comments --- examples/chip-tool/commands/pairing/PairingCommand.cpp | 2 +- examples/chip-tool/commands/pairing/PairingCommand.h | 6 +++--- scripts/tests/chiptest/test_definition.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp index b31fc89b573d12..d66ef80094055f 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.cpp +++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp @@ -136,7 +136,7 @@ CommissioningParameters PairingCommand::GetCommissioningParameters() params.SetDSTOffsets(mDSTOffsetList); } - if (!mSkipICDRegistration.ValueOr(true)) + if (mICDRegistration.ValueOr(true)) { params.SetICDRegistrationStrategy(ICDRegistrationStrategy::kBeforeComplete); diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h index ab1f6240e42312..7baf0740da52b3 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.h +++ b/examples/chip-tool/commands/pairing/PairingCommand.h @@ -65,8 +65,8 @@ class PairingCommand : public CHIPCommand, "Bypass the attestation verifier. If not provided or false, the attestation verifier is not bypassed." " If true, the commissioning will continue in case of attestation verification failure."); AddArgument("case-auth-tags", 1, UINT32_MAX, &mCASEAuthTags, "The CATs to be encoded in the NOC sent to the commissionee"); - AddArgument("skip-icd-registration", 0, 1, &mSkipICDRegistration, - "Skip registering for check-ins from ICDs during commissioning. Default: true"); + AddArgument("icd-registration", 0, 1, &mICDRegistration, + "registering for check-ins from ICDs during commissioning. Default: false"); AddArgument("icd-check-in-nodeid", 0, UINT64_MAX, &mICDCheckInNodeId, "The check-in node id for the ICD, default: node id of the commissioner."); AddArgument("icd-monitored-subject", 0, UINT64_MAX, &mICDMonitoredSubject, @@ -233,7 +233,7 @@ class PairingCommand : public CHIPCommand, chip::Optional mBypassAttestationVerifier; chip::Optional> mCASEAuthTags; chip::Optional mCountryCode; - chip::Optional mSkipICDRegistration; + chip::Optional mICDRegistration; chip::Optional mICDCheckInNodeId; chip::Optional mICDSymmetricKey; chip::Optional mICDMonitoredSubject; diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index c8d6794bb58f22..783e1c41b39c9c 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -373,7 +373,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, dependencies=[apps_register], timeout_seconds=timeout_seconds) else: pairing_cmd = paths.chip_tool_with_python_cmd + \ - ['pairing', 'code', TEST_NODE_ID, setupCode, '--skip-icd-registration', 'false'] + ['pairing', 'code', TEST_NODE_ID, setupCode, '--icd-registration', 'false'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From 8f2d91b1ae0dd094e0d5b569f4ec719fce265a5f Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Mon, 6 May 2024 14:46:12 -0700 Subject: [PATCH 08/14] Update PairingCommand.cpp --- examples/chip-tool/commands/pairing/PairingCommand.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp index d66ef80094055f..5f6c179779f3c2 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.cpp +++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp @@ -136,7 +136,7 @@ CommissioningParameters PairingCommand::GetCommissioningParameters() params.SetDSTOffsets(mDSTOffsetList); } - if (mICDRegistration.ValueOr(true)) + if (mICDRegistration.ValueOr(false)) { params.SetICDRegistrationStrategy(ICDRegistrationStrategy::kBeforeComplete); From fd4e517956c5f53fa705e3287a6209bad8ffb172 Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Mon, 6 May 2024 22:47:33 -0700 Subject: [PATCH 09/14] Update examples/chip-tool/commands/pairing/PairingCommand.h Co-authored-by: Boris Zbarsky --- examples/chip-tool/commands/pairing/PairingCommand.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h index 7baf0740da52b3..99b0fd0c91882e 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.h +++ b/examples/chip-tool/commands/pairing/PairingCommand.h @@ -66,7 +66,7 @@ class PairingCommand : public CHIPCommand, " If true, the commissioning will continue in case of attestation verification failure."); AddArgument("case-auth-tags", 1, UINT32_MAX, &mCASEAuthTags, "The CATs to be encoded in the NOC sent to the commissionee"); AddArgument("icd-registration", 0, 1, &mICDRegistration, - "registering for check-ins from ICDs during commissioning. Default: false"); + "Whether to register for check-ins from ICDs during commissioning. Default: false"); AddArgument("icd-check-in-nodeid", 0, UINT64_MAX, &mICDCheckInNodeId, "The check-in node id for the ICD, default: node id of the commissioner."); AddArgument("icd-monitored-subject", 0, UINT64_MAX, &mICDMonitoredSubject, From 44f74b4f7953d64d0b95e62a4dd35abec6d3317a Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Mon, 6 May 2024 22:48:04 -0700 Subject: [PATCH 10/14] Update scripts/tests/chiptest/test_definition.py Co-authored-by: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com> --- scripts/tests/chiptest/test_definition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index 783e1c41b39c9c..bd7e2314a0d5e1 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -373,7 +373,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, dependencies=[apps_register], timeout_seconds=timeout_seconds) else: pairing_cmd = paths.chip_tool_with_python_cmd + \ - ['pairing', 'code', TEST_NODE_ID, setupCode, '--icd-registration', 'false'] + ['pairing', 'code', TEST_NODE_ID, setupCode, '--icd-registration', 'true'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From 011fa5bccbb17ff80a086585fb28de31946d8f9c Mon Sep 17 00:00:00 2001 From: yunhanw Date: Tue, 7 May 2024 09:51:35 -0700 Subject: [PATCH 11/14] make icd-registration happen with lit only --- scripts/tests/chiptest/test_definition.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index bd7e2314a0d5e1..21f5acaab0a105 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -374,6 +374,8 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, else: pairing_cmd = paths.chip_tool_with_python_cmd + \ ['pairing', 'code', TEST_NODE_ID, setupCode, '--icd-registration', 'true'] + if self.target == TestTarget.LIT_ICD: + pairing_cmd += ['--icd-registration', 'true'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' + From 1f523b7aec4738db9eeff71f9745dd8dd1e35085 Mon Sep 17 00:00:00 2001 From: yunhanw Date: Tue, 7 May 2024 13:34:53 -0700 Subject: [PATCH 12/14] disable lit test in darwin framework tool --- scripts/tests/chiptest/test_definition.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index 21f5acaab0a105..9209c7076fd3fa 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -373,8 +373,8 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, dependencies=[apps_register], timeout_seconds=timeout_seconds) else: pairing_cmd = paths.chip_tool_with_python_cmd + \ - ['pairing', 'code', TEST_NODE_ID, setupCode, '--icd-registration', 'true'] - if self.target == TestTarget.LIT_ICD: + ['pairing', 'code', TEST_NODE_ID, setupCode] + if self.target == TestTarget.LIT_ICD and test_runtime == TestRunTime.CHIP_TOOL_PYTHON: pairing_cmd += ['--icd-registration', 'true'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ From 7ab1cf7dcb1da507b4b2564d7c97ab802ea75b95 Mon Sep 17 00:00:00 2001 From: yunhanw Date: Tue, 7 May 2024 15:18:53 -0700 Subject: [PATCH 13/14] address comment --- scripts/tests/chiptest/test_definition.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index 9209c7076fd3fa..13777f02c79adc 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -372,8 +372,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, runner.RunSubprocess(python_cmd, name='CHIP_REPL_YAML_TESTER', dependencies=[apps_register], timeout_seconds=timeout_seconds) else: - pairing_cmd = paths.chip_tool_with_python_cmd + \ - ['pairing', 'code', TEST_NODE_ID, setupCode] + pairing_cmd = paths.chip_tool_with_python_cmd + ['pairing', 'code', TEST_NODE_ID, setupCode] if self.target == TestTarget.LIT_ICD and test_runtime == TestRunTime.CHIP_TOOL_PYTHON: pairing_cmd += ['--icd-registration', 'true'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] From 7f40daee8e99cf1a5f1bfdb97be7da655ebd790d Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Tue, 7 May 2024 22:20:41 +0000 Subject: [PATCH 14/14] Restyled by autopep8 --- scripts/tests/chiptest/test_definition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index 13777f02c79adc..970c098f1354bb 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -374,7 +374,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str, else: pairing_cmd = paths.chip_tool_with_python_cmd + ['pairing', 'code', TEST_NODE_ID, setupCode] if self.target == TestTarget.LIT_ICD and test_runtime == TestRunTime.CHIP_TOOL_PYTHON: - pairing_cmd += ['--icd-registration', 'true'] + pairing_cmd += ['--icd-registration', 'true'] test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file] server_args = ['--server_path', paths.chip_tool[-1]] + \ ['--server_arguments', 'interactive server' +