[Chip-tool] Not register LIT at default (#33262)
* [Chip-tool]Not register LIT at default
* Restyled by autopep8
* fix test
* Update test_definition.py
* Update test_definition.py
* Update test_definition.py
* address comments
* Update PairingCommand.cpp
* Update examples/chip-tool/commands/pairing/PairingCommand.h
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
* Update scripts/tests/chiptest/test_definition.py
Co-authored-by: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com>
* make icd-registration happen with lit only
* disable lit test in darwin framework tool
* address comment
---------
Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
Co-authored-by: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com>
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
index 31da132..5f6c179 100644
--- a/examples/chip-tool/commands/pairing/PairingCommand.cpp
+++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -136,7 +136,7 @@
params.SetDSTOffsets(mDSTOffsetList);
}
- if (!mSkipICDRegistration.ValueOr(false))
+ if (mICDRegistration.ValueOr(false))
{
params.SetICDRegistrationStrategy(ICDRegistrationStrategy::kBeforeComplete);
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h
index 4df17f7..99b0fd0 100644
--- a/examples/chip-tool/commands/pairing/PairingCommand.h
+++ b/examples/chip-tool/commands/pairing/PairingCommand.h
@@ -65,8 +65,8 @@
"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: false");
+ AddArgument("icd-registration", 0, 1, &mICDRegistration,
+ "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,
@@ -233,7 +233,7 @@
chip::Optional<bool> mBypassAttestationVerifier;
chip::Optional<std::vector<uint32_t>> mCASEAuthTags;
chip::Optional<char *> mCountryCode;
- chip::Optional<bool> mSkipICDRegistration;
+ chip::Optional<bool> mICDRegistration;
chip::Optional<NodeId> mICDCheckInNodeId;
chip::Optional<chip::ByteSpan> mICDSymmetricKey;
chip::Optional<uint64_t> mICDMonitoredSubject;
diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py
index 12c59cf..970c098 100644
--- a/scripts/tests/chiptest/test_definition.py
+++ b/scripts/tests/chiptest/test_definition.py
@@ -373,6 +373,8 @@
dependencies=[apps_register], timeout_seconds=timeout_seconds)
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']
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' +
