Skip to content

Commit e887e58

Browse files
yunhanw-googlerestyled-commitsbzbarsky-applemkardous-silabs
authored
[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>
1 parent ab22a01 commit e887e58

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

examples/chip-tool/commands/pairing/PairingCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ CommissioningParameters PairingCommand::GetCommissioningParameters()
136136
params.SetDSTOffsets(mDSTOffsetList);
137137
}
138138

139-
if (!mSkipICDRegistration.ValueOr(false))
139+
if (mICDRegistration.ValueOr(false))
140140
{
141141
params.SetICDRegistrationStrategy(ICDRegistrationStrategy::kBeforeComplete);
142142

examples/chip-tool/commands/pairing/PairingCommand.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class PairingCommand : public CHIPCommand,
6565
"Bypass the attestation verifier. If not provided or false, the attestation verifier is not bypassed."
6666
" If true, the commissioning will continue in case of attestation verification failure.");
6767
AddArgument("case-auth-tags", 1, UINT32_MAX, &mCASEAuthTags, "The CATs to be encoded in the NOC sent to the commissionee");
68-
AddArgument("skip-icd-registration", 0, 1, &mSkipICDRegistration,
69-
"Skip registering for check-ins from ICDs during commissioning. Default: false");
68+
AddArgument("icd-registration", 0, 1, &mICDRegistration,
69+
"Whether to register for check-ins from ICDs during commissioning. Default: false");
7070
AddArgument("icd-check-in-nodeid", 0, UINT64_MAX, &mICDCheckInNodeId,
7171
"The check-in node id for the ICD, default: node id of the commissioner.");
7272
AddArgument("icd-monitored-subject", 0, UINT64_MAX, &mICDMonitoredSubject,
@@ -233,7 +233,7 @@ class PairingCommand : public CHIPCommand,
233233
chip::Optional<bool> mBypassAttestationVerifier;
234234
chip::Optional<std::vector<uint32_t>> mCASEAuthTags;
235235
chip::Optional<char *> mCountryCode;
236-
chip::Optional<bool> mSkipICDRegistration;
236+
chip::Optional<bool> mICDRegistration;
237237
chip::Optional<NodeId> mICDCheckInNodeId;
238238
chip::Optional<chip::ByteSpan> mICDSymmetricKey;
239239
chip::Optional<uint64_t> mICDMonitoredSubject;

scripts/tests/chiptest/test_definition.py

+2
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,8 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str,
373373
dependencies=[apps_register], timeout_seconds=timeout_seconds)
374374
else:
375375
pairing_cmd = paths.chip_tool_with_python_cmd + ['pairing', 'code', TEST_NODE_ID, setupCode]
376+
if self.target == TestTarget.LIT_ICD and test_runtime == TestRunTime.CHIP_TOOL_PYTHON:
377+
pairing_cmd += ['--icd-registration', 'true']
376378
test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file]
377379
server_args = ['--server_path', paths.chip_tool[-1]] + \
378380
['--server_arguments', 'interactive server' +

0 commit comments

Comments
 (0)