address comments

Author: yunhanw-google

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);
 

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<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;

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' +