diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp index 7b7e24a1e771c8..b445ab88ce434c 100644 --- a/examples/chip-tool/commands/common/CHIPCommand.cpp +++ b/examples/chip-tool/commands/common/CHIPCommand.cpp @@ -178,7 +178,7 @@ void CHIPCommand::MaybeTearDownStack() CHIP_ERROR CHIPCommand::EnsureCommissionerForIdentity(std::string identity) { chip::NodeId nodeId; - ReturnErrorOnFailure(GetCommissionerNodeId(identity, &nodeId)); + ReturnErrorOnFailure(GetIdentityNodeId(identity, &nodeId)); CommissionerIdentity lookupKey{ identity, nodeId }; if (mCommissioners.find(lookupKey) != mCommissioners.end()) { @@ -310,7 +310,7 @@ std::string CHIPCommand::GetIdentity() return name; } -CHIP_ERROR CHIPCommand::GetCommissionerNodeId(std::string identity, chip::NodeId * nodeId) +CHIP_ERROR CHIPCommand::GetIdentityNodeId(std::string identity, chip::NodeId * nodeId) { if (mCommissionerNodeId.HasValue()) { @@ -374,7 +374,7 @@ chip::Controller::DeviceCommissioner & CHIPCommand::GetCommissioner(std::string VerifyOrDie(EnsureCommissionerForIdentity(identity) == CHIP_NO_ERROR); chip::NodeId nodeId; - VerifyOrDie(GetCommissionerNodeId(identity, &nodeId) == CHIP_NO_ERROR); + VerifyOrDie(GetIdentityNodeId(identity, &nodeId) == CHIP_NO_ERROR); CommissionerIdentity lookupKey{ identity, nodeId }; auto item = mCommissioners.find(lookupKey); VerifyOrDie(item != mCommissioners.end()); diff --git a/examples/chip-tool/commands/common/CHIPCommand.h b/examples/chip-tool/commands/common/CHIPCommand.h index e062b0d85023cc..ee46ada917b944 100644 --- a/examples/chip-tool/commands/common/CHIPCommand.h +++ b/examples/chip-tool/commands/common/CHIPCommand.h @@ -144,7 +144,7 @@ class CHIPCommand : public Command CredentialIssuerCommands * mCredIssuerCmds; std::string GetIdentity(); - CHIP_ERROR GetCommissionerNodeId(std::string identity, chip::NodeId * nodeId); + CHIP_ERROR GetIdentityNodeId(std::string identity, chip::NodeId * nodeId); void SetIdentity(const char * name); // This method returns the commissioner instance to be used for running the command. diff --git a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp index 512a28e5ae80c9..ccde7acd9781e4 100644 --- a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp +++ b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp @@ -27,6 +27,8 @@ constexpr const char * kEventIdKey = "eventId"; constexpr const char * kCommandIdKey = "commandId"; constexpr const char * kErrorIdKey = "error"; constexpr const char * kClusterErrorIdKey = "clusterError"; +constexpr const char * kValueKey = "value"; +constexpr const char * kNodeIdKey = "nodeId"; namespace { RemoteDataModelLoggerDelegate * gDelegate; @@ -148,6 +150,18 @@ CHIP_ERROR LogErrorAsJSON(const CHIP_ERROR & error) return LogError(value, status); } +CHIP_ERROR LogGetCommissionerNodeId(chip::NodeId value) +{ + VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); + + Json::Value rootValue; + rootValue[kValueKey] = Json::Value(); + rootValue[kValueKey][kNodeIdKey] = value; + + auto valueStr = chip::JsonToString(rootValue); + return gDelegate->LogJSON(valueStr.c_str()); +} + void SetDelegate(RemoteDataModelLoggerDelegate * delegate) { gDelegate = delegate; diff --git a/examples/chip-tool/commands/common/RemoteDataModelLogger.h b/examples/chip-tool/commands/common/RemoteDataModelLogger.h index ed9cb1fe09b52d..a1d2464748cff0 100644 --- a/examples/chip-tool/commands/common/RemoteDataModelLogger.h +++ b/examples/chip-tool/commands/common/RemoteDataModelLogger.h @@ -38,5 +38,6 @@ CHIP_ERROR LogErrorAsJSON(const chip::app::ConcreteCommandPath & path, const chi CHIP_ERROR LogEventAsJSON(const chip::app::EventHeader & header, chip::TLV::TLVReader * data); CHIP_ERROR LogErrorAsJSON(const chip::app::EventHeader & header, const chip::app::StatusIB & status); CHIP_ERROR LogErrorAsJSON(const CHIP_ERROR & error); +CHIP_ERROR LogGetCommissionerNodeId(chip::NodeId value); void SetDelegate(RemoteDataModelLoggerDelegate * delegate); }; // namespace RemoteDataModelLogger diff --git a/examples/chip-tool/commands/pairing/Commands.h b/examples/chip-tool/commands/pairing/Commands.h index 871b282ebd781d..0401c8888fffd7 100644 --- a/examples/chip-tool/commands/pairing/Commands.h +++ b/examples/chip-tool/commands/pairing/Commands.h @@ -21,6 +21,7 @@ #include "commands/common/Commands.h" #include "commands/pairing/CloseSessionCommand.h" #include "commands/pairing/CommissionedListCommand.h" +#include "commands/pairing/GetCommissionerNodeIdCommand.h" #include "commands/pairing/OpenCommissioningWindowCommand.h" #include "commands/pairing/PairingCommand.h" @@ -220,6 +221,7 @@ void registerCommandsPairing(Commands & commands, CredentialIssuerCommands * cre make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), + make_unique(credsIssuerConfig), }; commands.Register(clusterName, clusterCommands); diff --git a/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h b/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h new file mode 100644 index 00000000000000..9d3d3deabd83d7 --- /dev/null +++ b/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2023 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#pragma once + +#include "../common/CHIPCommand.h" + +class GetCommissionerNodeIdCommand : public CHIPCommand +{ +public: + GetCommissionerNodeIdCommand(CredentialIssuerCommands * credIssuerCommands) : + CHIPCommand("get-commissioner-node-id", credIssuerCommands) + {} + + /////////// CHIPCommand Interface ///////// + CHIP_ERROR RunCommand() override + { + chip::NodeId id; + ReturnErrorOnFailure(GetIdentityNodeId(GetIdentity(), &id)); + ChipLogProgress(chipTool, "Commissioner Node Id 0x:" ChipLogFormatX64, ChipLogValueX64(id)); + + ReturnErrorOnFailure(RemoteDataModelLogger::LogGetCommissionerNodeId(id)); + SetCommandExitStatus(CHIP_NO_ERROR); + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(10); } +}; diff --git a/examples/chip-tool/commands/tests/TestCommand.h b/examples/chip-tool/commands/tests/TestCommand.h index c140fb689afde7..b1de8a20517024 100644 --- a/examples/chip-tool/commands/tests/TestCommand.h +++ b/examples/chip-tool/commands/tests/TestCommand.h @@ -78,12 +78,6 @@ class TestCommand : public TestRunner, chip::Controller::DeviceCommissioner & GetCommissioner(const char * identity) override { - // Best effort to get NodeId - if this fails, GetCommissioner will also fail - chip::NodeId id; - if (GetCommissionerNodeId(identity, &id) == CHIP_NO_ERROR) - { - mCommissionerNodeId.SetValue(id); - } return CHIPCommand::GetCommissioner(identity); }; @@ -101,7 +95,6 @@ class TestCommand : public TestRunner, chip::Optional mPICSFilePath; chip::Optional mTimeout; - chip::Optional mCommissionerNodeId; std::map> mDevices; // When set to false, prevents interaction model events from affecting the current test status. diff --git a/examples/chip-tool/templates/tests/partials/test_cluster.zapt b/examples/chip-tool/templates/tests/partials/test_cluster.zapt index 0eba4f18f22913..a968b9f1241839 100644 --- a/examples/chip-tool/templates/tests/partials/test_cluster.zapt +++ b/examples/chip-tool/templates/tests/partials/test_cluster.zapt @@ -48,14 +48,6 @@ private: void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -80,12 +72,6 @@ private: CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { {{#chip_tests_items}} diff --git a/examples/darwin-framework-tool/BUILD.gn b/examples/darwin-framework-tool/BUILD.gn index cea7f9d794ff57..231ebac679b240 100644 --- a/examples/darwin-framework-tool/BUILD.gn +++ b/examples/darwin-framework-tool/BUILD.gn @@ -139,6 +139,8 @@ executable("darwin-framework-tool") { "commands/common/MTRLogging.h", "commands/pairing/Commands.h", "commands/pairing/DeviceControllerDelegateBridge.mm", + "commands/pairing/GetCommissionerNodeIdCommand.h", + "commands/pairing/GetCommissionerNodeIdCommand.mm", "commands/pairing/OpenCommissioningWindowCommand.h", "commands/pairing/OpenCommissioningWindowCommand.mm", "commands/pairing/PairingCommandBridge.mm", diff --git a/examples/darwin-framework-tool/commands/pairing/Commands.h b/examples/darwin-framework-tool/commands/pairing/Commands.h index 23242355ffaa3f..69eb9f39352e51 100644 --- a/examples/darwin-framework-tool/commands/pairing/Commands.h +++ b/examples/darwin-framework-tool/commands/pairing/Commands.h @@ -20,6 +20,7 @@ #import +#include "GetCommissionerNodeIdCommand.h" #include "OpenCommissioningWindowCommand.h" #include "PairingCommandBridge.h" #include "PreWarmCommissioningCommand.h" @@ -73,6 +74,7 @@ void registerCommandsPairing(Commands & commands) make_unique(), make_unique(), make_unique(), + make_unique(), }; commands.Register(clusterName, clusterCommands); diff --git a/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.h b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.h new file mode 100644 index 00000000000000..c07d3c2ac80899 --- /dev/null +++ b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2023 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#pragma once + +#include "../common/CHIPCommandBridge.h" + +class GetCommissionerNodeIdCommand : public CHIPCommandBridge +{ +public: + GetCommissionerNodeIdCommand() : CHIPCommandBridge("get-commissioner-node-id") {} + + /////////// CHIPCommand Interface ///////// + CHIP_ERROR RunCommand() override; + + chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(0); } +}; diff --git a/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm new file mode 100644 index 00000000000000..48502f84641b58 --- /dev/null +++ b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#import + +#include "GetCommissionerNodeIdCommand.h" + +CHIP_ERROR GetCommissionerNodeIdCommand::RunCommand() +{ + auto * controller = CurrentCommissioner(); + VerifyOrReturnError(nil != controller, CHIP_ERROR_INCORRECT_STATE); + + auto id = [controller.controllerNodeId unsignedLongLongValue]; + ChipLogProgress(chipTool, "Commissioner Node Id 0x:" ChipLogFormatX64, ChipLogValueX64(id)); + + SetCommandExitStatus(CHIP_NO_ERROR); + return CHIP_NO_ERROR; +} diff --git a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h index 52e49ff4abe392..0828e1d1eccac5 100644 --- a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h +++ b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h @@ -154,9 +154,6 @@ class TestCommandBridge : public CHIPCommandBridge, VerifyOrReturnError(controller != nil, CHIP_ERROR_INCORRECT_STATE); SetIdentity(identity); - if (controller.controllerNodeId != nil) { - mCommissionerNodeId.SetValue([controller.controllerNodeId unsignedLongLongValue]); - } // Invalidate our existing CASE session; otherwise trying to work with // our device will just reuse it without establishing a new CASE @@ -184,10 +181,6 @@ class TestCommandBridge : public CHIPCommandBridge, VerifyOrReturnError(controller != nil, CHIP_ERROR_INCORRECT_STATE); SetIdentity(identity); - if (controller.controllerNodeId != nil) { - mCommissionerNodeId.SetValue([controller.controllerNodeId unsignedLongLongValue]); - } - [controller setDeviceControllerDelegate:mDeviceControllerDelegate queue:mCallbackQueue]; [mDeviceControllerDelegate setDeviceId:value.nodeId]; [mDeviceControllerDelegate setActive:YES]; @@ -208,6 +201,26 @@ class TestCommandBridge : public CHIPCommandBridge, return MTRErrorToCHIPErrorCode(err); } + CHIP_ERROR GetCommissionerNodeId(const char * _Nullable identity, + const chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type & value, + void (^_Nonnull OnResponse)(const chip::GetCommissionerNodeIdResponse &)) + { + auto * controller = GetCommissioner(identity); + VerifyOrReturnError(controller != nil, CHIP_ERROR_INCORRECT_STATE); + + auto id = [controller.controllerNodeId unsignedLongLongValue]; + ChipLogProgress(chipTool, "Commissioner Node Id: %llu", id); + + chip::GetCommissionerNodeIdResponse outValue; + outValue.nodeId = id; + + dispatch_async(mCallbackQueue, ^{ + OnResponse(outValue); + }); + + return CHIP_NO_ERROR; + } + /////////// SystemCommands Interface ///////// CHIP_ERROR ContinueOnChipMainThread(CHIP_ERROR err) override { @@ -226,9 +239,6 @@ class TestCommandBridge : public CHIPCommandBridge, MTRDeviceController * controller = GetCommissioner(identity); SetIdentity(identity); - if (controller != nil && controller.controllerNodeId != nil) { - mCommissionerNodeId.SetValue([controller.controllerNodeId unsignedLongLongValue]); - } return mConnectedDevices[identity]; } @@ -270,7 +280,6 @@ class TestCommandBridge : public CHIPCommandBridge, chip::Optional mPICSFilePath; chip::Optional mEndpointId; chip::Optional mTimeout; - chip::Optional mCommissionerNodeId; bool CheckConstraintStartsWith( const char * _Nonnull itemName, const NSString * _Nonnull current, const char * _Nonnull expected) diff --git a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt index ab878c23fd6846..a3d06aa879cebe 100644 --- a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt +++ b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt @@ -23,17 +23,10 @@ class {{filename}}: public TestCommandBridge { } - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { @@ -140,10 +133,31 @@ class {{filename}}: public TestCommandBridge {{#chip_tests_item_parameters}} {{>commandValue ns=parent.cluster container=(asPropertyValue dontUnwrapValue=true) definedValue=definedValue depth=0}} {{/chip_tests_item_parameters}} + {{#if (and (isStrEqual cluster "CommissionerCommands") (isStrEqual command "GetCommissionerNodeId"))}} + return {{command}}("{{identity}}", value, ^(const chip::{{command}}Response & values) { + {{#chip_tests_item_responses}} + {{#chip_tests_item_response_parameters}} + {{#if hasExpectedValue}} + { + id actualValue = values.{{asStructPropertyName name}} + {{>check_test_value actual="actualValue" expected=expectedValue cluster=../cluster}} + } + {{/if}} + {{>maybeCheckExpectedConstraints}} + {{#if saveAs}} + { + {{saveAs}} = [[NSNumber alloc] initWithUnsignedLongLong:values.{{asStructPropertyName name}}]; + } + {{/if}} + {{/chip_tests_item_response_parameters}} + {{/chip_tests_item_responses}} + NextTest(); + }); + {{else}} return {{command}}("{{identity}}", value); + {{/if}} {{else}} MTRBaseDevice * device = GetDevice("{{identity}}"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseCluster{{>cluster}} alloc] initWithDevice:device endpointID:@({{endpoint}}) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); diff --git a/src/app/tests/suites/TestCommissionerNodeId.yaml b/src/app/tests/suites/TestCommissionerNodeId.yaml index 39e1103d72007d..ff7537da5f5cf8 100644 --- a/src/app/tests/suites/TestCommissionerNodeId.yaml +++ b/src/app/tests/suites/TestCommissionerNodeId.yaml @@ -97,6 +97,15 @@ tests: response: saveAs: alphaIndex + - label: "Read the commissioner node ID from the alpha fabric" + identity: "alpha" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdAlpha + - label: "Read the fabric ID from the beta fabric" identity: "beta" cluster: "Operational Credentials" @@ -105,6 +114,15 @@ tests: response: saveAs: betaIndex + - label: "Read the commissioner node ID from the beta fabric" + identity: "beta" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdBeta + - label: "Read the fabric ID from the gamma fabric" identity: "gamma" cluster: "Operational Credentials" @@ -113,6 +131,15 @@ tests: response: saveAs: gammaIndex + - label: "Read the commissioner node ID from the gamma fabric" + identity: "gamma" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdGamma + - label: "Read the ACL from alpha and check commissioner node id" identity: "alpha" command: "readAttribute" @@ -123,7 +150,7 @@ tests: FabricIndex: alphaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdAlpha], Targets: null, }, ] @@ -138,7 +165,7 @@ tests: FabricIndex: betaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdBeta], Targets: null, }, ] @@ -153,7 +180,7 @@ tests: FabricIndex: gammaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdGamma], Targets: null, }, ] @@ -168,7 +195,7 @@ tests: FabricIndex: betaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdBeta], Targets: null, }, ] @@ -183,7 +210,7 @@ tests: FabricIndex: gammaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdGamma], Targets: null, }, ] @@ -198,7 +225,7 @@ tests: FabricIndex: betaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdBeta], Targets: null, }, ] @@ -213,7 +240,7 @@ tests: FabricIndex: gammaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdGamma], Targets: null, }, ] diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml index 76236844056a67..fc4c2212dbb5f5 100644 --- a/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml @@ -32,6 +32,14 @@ tests: - name: "nodeId" value: nodeId + - label: "Read the commissioner node ID" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeId + - label: "TP2 - Write ACL giving admin privilege on all EP0" command: "writeAttribute" attribute: "ACL" diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml index f013471c0f6386..7f71142d39b160 100644 --- a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml @@ -76,6 +76,15 @@ tests: response: saveAs: th2FabricIndex + - label: "Read the commissioner node ID from the alpha fabric" + identity: "alpha" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdAlpha + - label: "TH1 writes ACL giving view privilege for descriptor cluster" command: "writeAttribute" attribute: "ACL" @@ -85,7 +94,7 @@ tests: FabricIndex: th1FabricIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdAlpha], Targets: [{ Cluster: 0x001f, Endpoint: 0, DeviceType: null }], }, @@ -99,6 +108,15 @@ tests: }, ] + - label: "Read the commissioner node ID from the beta fabric" + identity: "beta" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdBeta + - label: "TH2 writes ACL giving view privilge for basic cluster" identity: beta command: "writeAttribute" @@ -109,7 +127,7 @@ tests: FabricIndex: th2FabricIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdBeta], Targets: [{ Cluster: 0x001f, Endpoint: 0, DeviceType: null }], }, @@ -158,7 +176,7 @@ tests: FabricIndex: 1, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdAlpha], Targets: null, }, ] diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml index 9220ee7158dc51..8084dc23bb3a60 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml @@ -33,6 +33,14 @@ tests: - name: "nodeId" value: nodeId + - label: "Read the commissioner node ID" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeId + - label: "TH adds ACL Operate privileges for Group 0x0103" cluster: "Access Control" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml index fea8bac4965bae..9ecfb9df8ee8d4 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml @@ -33,6 +33,14 @@ tests: - name: "nodeId" value: nodeId + - label: "Read the commissioner node ID" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeId + - label: "TH adds ACL Operate privileges for Group 0x0103" cluster: "Access Control" endpoint: 0 diff --git a/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp b/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp index 1d402e76e09e97..74545a47e95d5b 100644 --- a/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp +++ b/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp @@ -45,6 +45,46 @@ CHIP_ERROR CommissionerCommands::Unpair(const char * identity, return GetCommissioner(identity).UnpairDevice(value.nodeId); } +CHIP_ERROR CommissionerCommands::GetCommissionerNodeId( + const char * identity, const chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type & value) +{ + chip::GetCommissionerNodeIdResponse data; + data.nodeId = GetCommissioner(identity).GetNodeId(); + + chip::app::StatusIB status; + status.mStatus = chip::Protocols::InteractionModel::Status::Success; + + constexpr uint32_t kMaxDataLen = 128; + uint8_t * buffer = static_cast(chip::Platform::MemoryCalloc(sizeof(uint8_t), kMaxDataLen)); + if (buffer == nullptr) + { + ChipLogError(chipTool, "Can not allocate commissioner node id data: %s", chip::ErrorStr(CHIP_ERROR_NO_MEMORY)); + return CHIP_ERROR_NO_MEMORY; + } + + chip::TLV::TLVWriter writer; + writer.Init(buffer, kMaxDataLen); + CHIP_ERROR err = data.Encode(writer, chip::TLV::AnonymousTag()); + if (CHIP_NO_ERROR != err) + { + ChipLogError(chipTool, "Can not encode commissioner node id data: %s", chip::ErrorStr(err)); + return err; + } + + uint32_t dataLen = writer.GetLengthWritten(); + writer.Finalize(); + + chip::TLV::TLVReader reader; + reader.Init(buffer, dataLen); + reader.Next(); + + OnResponse(status, &reader); + + chip::Platform::MemoryFree(buffer); + + return CHIP_NO_ERROR; +} + chip::app::StatusIB ConvertToStatusIB(CHIP_ERROR err) { using chip::app::StatusIB; diff --git a/src/app/tests/suites/commands/commissioner/CommissionerCommands.h b/src/app/tests/suites/commands/commissioner/CommissionerCommands.h index 33148a19102da3..9056f3a53947e3 100644 --- a/src/app/tests/suites/commands/commissioner/CommissionerCommands.h +++ b/src/app/tests/suites/commands/commissioner/CommissionerCommands.h @@ -36,6 +36,9 @@ class CommissionerCommands : public chip::Controller::DevicePairingDelegate CHIP_ERROR PairWithCode(const char * identity, const chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type & value); CHIP_ERROR Unpair(const char * identity, const chip::app::Clusters::CommissionerCommands::Commands::Unpair::Type & value); + CHIP_ERROR + GetCommissionerNodeId(const char * identity, + const chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type & value); /////////// DevicePairingDelegate Interface ///////// void OnStatusUpdate(chip::Controller::DevicePairingDelegate::Status status) override; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index c080b69ddde697..a7cc6db443b4b2 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -599,14 +599,6 @@ class TestAccessControlClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1240,12 +1232,6 @@ class TestAccessControlClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2164,14 +2150,6 @@ class Test_TC_ACL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2261,12 +2239,6 @@ class Test_TC_ACL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2344,14 +2316,6 @@ class Test_TC_ACL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2403,12 +2367,6 @@ class Test_TC_ACL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2473,14 +2431,6 @@ class Test_TC_ACL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2515,12 +2465,6 @@ class Test_TC_ACL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2605,14 +2549,6 @@ class Test_TC_ACL_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2793,12 +2729,6 @@ class Test_TC_ACL_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -3239,14 +3169,6 @@ class Test_TC_ACL_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -4091,12 +4013,6 @@ class Test_TC_ACL_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -5718,14 +5634,6 @@ class Test_TC_ACL_2_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -5886,12 +5794,6 @@ class Test_TC_ACL_2_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -6063,14 +5965,6 @@ class Test_TC_ACL_2_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -6377,12 +6271,6 @@ class Test_TC_ACL_2_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -6565,14 +6453,6 @@ class Test_TC_ACL_2_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -6665,12 +6545,6 @@ class Test_TC_ACL_2_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -6857,14 +6731,6 @@ class Test_TC_ACL_2_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -7034,12 +6900,6 @@ class Test_TC_ACL_2_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -7408,7 +7268,7 @@ class Test_TC_ACL_2_10Suite : public TestCommand class Test_TC_ACE_1_1Suite : public TestCommand { public: - Test_TC_ACE_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACE_1_1", 37, credsIssuerConfig) + Test_TC_ACE_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACE_1_1", 38, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -7429,6 +7289,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; + chip::NodeId commissionerNodeId; + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } // @@ -7437,14 +7299,6 @@ class Test_TC_ACE_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -7455,8 +7309,17 @@ class Test_TC_ACE_1_1Suite : public TestCommand break; case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeId = value.nodeId; + } + shouldContinue = true; break; case 2: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList @@ -7466,34 +7329,31 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckConstraintMaxLength("value", value, 1)); } break; - case 3: + case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 4: + case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 5: + case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 6: + case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); break; - case 7: + case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 8: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 9: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -7502,23 +7362,23 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 13: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 14: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + break; + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 15: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 16: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -7533,17 +7393,17 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 21: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + break; + case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 22: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 23: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -7558,17 +7418,17 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 28: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + break; + case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 29: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 30: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -7586,6 +7446,9 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 36: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + break; + case 37: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; default: @@ -7601,12 +7464,6 @@ class Test_TC_ACE_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -7617,7 +7474,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WaitForCommissionee(kIdentityAlpha, value); } case 1: { - LogStep(1, "TP2 - Write ACL giving admin privilege on all EP0"); + LogStep(1, "Read the commissioner node ID"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 2: { + LogStep(2, "TP2 - Write ACL giving admin privilege on all EP0"); ListFreer listFreer; chip::app::DataModel::List value; @@ -7661,21 +7524,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 2: { - LogStep(2, "TP3 - Read the NOC attribute (Node operational credentials - requires administer)"); + case 3: { + LogStep(3, "TP3 - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 3: { - LogStep(3, "TP4 - Write the location attribute (Basic - requires administer)"); + case 4: { + LogStep(4, "TP4 - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 4: { - LogStep(4, "TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 5: { + LogStep(5, "TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -7684,16 +7547,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 5: { - LogStep(5, "TP6 - Write NodeLabel attribute (Basic - requires manage)"); + case 6: { + LogStep(6, "TP6 - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 6: { - LogStep(6, "TP7 - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 7: { + LogStep(7, "TP7 - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -7703,13 +7566,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 7: { - LogStep(7, "TP8 - Tead the VendorID attribute (Basic - requires view)"); + case 8: { + LogStep(8, "TP8 - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 8: { - LogStep(8, "TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0"); + case 9: { + LogStep(9, "TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0"); ListFreer listFreer; chip::app::DataModel::List value; @@ -7783,21 +7646,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 9: { - LogStep(9, "TP10 - Read the NOC attribute (Node operational credentials - requires administer)"); + case 10: { + LogStep(10, "TP10 - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 10: { - LogStep(10, "TP11 - Write the location attribute (Basic - requires administer)"); + case 11: { + LogStep(11, "TP11 - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 11: { - LogStep(11, "TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 12: { + LogStep(12, "TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -7806,16 +7669,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 12: { - LogStep(12, "TP13(6) - Write NodeLabel attribute (Basic - requires manage)"); + case 13: { + LogStep(13, "TP13(6) - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 13: { - LogStep(13, "TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 14: { + LogStep(14, "TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -7825,13 +7688,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 14: { - LogStep(14, "TP13(8) - Tead the VendorID attribute (Basic - requires view)"); + case 15: { + LogStep(15, "TP13(8) - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 15: { - LogStep(15, "TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0"); + case 16: { + LogStep(16, "TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0"); ListFreer listFreer; chip::app::DataModel::List value; @@ -7905,21 +7768,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 16: { - LogStep(16, "TP15(10) - Read the NOC attribute (Node operational credentials - requires administer)"); + case 17: { + LogStep(17, "TP15(10) - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 17: { - LogStep(17, "TP15(11) - Write the location attribute (Basic - requires administer)"); + case 18: { + LogStep(18, "TP15(11) - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 18: { - LogStep(18, "TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 19: { + LogStep(19, "TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -7928,16 +7791,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 19: { - LogStep(19, "TP16 - Write NodeLabel attribute (Basic - requires manage)"); + case 20: { + LogStep(20, "TP16 - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 20: { - LogStep(20, "TP17 - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 21: { + LogStep(21, "TP17 - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -7947,13 +7810,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 21: { - LogStep(21, "TP18(8) - Tead the VendorID attribute (Basic - requires view)"); + case 22: { + LogStep(22, "TP18(8) - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 22: { - LogStep(22, "TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0"); + case 23: { + LogStep(23, "TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8027,21 +7890,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 23: { - LogStep(23, "TP20(10) - Read the NOC attribute (Node operational credentials - requires administer)"); + case 24: { + LogStep(24, "TP20(10) - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 24: { - LogStep(24, "TP20(11) - Write the location attribute (Basic - requires administer)"); + case 25: { + LogStep(25, "TP20(11) - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 25: { - LogStep(25, "TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 26: { + LogStep(26, "TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -8050,16 +7913,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 26: { - LogStep(26, "TP21(16) - Write NodeLabel attribute (Basic - requires manage)"); + case 27: { + LogStep(27, "TP21(16) - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 27: { - LogStep(27, "TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 28: { + LogStep(28, "TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -8069,13 +7932,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 28: { - LogStep(28, "TP22(8) - Tead the VendorID attribute (Basic - requires view)"); + case 29: { + LogStep(29, "TP22(8) - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 29: { - LogStep(29, "TP23 - Write ACL giving only admin privilege ACL cluster"); + case 30: { + LogStep(30, "TP23 - Write ACL giving only admin privilege ACL cluster"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8120,21 +7983,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 30: { - LogStep(30, "TP24(10) - Read the NOC attribute (Node operational credentials - requires administer)"); + case 31: { + LogStep(31, "TP24(10) - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 31: { - LogStep(31, "TP24(11) - Write the location attribute (Basic - requires administer)"); + case 32: { + LogStep(32, "TP24(11) - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 32: { - LogStep(32, "TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 33: { + LogStep(33, "TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -8143,16 +8006,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 33: { - LogStep(33, "TP25(16) - Write NodeLabel attribute (Basic - requires manage)"); + case 34: { + LogStep(34, "TP25(16) - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 34: { - LogStep(34, "TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 35: { + LogStep(35, "TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -8162,13 +8025,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 35: { - LogStep(35, "TP26 - Tead the VendorID attribute (Basic - requires view)"); + case 36: { + LogStep(36, "TP26 - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 36: { - LogStep(36, "TP27 - Write ACL to restore full access"); + case 37: { + LogStep(37, "TP27 - Write ACL to restore full access"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8206,7 +8069,7 @@ class Test_TC_ACE_1_1Suite : public TestCommand class Test_TC_ACE_1_5Suite : public TestCommand { public: - Test_TC_ACE_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACE_1_5", 14, credsIssuerConfig) + Test_TC_ACE_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACE_1_5", 16, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -8231,6 +8094,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand uint8_t th1FabricIndex; uint8_t th2FabricIndex; + chip::NodeId commissionerNodeIdAlpha; + chip::NodeId commissionerNodeIdBeta; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -8240,14 +8105,6 @@ class Test_TC_ACE_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -8285,11 +8142,29 @@ class Test_TC_ACE_1_5Suite : public TestCommand break; case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdAlpha = value.nodeId; + } + shouldContinue = true; break; case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdBeta = value.nodeId; + } + shouldContinue = true; + break; + case 9: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList @@ -8297,23 +8172,23 @@ class Test_TC_ACE_1_5Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 9: + case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; - case 10: + case 12: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; - case 11: + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 12: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 13: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; @@ -8333,12 +8208,6 @@ class Test_TC_ACE_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -8385,7 +8254,13 @@ class Test_TC_ACE_1_5Suite : public TestCommand OperationalCredentials::Attributes::CurrentFabricIndex::Id, true, chip::NullOptional); } case 6: { - LogStep(6, "TH1 writes ACL giving view privilege for descriptor cluster"); + LogStep(6, "Read the commissioner node ID from the alpha fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 7: { + LogStep(7, "TH1 writes ACL giving view privilege for descriptor cluster"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8403,7 +8278,7 @@ class Test_TC_ACE_1_5Suite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdAlpha; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNonNull(); @@ -8453,8 +8328,14 @@ class Test_TC_ACE_1_5Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 7: { - LogStep(7, "TH2 writes ACL giving view privilge for basic cluster"); + case 8: { + LogStep(8, "Read the commissioner node ID from the beta fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityBeta, value); + } + case 9: { + LogStep(9, "TH2 writes ACL giving view privilge for basic cluster"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8472,7 +8353,7 @@ class Test_TC_ACE_1_5Suite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdBeta; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNonNull(); @@ -8522,28 +8403,28 @@ class Test_TC_ACE_1_5Suite : public TestCommand return WriteAttribute(kIdentityBeta, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 8: { - LogStep(8, "TH1 reads descriptor cluster - expect SUCCESS"); + case 10: { + LogStep(10, "TH1 reads descriptor cluster - expect SUCCESS"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Descriptor::Id, Descriptor::Attributes::DeviceTypeList::Id, true, chip::NullOptional); } - case 9: { - LogStep(9, "TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"); + case 11: { + LogStep(11, "TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 10: { - LogStep(10, "TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"); + case 12: { + LogStep(12, "TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), Descriptor::Id, Descriptor::Attributes::DeviceTypeList::Id, true, chip::NullOptional); } - case 11: { - LogStep(11, "TH2 reads basic cluster - expect SUCCESS"); + case 13: { + LogStep(13, "TH2 reads basic cluster - expect SUCCESS"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "TH1 resets ACL to default"); + case 14: { + LogStep(14, "TH1 resets ACL to default"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8561,7 +8442,7 @@ class Test_TC_ACE_1_5Suite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdAlpha; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNull(); @@ -8573,8 +8454,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 13: { - LogStep(13, "TH1 sends RemoveFabric command for TH2"); + case 15: { + LogStep(15, "TH1 sends RemoveFabric command for TH2"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::RemoveFabric::Type value; value.fabricIndex = th2FabricIndex; @@ -8620,14 +8501,6 @@ class Test_TC_BOOL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -8705,12 +8578,6 @@ class Test_TC_BOOL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -8782,14 +8649,6 @@ class Test_TC_BOOL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -8819,12 +8678,6 @@ class Test_TC_BOOL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -8878,14 +8731,6 @@ class Test_TC_BRBINFO_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -9089,12 +8934,6 @@ class Test_TC_BRBINFO_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -9334,14 +9173,6 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -9761,12 +9592,6 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -10189,14 +10014,6 @@ class Test_TC_ACT_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -10281,12 +10098,6 @@ class Test_TC_ACT_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -10364,14 +10175,6 @@ class Test_TC_BIND_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -10449,12 +10252,6 @@ class Test_TC_BIND_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -10526,14 +10323,6 @@ class Test_TC_CC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -10980,12 +10769,6 @@ class Test_TC_CC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -11308,14 +11091,6 @@ class Test_TC_CC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -11757,12 +11532,6 @@ class Test_TC_CC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -12234,14 +12003,6 @@ class Test_TC_CC_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -12430,12 +12191,6 @@ class Test_TC_CC_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -12744,14 +12499,6 @@ class Test_TC_CC_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -12908,12 +12655,6 @@ class Test_TC_CC_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -13170,14 +12911,6 @@ class Test_TC_CC_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -13298,12 +13031,6 @@ class Test_TC_CC_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -13486,14 +13213,6 @@ class Test_TC_CC_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -13698,12 +13417,6 @@ class Test_TC_CC_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -14034,14 +13747,6 @@ class Test_TC_CC_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -14229,12 +13934,6 @@ class Test_TC_CC_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -14543,14 +14242,6 @@ class Test_TC_CC_4_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -14704,12 +14395,6 @@ class Test_TC_CC_4_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -14911,14 +14596,6 @@ class Test_TC_CC_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -15288,12 +14965,6 @@ class Test_TC_CC_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -15849,14 +15520,6 @@ class Test_TC_CC_5_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -16014,12 +15677,6 @@ class Test_TC_CC_5_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -16231,14 +15888,6 @@ class Test_TC_CC_5_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -16373,12 +16022,6 @@ class Test_TC_CC_5_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -16570,14 +16213,6 @@ class Test_TC_CC_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -16730,12 +16365,6 @@ class Test_TC_CC_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -16942,14 +16571,6 @@ class Test_TC_CC_6_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -17165,12 +16786,6 @@ class Test_TC_CC_6_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -17491,14 +17106,6 @@ class Test_TC_CC_6_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -17682,12 +17289,6 @@ class Test_TC_CC_6_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -17944,14 +17545,6 @@ class Test_TC_CC_7_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -18140,12 +17733,6 @@ class Test_TC_CC_7_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -18454,14 +18041,6 @@ class Test_TC_CC_7_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -18644,12 +18223,6 @@ class Test_TC_CC_7_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -18935,14 +18508,6 @@ class Test_TC_CC_7_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -19095,12 +18660,6 @@ class Test_TC_CC_7_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -19308,14 +18867,6 @@ class Test_TC_CC_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -19532,12 +19083,6 @@ class Test_TC_CC_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -19933,14 +19478,6 @@ class Test_TC_OPCREDS_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -20027,12 +19564,6 @@ class Test_TC_OPCREDS_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -20104,14 +19635,6 @@ class Test_TC_BINFO_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -20272,12 +19795,6 @@ class Test_TC_BINFO_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -20483,14 +20000,6 @@ class Test_TC_BINFO_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -21027,12 +20536,6 @@ class Test_TC_BINFO_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -21582,14 +21085,6 @@ class Test_TC_CNET_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -21760,12 +21255,6 @@ class Test_TC_CNET_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -21902,14 +21391,6 @@ class Test_TC_DESC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -21990,12 +21471,6 @@ class Test_TC_DESC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -22067,14 +21542,6 @@ class Test_TC_DLOG_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -22155,12 +21622,6 @@ class Test_TC_DLOG_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -22232,14 +21693,6 @@ class Test_TC_DGETH_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -22424,12 +21877,6 @@ class Test_TC_DGETH_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -22575,14 +22022,6 @@ class Test_TC_DGETH_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -22706,12 +22145,6 @@ class Test_TC_DGETH_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -22896,14 +22329,6 @@ class Test_TC_DGETH_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23108,12 +22533,6 @@ class Test_TC_DGETH_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23290,14 +22709,6 @@ class Test_TC_FLW_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23386,12 +22797,6 @@ class Test_TC_FLW_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23469,14 +22874,6 @@ class Test_TC_FLW_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23538,12 +22935,6 @@ class Test_TC_FLW_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23614,14 +23005,6 @@ class Test_TC_FLABEL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23699,12 +23082,6 @@ class Test_TC_FLABEL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23776,14 +23153,6 @@ class Test_TC_FLABEL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23820,12 +23189,6 @@ class Test_TC_FLABEL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23907,14 +23270,6 @@ class Test_TC_CGEN_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23994,12 +23349,6 @@ class Test_TC_CGEN_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24071,14 +23420,6 @@ class Test_TC_CGEN_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -24152,12 +23493,6 @@ class Test_TC_CGEN_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24251,14 +23586,6 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -24389,12 +23716,6 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24502,14 +23823,6 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -24626,12 +23939,6 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24817,14 +24124,6 @@ class Test_TC_I_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -24909,12 +24208,6 @@ class Test_TC_I_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24992,14 +24285,6 @@ class Test_TC_I_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25041,12 +24326,6 @@ class Test_TC_I_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -25105,14 +24384,6 @@ class Test_TC_I_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25190,12 +24461,6 @@ class Test_TC_I_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -25324,14 +24589,6 @@ class Test_TC_I_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25423,12 +24680,6 @@ class Test_TC_I_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -25715,14 +24966,6 @@ class Test_TC_ILL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25820,12 +25063,6 @@ class Test_TC_ILL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -25909,14 +25146,6 @@ class Test_TC_ILL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25988,12 +25217,6 @@ class Test_TC_ILL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -26073,14 +25296,6 @@ class Test_TC_ILL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -26154,12 +25369,6 @@ class Test_TC_ILL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -26264,14 +25473,6 @@ class Test_TC_LVL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -26466,12 +25667,6 @@ class Test_TC_LVL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -26624,14 +25819,6 @@ class Test_TC_LVL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -26857,12 +26044,6 @@ class Test_TC_LVL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -27048,14 +26229,6 @@ class Test_TC_LVL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -27237,12 +26410,6 @@ class Test_TC_LVL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -27429,14 +26596,6 @@ class Test_TC_LVL_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -27707,12 +26866,6 @@ class Test_TC_LVL_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -28172,14 +27325,6 @@ class Test_TC_LVL_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -28345,12 +27490,6 @@ class Test_TC_LVL_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -28594,14 +27733,6 @@ class Test_TC_LVL_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -28744,12 +27875,6 @@ class Test_TC_LVL_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -28983,14 +28108,6 @@ class Test_TC_LVL_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29090,12 +28207,6 @@ class Test_TC_LVL_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -29310,14 +28421,6 @@ class Test_TC_LCFG_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29396,12 +28499,6 @@ class Test_TC_LCFG_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -29473,14 +28570,6 @@ class Test_TC_LUNIT_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29575,12 +28664,6 @@ class Test_TC_LUNIT_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -29669,14 +28752,6 @@ class Test_TC_LUNIT_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29742,12 +28817,6 @@ class Test_TC_LUNIT_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -29854,14 +28923,6 @@ class Test_TC_LTIME_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29958,12 +29019,6 @@ class Test_TC_LTIME_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30053,14 +29108,6 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30148,12 +29195,6 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30226,14 +29267,6 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30331,12 +29364,6 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30429,14 +29456,6 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30536,12 +29555,6 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30633,14 +29646,6 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30744,12 +29749,6 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30841,14 +29840,6 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30934,12 +29925,6 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -31018,14 +30003,6 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -31171,12 +30148,6 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -31300,14 +30271,6 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -31525,12 +30488,6 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -31700,14 +30657,6 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -31784,12 +30733,6 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -31861,14 +30804,6 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -31949,12 +30884,6 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32032,14 +30961,6 @@ class Test_TC_TGTNAV_8_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32057,12 +30978,6 @@ class Test_TC_TGTNAV_8_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -32101,14 +31016,6 @@ class Test_TC_APBSC_1_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32217,12 +31124,6 @@ class Test_TC_APBSC_1_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32313,14 +31214,6 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32436,12 +31329,6 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32547,14 +31434,6 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32627,12 +31506,6 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32721,14 +31594,6 @@ class Test_TC_ALOGIN_12_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32778,12 +31643,6 @@ class Test_TC_ALOGIN_12_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32884,14 +31743,6 @@ class Test_TC_LOWPOWER_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32916,12 +31767,6 @@ class Test_TC_LOWPOWER_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32979,14 +31824,6 @@ class Test_TC_KEYPADINPUT_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33024,12 +31861,6 @@ class Test_TC_KEYPADINPUT_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33099,14 +31930,6 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33200,12 +32023,6 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33352,14 +32169,6 @@ class Test_TC_APPLAUNCHER_3_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33388,12 +32197,6 @@ class Test_TC_APPLAUNCHER_3_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33449,14 +32252,6 @@ class Test_TC_APPLAUNCHER_3_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33487,12 +32282,6 @@ class Test_TC_APPLAUNCHER_3_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33553,14 +32342,6 @@ class Test_TC_APPLAUNCHER_3_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33598,12 +32379,6 @@ class Test_TC_APPLAUNCHER_3_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33691,14 +32466,6 @@ class Test_TC_APPLAUNCHER_3_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33732,12 +32499,6 @@ class Test_TC_APPLAUNCHER_3_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33815,14 +32576,6 @@ class Test_TC_APPLAUNCHER_3_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33855,12 +32608,6 @@ class Test_TC_APPLAUNCHER_3_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33934,14 +32681,6 @@ class Test_TC_MEDIAINPUT_3_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33970,12 +32709,6 @@ class Test_TC_MEDIAINPUT_3_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34032,14 +32765,6 @@ class Test_TC_MEDIAINPUT_3_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34079,12 +32804,6 @@ class Test_TC_MEDIAINPUT_3_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34158,14 +32877,6 @@ class Test_TC_MEDIAINPUT_3_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34200,12 +32911,6 @@ class Test_TC_MEDIAINPUT_3_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34282,14 +32987,6 @@ class Test_TC_MEDIAINPUT_3_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34325,12 +33022,6 @@ class Test_TC_MEDIAINPUT_3_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34407,14 +33098,6 @@ class Test_TC_WAKEONLAN_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34451,12 +33134,6 @@ class Test_TC_WAKEONLAN_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34530,14 +33207,6 @@ class Test_TC_CHANNEL_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34566,12 +33235,6 @@ class Test_TC_CHANNEL_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34633,14 +33296,6 @@ class Test_TC_CHANNEL_5_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34689,12 +33344,6 @@ class Test_TC_CHANNEL_5_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34785,14 +33434,6 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34861,12 +33502,6 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34962,14 +33597,6 @@ class Test_TC_MEDIAPLAYBACK_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -35067,12 +33694,6 @@ class Test_TC_MEDIAPLAYBACK_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -35221,14 +33842,6 @@ class Test_TC_MEDIAPLAYBACK_6_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -35368,12 +33981,6 @@ class Test_TC_MEDIAPLAYBACK_6_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -35589,14 +34196,6 @@ class Test_TC_MEDIAPLAYBACK_6_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -35677,12 +34276,6 @@ class Test_TC_MEDIAPLAYBACK_6_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -35830,14 +34423,6 @@ class Test_TC_MEDIAPLAYBACK_6_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -35999,12 +34584,6 @@ class Test_TC_MEDIAPLAYBACK_6_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36263,14 +34842,6 @@ class Test_TC_AUDIOOUTPUT_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36312,12 +34883,6 @@ class Test_TC_AUDIOOUTPUT_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36393,14 +34958,6 @@ class Test_TC_AUDIOOUTPUT_7_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36439,12 +34996,6 @@ class Test_TC_AUDIOOUTPUT_7_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36527,14 +35078,6 @@ class Test_TC_TGTNAV_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36591,12 +35134,6 @@ class Test_TC_TGTNAV_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36672,14 +35209,6 @@ class Test_TC_APBSC_9_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36771,12 +35300,6 @@ class Test_TC_APBSC_9_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36872,14 +35395,6 @@ class Test_TC_CONTENTLAUNCHER_10_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36917,12 +35432,6 @@ class Test_TC_CONTENTLAUNCHER_10_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36981,14 +35490,6 @@ class Test_TC_MOD_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37093,12 +35594,6 @@ class Test_TC_MOD_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37206,14 +35701,6 @@ class OTA_SuccessfulTransferSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37273,12 +35760,6 @@ class OTA_SuccessfulTransferSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37470,14 +35951,6 @@ class Test_TC_OCC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37557,12 +36030,6 @@ class Test_TC_OCC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37634,14 +36101,6 @@ class Test_TC_OCC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37783,12 +36242,6 @@ class Test_TC_OCC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37911,14 +36364,6 @@ class Test_TC_OCC_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37960,12 +36405,6 @@ class Test_TC_OCC_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -38024,14 +36463,6 @@ class Test_TC_OO_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -38140,12 +36571,6 @@ class Test_TC_OO_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -38236,14 +36661,6 @@ class Test_TC_OO_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -38309,12 +36726,6 @@ class Test_TC_OO_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -38390,14 +36801,6 @@ class Test_TC_OO_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -38539,12 +36942,6 @@ class Test_TC_OO_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -38751,14 +37148,6 @@ class Test_TC_OO_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -38918,12 +37307,6 @@ class Test_TC_OO_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -39207,14 +37590,6 @@ class Test_TC_PS_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -39372,12 +37747,6 @@ class Test_TC_PS_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -39499,14 +37868,6 @@ class Test_TC_PS_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -39821,12 +38182,6 @@ class Test_TC_PS_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -40059,14 +38414,6 @@ class Test_TC_PRS_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -40209,12 +38556,6 @@ class Test_TC_PRS_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -40329,14 +38670,6 @@ class Test_TC_PRS_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -40448,12 +38781,6 @@ class Test_TC_PRS_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -40556,14 +38883,6 @@ class Test_TC_PRS_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -40609,12 +38928,6 @@ class Test_TC_PRS_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -40690,14 +39003,6 @@ class Test_TC_PCC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -40988,12 +39293,6 @@ class Test_TC_PCC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -41206,14 +39505,6 @@ class Test_TC_PCC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -41465,12 +39756,6 @@ class Test_TC_PCC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -41655,14 +39940,6 @@ class Test_TC_PCC_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -41728,12 +40005,6 @@ class Test_TC_PCC_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -41844,14 +40115,6 @@ class Test_TC_PCC_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -41950,12 +40213,6 @@ class Test_TC_PCC_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42114,14 +40371,6 @@ class Test_TC_PCC_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42215,12 +40464,6 @@ class Test_TC_PCC_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42369,14 +40612,6 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42454,12 +40689,6 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42531,14 +40760,6 @@ class Test_TC_PSCFG_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42568,12 +40789,6 @@ class Test_TC_PSCFG_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42626,14 +40841,6 @@ class Test_TC_RH_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42722,12 +40929,6 @@ class Test_TC_RH_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42805,14 +41006,6 @@ class Test_TC_RH_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42874,12 +41067,6 @@ class Test_TC_RH_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42921,7 +41108,7 @@ class Test_TC_RH_2_1Suite : public TestCommand class Test_TC_SC_5_1Suite : public TestCommand { public: - Test_TC_SC_5_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_5_1", 17, credsIssuerConfig) + Test_TC_SC_5_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_5_1", 18, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -42942,6 +41129,8 @@ class Test_TC_SC_5_1Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; + chip::NodeId commissionerNodeId; + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } // @@ -42950,14 +41139,6 @@ class Test_TC_SC_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42968,6 +41149,12 @@ class Test_TC_SC_5_1Suite : public TestCommand break; case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeId = value.nodeId; + } + shouldContinue = true; break; case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -42982,13 +41169,16 @@ class Test_TC_SC_5_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 6: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 7: + case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; @@ -42998,7 +41188,7 @@ class Test_TC_SC_5_1Suite : public TestCommand VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Test Group", 10))); } break; - case 8: + case 9: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; @@ -43008,7 +41198,7 @@ class Test_TC_SC_5_1Suite : public TestCommand VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("", 0))); } break; - case 9: + case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value; @@ -43029,7 +41219,7 @@ class Test_TC_SC_5_1Suite : public TestCommand CheckValue("groupKeySet.epochStartTime2.Value()", value.groupKeySet.epochStartTime2.Value(), 2220002ULL)); } break; - case 10: + case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -43056,7 +41246,7 @@ class Test_TC_SC_5_1Suite : public TestCommand } } break; - case 11: + case 12: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -43083,10 +41273,10 @@ class Test_TC_SC_5_1Suite : public TestCommand } } break; - case 12: + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 13: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -43099,10 +41289,10 @@ class Test_TC_SC_5_1Suite : public TestCommand } } break; - case 14: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 15: + case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -43115,7 +41305,7 @@ class Test_TC_SC_5_1Suite : public TestCommand } } break; - case 16: + case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; default: @@ -43131,12 +41321,6 @@ class Test_TC_SC_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -43147,7 +41331,13 @@ class Test_TC_SC_5_1Suite : public TestCommand return WaitForCommissionee(kIdentityAlpha, value); } case 1: { - LogStep(1, "TH adds ACL Operate privileges for Group 0x0103"); + LogStep(1, "Read the commissioner node ID"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 2: { + LogStep(2, "TH adds ACL Operate privileges for Group 0x0103"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43192,8 +41382,8 @@ class Test_TC_SC_5_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 2: { - LogStep(2, "TH sends KeySetWrite command with incorrect key"); + case 3: { + LogStep(3, "TH sends KeySetWrite command with incorrect key"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -43221,8 +41411,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 3: { - LogStep(3, "TH sends KeySetWrite command with TH key"); + case 4: { + LogStep(4, "TH sends KeySetWrite command with TH key"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -43250,8 +41440,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 4: { - LogStep(4, "TH binds GroupId to GroupKeySet"); + case 5: { + LogStep(5, "TH binds GroupId to GroupKeySet"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43269,8 +41459,8 @@ class Test_TC_SC_5_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 5: { - LogStep(5, "TH sends RemoveAllGroups command"); + case 6: { + LogStep(6, "TH sends RemoveAllGroups command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -43278,8 +41468,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 6: { - LogStep(6, "TH sends AddGroup command"); + case 7: { + LogStep(7, "TH sends AddGroup command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 259U; @@ -43288,8 +41478,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 7: { - LogStep(7, "TH sends ViewGroup command"); + case 8: { + LogStep(8, "TH sends ViewGroup command"); VerifyOrDo(!ShouldSkip("G.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Groups::Commands::ViewGroup::Type value; @@ -43299,8 +41489,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 8: { - LogStep(8, "TH sends ViewGroup command"); + case 9: { + LogStep(9, "TH sends ViewGroup command"); VerifyOrDo(!ShouldSkip("!(G.S.F00)"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Groups::Commands::ViewGroup::Type value; @@ -43310,8 +41500,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 9: { - LogStep(9, "TH sends KeySetRead"); + case 10: { + LogStep(10, "TH sends KeySetRead"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value; value.groupKeySetID = 419U; @@ -43320,20 +41510,20 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 10: { - LogStep(10, "TH reads GroupTable attribute"); + case 11: { + LogStep(11, "TH reads GroupTable attribute"); VerifyOrDo(!ShouldSkip("G.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 11: { - LogStep(11, "TH reads GroupTable attribute"); + case 12: { + LogStep(12, "TH reads GroupTable attribute"); VerifyOrDo(!ShouldSkip("!(G.S.F00)"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "TH removes the GroupKeySet"); + case 13: { + LogStep(13, "TH removes the GroupKeySet"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value; value.groupKeySetID = 419U; @@ -43342,13 +41532,13 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 13: { - LogStep(13, "TH verifies the corresponding GroupKeyMap entry has been removed"); + case 14: { + LogStep(14, "TH verifies the corresponding GroupKeyMap entry has been removed"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, true, chip::NullOptional); } - case 14: { - LogStep(14, "TH cleans up groups using RemoveAllGroups command"); + case 15: { + LogStep(15, "TH cleans up groups using RemoveAllGroups command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -43356,13 +41546,13 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 15: { - LogStep(15, "TH verifies the group has been removed in the GroupTable"); + case 16: { + LogStep(16, "TH verifies the group has been removed in the GroupTable"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 16: { - LogStep(16, "TH removes ACL Operate privileges for Group 0x0103"); + case 17: { + LogStep(17, "TH removes ACL Operate privileges for Group 0x0103"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43400,7 +41590,7 @@ class Test_TC_SC_5_1Suite : public TestCommand class Test_TC_SC_5_2Suite : public TestCommand { public: - Test_TC_SC_5_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_5_2", 11, credsIssuerConfig) + Test_TC_SC_5_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_5_2", 12, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -43421,6 +41611,8 @@ class Test_TC_SC_5_2Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; + chip::NodeId commissionerNodeId; + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } // @@ -43429,14 +41621,6 @@ class Test_TC_SC_5_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -43447,6 +41631,12 @@ class Test_TC_SC_5_2Suite : public TestCommand break; case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeId = value.nodeId; + } + shouldContinue = true; break; case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -43458,13 +41648,16 @@ class Test_TC_SC_5_2Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 5: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 6: + case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; @@ -43474,7 +41667,7 @@ class Test_TC_SC_5_2Suite : public TestCommand VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Test Group", 10))); } break; - case 7: + case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; @@ -43484,15 +41677,15 @@ class Test_TC_SC_5_2Suite : public TestCommand VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("", 0))); } break; - case 8: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 9: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 11: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; default: LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); } @@ -43506,12 +41699,6 @@ class Test_TC_SC_5_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -43522,7 +41709,13 @@ class Test_TC_SC_5_2Suite : public TestCommand return WaitForCommissionee(kIdentityAlpha, value); } case 1: { - LogStep(1, "TH adds ACL Operate privileges for Group 0x0103"); + LogStep(1, "Read the commissioner node ID"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 2: { + LogStep(2, "TH adds ACL Operate privileges for Group 0x0103"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43567,8 +41760,8 @@ class Test_TC_SC_5_2Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 2: { - LogStep(2, "TH sends KeySetWrite command with TH key"); + case 3: { + LogStep(3, "TH sends KeySetWrite command with TH key"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -43596,8 +41789,8 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 3: { - LogStep(3, "TH binds GroupId to GroupKeySet"); + case 4: { + LogStep(4, "TH binds GroupId to GroupKeySet"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43615,8 +41808,8 @@ class Test_TC_SC_5_2Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 4: { - LogStep(4, "TH sends RemoveAllGroups command"); + case 5: { + LogStep(5, "TH sends RemoveAllGroups command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -43624,8 +41817,8 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 5: { - LogStep(5, "TH sends AddGroup command"); + case 6: { + LogStep(6, "TH sends AddGroup command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 259U; @@ -43634,24 +41827,24 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 6: { - LogStep(6, "TH sends ViewGroup command using group messaging"); + case 7: { + LogStep(7, "TH sends ViewGroup command using group messaging"); VerifyOrDo(!ShouldSkip("G.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Groups::Commands::ViewGroup::Type value; value.groupID = 259U; return SendGroupCommand(kIdentityAlpha, 259, Groups::Id, Groups::Commands::ViewGroup::Id, value); } - case 7: { - LogStep(7, "TH sends ViewGroup command using group messaging"); + case 8: { + LogStep(8, "TH sends ViewGroup command using group messaging"); VerifyOrDo(!ShouldSkip("!(G.S.F00)"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Groups::Commands::ViewGroup::Type value; value.groupID = 259U; return SendGroupCommand(kIdentityAlpha, 259, Groups::Id, Groups::Commands::ViewGroup::Id, value); } - case 8: { - LogStep(8, "TH removes the GroupKeySet"); + case 9: { + LogStep(9, "TH removes the GroupKeySet"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value; value.groupKeySetID = 419U; @@ -43660,8 +41853,8 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 9: { - LogStep(9, "TH cleans up groups using RemoveAllGroups command"); + case 10: { + LogStep(10, "TH cleans up groups using RemoveAllGroups command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -43669,8 +41862,8 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 10: { - LogStep(10, "TH removes ACL Operate privileges for Group 0x0103"); + case 11: { + LogStep(11, "TH removes ACL Operate privileges for Group 0x0103"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43737,14 +41930,6 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -43893,12 +42078,6 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44011,14 +42190,6 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -44071,12 +42242,6 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44139,14 +42304,6 @@ class Test_TC_TMP_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -44235,12 +42392,6 @@ class Test_TC_TMP_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44318,14 +42469,6 @@ class Test_TC_TMP_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -44387,12 +42530,6 @@ class Test_TC_TMP_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44463,14 +42600,6 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -44698,12 +42827,6 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44883,14 +43006,6 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -45557,12 +43672,6 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -46033,14 +44142,6 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -46838,12 +44939,6 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -48366,14 +46461,6 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -48453,12 +46540,6 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -48532,14 +46613,6 @@ class Test_TC_TSUIC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -48591,12 +46664,6 @@ class Test_TC_TSUIC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -48663,14 +46730,6 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -48874,12 +46933,6 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -49241,14 +47294,6 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -49469,12 +47514,6 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -49609,14 +47648,6 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -49898,12 +47929,6 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -50200,14 +48225,6 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -50399,12 +48416,6 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -50554,14 +48565,6 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -50747,12 +48750,6 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -50906,14 +48903,6 @@ class Test_TC_DGTHREAD_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -50946,12 +48935,6 @@ class Test_TC_DGTHREAD_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51014,14 +48997,6 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51099,12 +49074,6 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51176,14 +49145,6 @@ class Test_TC_ULABEL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51213,12 +49174,6 @@ class Test_TC_ULABEL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51271,14 +49226,6 @@ class Test_TC_ULABEL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51332,12 +49279,6 @@ class Test_TC_ULABEL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51418,14 +49359,6 @@ class Test_TC_ULABEL_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51453,12 +49386,6 @@ class Test_TC_ULABEL_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51545,14 +49472,6 @@ class Test_TC_ULABEL_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51613,12 +49532,6 @@ class Test_TC_ULABEL_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51718,14 +49631,6 @@ class Test_TC_DGWIFI_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51866,12 +49771,6 @@ class Test_TC_DGWIFI_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51981,14 +49880,6 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -52132,12 +50023,6 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -52262,14 +50147,6 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -52354,12 +50231,6 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -52458,14 +50329,6 @@ class Test_TC_WNCV_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -52669,12 +50532,6 @@ class Test_TC_WNCV_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -52832,14 +50689,6 @@ class Test_TC_WNCV_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53084,12 +50933,6 @@ class Test_TC_WNCV_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53277,14 +51120,6 @@ class Test_TC_WNCV_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53310,12 +51145,6 @@ class Test_TC_WNCV_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53378,14 +51207,6 @@ class Test_TC_WNCV_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53502,12 +51323,6 @@ class Test_TC_WNCV_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53690,14 +51505,6 @@ class Test_TC_WNCV_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53723,12 +51530,6 @@ class Test_TC_WNCV_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53785,14 +51586,6 @@ class Test_TC_WNCV_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53824,12 +51617,6 @@ class Test_TC_WNCV_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53882,14 +51669,6 @@ class Test_TC_WNCV_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -54128,12 +51907,6 @@ class Test_TC_WNCV_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -54366,14 +52139,6 @@ class Test_TC_WNCV_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -54612,12 +52377,6 @@ class Test_TC_WNCV_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -54853,14 +52612,6 @@ class Test_TC_WNCV_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -54997,12 +52748,6 @@ class Test_TC_WNCV_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -55172,14 +52917,6 @@ class Test_TC_WNCV_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -55259,12 +52996,6 @@ class Test_TC_WNCV_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -55379,14 +53110,6 @@ class Test_TC_WNCV_3_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -55466,12 +53189,6 @@ class Test_TC_WNCV_3_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -55584,14 +53301,6 @@ class Test_TC_WNCV_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -55720,12 +53429,6 @@ class Test_TC_WNCV_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -55895,14 +53598,6 @@ class Test_TC_WNCV_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56031,12 +53726,6 @@ class Test_TC_WNCV_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56206,14 +53895,6 @@ class Test_TC_WNCV_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56266,12 +53947,6 @@ class Test_TC_WNCV_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56371,14 +54046,6 @@ class Test_TC_WNCV_4_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56431,12 +54098,6 @@ class Test_TC_WNCV_4_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56537,14 +54198,6 @@ class Test_TC_WNCV_4_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56661,12 +54314,6 @@ class Test_TC_WNCV_4_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56842,14 +54489,6 @@ class TV_TargetNavigatorClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56909,12 +54548,6 @@ class TV_TargetNavigatorClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56984,14 +54617,6 @@ class TV_AudioOutputClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57076,12 +54701,6 @@ class TV_AudioOutputClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57165,14 +54784,6 @@ class TV_ApplicationLauncherClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57252,12 +54863,6 @@ class TV_ApplicationLauncherClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57359,14 +54964,6 @@ class TV_KeypadInputClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57396,12 +54993,6 @@ class TV_KeypadInputClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57459,14 +55050,6 @@ class TV_AccountLoginClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57502,12 +55085,6 @@ class TV_AccountLoginClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57585,14 +55162,6 @@ class TV_WakeOnLanClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57622,12 +55191,6 @@ class TV_WakeOnLanClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57680,14 +55243,6 @@ class TV_ApplicationBasicClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57782,12 +55337,6 @@ class TV_ApplicationBasicClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57875,14 +55424,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58114,12 +55655,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -58318,14 +55853,6 @@ class TV_ChannelClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58458,12 +55985,6 @@ class TV_ChannelClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -58556,14 +56077,6 @@ class TV_LowPowerClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58588,12 +56101,6 @@ class TV_LowPowerClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -58650,14 +56157,6 @@ class TV_ContentLauncherClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58722,12 +56221,6 @@ class TV_ContentLauncherClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -58915,14 +56408,6 @@ class TV_MediaInputClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -59010,12 +56495,6 @@ class TV_MediaInputClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -59116,14 +56595,6 @@ class TestCASERecoverySuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -59176,12 +56647,6 @@ class TestCASERecoverySuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -59287,14 +56752,6 @@ class TestClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -62608,12 +60065,6 @@ class TestClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -66639,14 +64090,6 @@ class TestClusterComplexTypesSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -66772,12 +64215,6 @@ class TestClusterComplexTypesSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -66986,14 +64423,6 @@ class TestConstraintsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -67217,12 +64646,6 @@ class TestConstraintsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -67478,14 +64901,6 @@ class TestDelayCommandsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -67511,12 +64926,6 @@ class TestDelayCommandsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -67572,14 +64981,6 @@ class TestEventsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -67767,12 +65168,6 @@ class TestEventsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -67918,14 +65313,6 @@ class TestDiscoverySuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -68158,12 +65545,6 @@ class TestDiscoverySuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -68403,14 +65784,6 @@ class TestLogCommandsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -68440,12 +65813,6 @@ class TestLogCommandsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -68556,14 +65923,6 @@ class TestSaveAsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -69301,12 +66660,6 @@ class TestSaveAsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70049,14 +67402,6 @@ class TestConfigVariablesSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -70096,12 +67441,6 @@ class TestConfigVariablesSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70171,14 +67510,6 @@ class TestDescriptorClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -70310,12 +67641,6 @@ class TestDescriptorClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70383,14 +67708,6 @@ class TestBasicInformationSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -70563,12 +67880,6 @@ class TestBasicInformationSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70730,14 +68041,6 @@ class TestFabricRemovalWhileSubscribedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -70806,12 +68109,6 @@ class TestFabricRemovalWhileSubscribedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70915,14 +68212,6 @@ class TestGeneralCommissioningSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -71143,12 +68432,6 @@ class TestGeneralCommissioningSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -71414,14 +68697,6 @@ class TestIdentifyClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -71446,12 +68721,6 @@ class TestIdentifyClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -71511,14 +68780,6 @@ class TestOperationalCredentialsClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -71618,12 +68879,6 @@ class TestOperationalCredentialsClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -71719,14 +68974,6 @@ class TestModeSelectClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -71959,12 +69206,6 @@ class TestModeSelectClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -72229,14 +69470,6 @@ class TestSelfFabricRemovalSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -72284,12 +69517,6 @@ class TestSelfFabricRemovalSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -72358,14 +69585,6 @@ class TestSystemCommandsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -72471,12 +69690,6 @@ class TestSystemCommandsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -72698,14 +69911,6 @@ class TestBindingSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -72825,12 +70030,6 @@ class TestBindingSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -72988,14 +70187,6 @@ class TestUserLabelClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73097,12 +70288,6 @@ class TestUserLabelClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -73241,14 +70426,6 @@ class TestUserLabelClusterConstraintsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73276,12 +70453,6 @@ class TestUserLabelClusterConstraintsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -73364,14 +70535,6 @@ class TestArmFailSafeSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73443,12 +70606,6 @@ class TestArmFailSafeSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -73571,14 +70728,6 @@ class TestFanControlSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73760,12 +70909,6 @@ class TestFanControlSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -73959,14 +71102,6 @@ class TestAccessControlConstraintsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -74018,12 +71153,6 @@ class TestAccessControlConstraintsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -74523,14 +71652,6 @@ class TestLevelControlWithOnOffDependencySuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -74734,12 +71855,6 @@ class TestLevelControlWithOnOffDependencySuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -75011,14 +72126,6 @@ class TestCommissioningWindowSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -75238,12 +72345,6 @@ class TestCommissioningWindowSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -75430,7 +72531,7 @@ class TestCommissionerNodeIdSuite : public TestCommand { public: TestCommissionerNodeIdSuite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("TestCommissionerNodeId", 19, credsIssuerConfig) + TestCommand("TestCommissionerNodeId", 22, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); @@ -75454,8 +72555,11 @@ class TestCommissionerNodeIdSuite : public TestCommand chip::Optional mTimeout; uint8_t alphaIndex; + chip::NodeId commissionerNodeIdAlpha; uint8_t betaIndex; + chip::NodeId commissionerNodeIdBeta; uint8_t gammaIndex; + chip::NodeId commissionerNodeIdGamma; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -75465,14 +72569,6 @@ class TestCommissionerNodeIdSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -75512,6 +72608,15 @@ class TestCommissionerNodeIdSuite : public TestCommand } break; case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdAlpha = value.nodeId; + } + shouldContinue = true; + break; + case 9: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -75519,7 +72624,16 @@ class TestCommissionerNodeIdSuite : public TestCommand betaIndex = value; } break; - case 9: + case 10: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdBeta = value.nodeId; + } + shouldContinue = true; + break; + case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -75527,7 +72641,16 @@ class TestCommissionerNodeIdSuite : public TestCommand gammaIndex = value; } break; - case 10: + case 12: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdGamma = value.nodeId; + } + shouldContinue = true; + break; + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75544,7 +72667,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdAlpha)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75554,7 +72677,7 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 11: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75571,7 +72694,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdBeta)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75581,7 +72704,7 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 12: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75598,7 +72721,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdGamma)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75608,13 +72731,13 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 13: + case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 14: + case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 15: + case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75631,7 +72754,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdBeta)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75641,7 +72764,7 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 16: + case 19: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75658,7 +72781,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdGamma)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75668,14 +72791,14 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 17: + case 20: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 18: + case 21: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; @@ -75695,12 +72818,6 @@ class TestCommissionerNodeIdSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -75768,32 +72885,50 @@ class TestCommissionerNodeIdSuite : public TestCommand OperationalCredentials::Attributes::CurrentFabricIndex::Id, true, chip::NullOptional); } case 8: { - LogStep(8, "Read the fabric ID from the beta fabric"); + LogStep(8, "Read the commissioner node ID from the alpha fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 9: { + LogStep(9, "Read the fabric ID from the beta fabric"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::CurrentFabricIndex::Id, true, chip::NullOptional); } - case 9: { - LogStep(9, "Read the fabric ID from the gamma fabric"); + case 10: { + LogStep(10, "Read the commissioner node ID from the beta fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityBeta, value); + } + case 11: { + LogStep(11, "Read the fabric ID from the gamma fabric"); return ReadAttribute(kIdentityGamma, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::CurrentFabricIndex::Id, true, chip::NullOptional); } - case 10: { - LogStep(10, "Read the ACL from alpha and check commissioner node id"); + case 12: { + LogStep(12, "Read the commissioner node ID from the gamma fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityGamma, value); + } + case 13: { + LogStep(13, "Read the ACL from alpha and check commissioner node id"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 11: { - LogStep(11, "Read the ACL from beta and check commissioner node id"); + case 14: { + LogStep(14, "Read the ACL from beta and check commissioner node id"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "Read the ACL from gamma and check commissioner node id"); + case 15: { + LogStep(15, "Read the ACL from gamma and check commissioner node id"); return ReadAttribute(kIdentityGamma, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 13: { - LogStep(13, "Write the ACL using the commissioner node id value"); + case 16: { + LogStep(16, "Write the ACL using the commissioner node id value"); ListFreer listFreer; chip::app::DataModel::List value; @@ -75811,7 +72946,7 @@ class TestCommissionerNodeIdSuite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdBeta; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNull(); @@ -75823,8 +72958,8 @@ class TestCommissionerNodeIdSuite : public TestCommand return WriteAttribute(kIdentityBeta, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 14: { - LogStep(14, "Write the ACL using the commissioner node id value"); + case 17: { + LogStep(17, "Write the ACL using the commissioner node id value"); ListFreer listFreer; chip::app::DataModel::List value; @@ -75842,7 +72977,7 @@ class TestCommissionerNodeIdSuite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdGamma; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNull(); @@ -75854,18 +72989,18 @@ class TestCommissionerNodeIdSuite : public TestCommand return WriteAttribute(kIdentityGamma, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 15: { - LogStep(15, "Read the ACL from beta and check commissioner node id"); + case 18: { + LogStep(18, "Read the ACL from beta and check commissioner node id"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 16: { - LogStep(16, "Read the ACL from gamma and check commissioner node id"); + case 19: { + LogStep(19, "Read the ACL from gamma and check commissioner node id"); return ReadAttribute(kIdentityGamma, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 17: { - LogStep(17, "Remove beta fabric"); + case 20: { + LogStep(20, "Remove beta fabric"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::RemoveFabric::Type value; value.fabricIndex = betaIndex; @@ -75874,8 +73009,8 @@ class TestCommissionerNodeIdSuite : public TestCommand ); } - case 18: { - LogStep(18, "Remove gamma fabric"); + case 21: { + LogStep(21, "Remove gamma fabric"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::RemoveFabric::Type value; value.fabricIndex = gammaIndex; @@ -75922,14 +73057,6 @@ class TestClientMonitoringClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -75998,12 +73125,6 @@ class TestClientMonitoringClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -76144,14 +73265,6 @@ class TestMultiAdminSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -76262,12 +73375,6 @@ class TestMultiAdminSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -76448,14 +73555,6 @@ class Test_TC_DGSW_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -76586,12 +73685,6 @@ class Test_TC_DGSW_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -76702,14 +73795,6 @@ class TestSubscribe_OnOffSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -76766,12 +73851,6 @@ class TestSubscribe_OnOffSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -76860,14 +73939,6 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -76996,12 +74067,6 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -77163,14 +74228,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -78667,12 +75724,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -80446,14 +77497,6 @@ class DL_LockUnlockSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -80676,12 +77719,6 @@ class DL_LockUnlockSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -81060,14 +78097,6 @@ class DL_SchedulesSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -82129,12 +79158,6 @@ class DL_SchedulesSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -83673,14 +80696,6 @@ class Test_TC_DRLK_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -84110,12 +81125,6 @@ class Test_TC_DRLK_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -84413,14 +81422,6 @@ class Test_TC_DRLK_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -84586,12 +81587,6 @@ class Test_TC_DRLK_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -84927,14 +81922,6 @@ class Test_TC_DRLK_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -85129,12 +82116,6 @@ class Test_TC_DRLK_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -85561,14 +82542,6 @@ class Test_TC_DRLK_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -85671,12 +82644,6 @@ class Test_TC_DRLK_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -85859,14 +82826,6 @@ class Test_TC_DRLK_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -85997,12 +82956,6 @@ class Test_TC_DRLK_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -86189,14 +83142,6 @@ class Test_TC_DRLK_2_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -86286,12 +83231,6 @@ class Test_TC_DRLK_2_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -86444,14 +83383,6 @@ class Test_TC_DRLK_2_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -86616,12 +83547,6 @@ class Test_TC_DRLK_2_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -86887,14 +83812,6 @@ class Test_TC_DRLK_2_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -87078,12 +83995,6 @@ class Test_TC_DRLK_2_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -87443,14 +84354,6 @@ class TestGroupMessagingSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -87674,12 +84577,6 @@ class TestGroupMessagingSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -88230,14 +85127,6 @@ class TestGroupsClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -88498,12 +85387,6 @@ class TestGroupsClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -88876,14 +85759,6 @@ class TestGroupKeyManagementClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -89249,12 +86124,6 @@ class TestGroupKeyManagementClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -89736,14 +86605,6 @@ class Test_TC_G_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -89832,12 +86693,6 @@ class Test_TC_G_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -89919,14 +86774,6 @@ class Test_TC_G_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -89985,12 +86832,6 @@ class Test_TC_G_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -90070,14 +86911,6 @@ class Test_TC_DD_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90095,12 +86928,6 @@ class Test_TC_DD_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90139,14 +86966,6 @@ class Test_TC_DD_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90164,12 +86983,6 @@ class Test_TC_DD_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90208,14 +87021,6 @@ class Test_TC_DD_1_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90233,12 +87038,6 @@ class Test_TC_DD_1_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90277,14 +87076,6 @@ class Test_TC_DD_1_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90302,12 +87093,6 @@ class Test_TC_DD_1_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90346,14 +87131,6 @@ class Test_TC_DD_1_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90371,12 +87148,6 @@ class Test_TC_DD_1_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90415,14 +87186,6 @@ class Test_TC_DD_1_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90440,12 +87203,6 @@ class Test_TC_DD_1_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90484,14 +87241,6 @@ class Test_TC_DD_1_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90509,12 +87258,6 @@ class Test_TC_DD_1_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90553,14 +87296,6 @@ class Test_TC_DD_1_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90578,12 +87313,6 @@ class Test_TC_DD_1_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90622,14 +87351,6 @@ class Test_TC_DD_1_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90647,12 +87368,6 @@ class Test_TC_DD_1_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90691,14 +87406,6 @@ class Test_TC_DD_1_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90716,12 +87423,6 @@ class Test_TC_DD_1_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90760,14 +87461,6 @@ class Test_TC_DD_1_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90785,12 +87478,6 @@ class Test_TC_DD_1_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90829,14 +87516,6 @@ class Test_TC_DD_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90854,12 +87533,6 @@ class Test_TC_DD_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90898,14 +87571,6 @@ class Test_TC_DD_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90923,12 +87588,6 @@ class Test_TC_DD_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90967,14 +87626,6 @@ class Test_TC_DD_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90992,12 +87643,6 @@ class Test_TC_DD_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91036,14 +87681,6 @@ class Test_TC_DD_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91061,12 +87698,6 @@ class Test_TC_DD_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91105,14 +87736,6 @@ class Test_TC_DD_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91130,12 +87753,6 @@ class Test_TC_DD_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91174,14 +87791,6 @@ class Test_TC_DD_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91199,12 +87808,6 @@ class Test_TC_DD_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91243,14 +87846,6 @@ class Test_TC_DD_3_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91268,12 +87863,6 @@ class Test_TC_DD_3_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91312,14 +87901,6 @@ class Test_TC_DD_3_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91337,12 +87918,6 @@ class Test_TC_DD_3_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91381,14 +87956,6 @@ class Test_TC_DD_3_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91406,12 +87973,6 @@ class Test_TC_DD_3_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91450,14 +88011,6 @@ class Test_TC_DD_3_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91475,12 +88028,6 @@ class Test_TC_DD_3_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91519,14 +88066,6 @@ class Test_TC_DD_3_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91544,12 +88083,6 @@ class Test_TC_DD_3_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91588,14 +88121,6 @@ class Test_TC_DD_3_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91613,12 +88138,6 @@ class Test_TC_DD_3_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91657,14 +88176,6 @@ class Test_TC_DD_3_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91682,12 +88193,6 @@ class Test_TC_DD_3_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91726,14 +88231,6 @@ class Test_TC_DD_3_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91751,12 +88248,6 @@ class Test_TC_DD_3_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91795,14 +88286,6 @@ class Test_TC_DD_3_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91820,12 +88303,6 @@ class Test_TC_DD_3_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91864,14 +88341,6 @@ class Test_TC_DD_3_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91889,12 +88358,6 @@ class Test_TC_DD_3_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91933,14 +88396,6 @@ class Test_TC_DD_3_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91958,12 +88413,6 @@ class Test_TC_DD_3_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92002,14 +88451,6 @@ class Test_TC_DD_3_16Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92027,12 +88468,6 @@ class Test_TC_DD_3_16Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92071,14 +88506,6 @@ class Test_TC_DD_3_17Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92096,12 +88523,6 @@ class Test_TC_DD_3_17Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92140,14 +88561,6 @@ class Test_TC_DD_3_18Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92165,12 +88578,6 @@ class Test_TC_DD_3_18Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92209,14 +88616,6 @@ class Test_TC_DD_3_19Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92234,12 +88633,6 @@ class Test_TC_DD_3_19Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92278,14 +88671,6 @@ class Test_TC_DD_3_20Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92303,12 +88688,6 @@ class Test_TC_DD_3_20Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92347,14 +88726,6 @@ class Test_TC_DD_3_21Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92372,12 +88743,6 @@ class Test_TC_DD_3_21Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92417,14 +88782,6 @@ class TestGroupDemoCommandSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92516,12 +88873,6 @@ class TestGroupDemoCommandSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -92699,14 +89050,6 @@ class TestGroupDemoConfigSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92746,12 +89089,6 @@ class TestGroupDemoConfigSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -92901,14 +89238,6 @@ class Test_TC_G_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92926,12 +89255,6 @@ class Test_TC_G_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92970,14 +89293,6 @@ class Test_TC_G_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92995,12 +89310,6 @@ class Test_TC_G_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93039,14 +89348,6 @@ class Test_TC_G_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93064,12 +89365,6 @@ class Test_TC_G_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93108,14 +89403,6 @@ class Test_TC_BDX_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93133,12 +89420,6 @@ class Test_TC_BDX_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93177,14 +89458,6 @@ class Test_TC_BDX_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93202,12 +89475,6 @@ class Test_TC_BDX_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93246,14 +89513,6 @@ class Test_TC_BDX_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93271,12 +89530,6 @@ class Test_TC_BDX_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93315,14 +89568,6 @@ class Test_TC_BDX_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93340,12 +89585,6 @@ class Test_TC_BDX_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93384,14 +89623,6 @@ class Test_TC_BDX_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93409,12 +89640,6 @@ class Test_TC_BDX_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93453,14 +89678,6 @@ class Test_TC_BDX_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93478,12 +89695,6 @@ class Test_TC_BDX_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93522,14 +89733,6 @@ class Test_TC_BDX_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93547,12 +89750,6 @@ class Test_TC_BDX_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93591,14 +89788,6 @@ class Test_TC_BDX_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93616,12 +89805,6 @@ class Test_TC_BDX_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93660,14 +89843,6 @@ class Test_TC_BDX_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93685,12 +89860,6 @@ class Test_TC_BDX_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93729,14 +89898,6 @@ class Test_TC_BDX_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93754,12 +89915,6 @@ class Test_TC_BDX_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93798,14 +89953,6 @@ class Test_TC_BDX_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93823,12 +89970,6 @@ class Test_TC_BDX_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93867,14 +90008,6 @@ class Test_TC_BR_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93892,12 +90025,6 @@ class Test_TC_BR_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93936,14 +90063,6 @@ class Test_TC_BR_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93961,12 +90080,6 @@ class Test_TC_BR_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94005,14 +90118,6 @@ class Test_TC_BR_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94030,12 +90135,6 @@ class Test_TC_BR_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94074,14 +90173,6 @@ class Test_TC_BR_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94099,12 +90190,6 @@ class Test_TC_BR_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94143,14 +90228,6 @@ class Test_TC_DA_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94168,12 +90245,6 @@ class Test_TC_DA_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94212,14 +90283,6 @@ class Test_TC_DA_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94237,12 +90300,6 @@ class Test_TC_DA_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94281,14 +90338,6 @@ class Test_TC_DA_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94306,12 +90355,6 @@ class Test_TC_DA_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94350,14 +90393,6 @@ class Test_TC_DA_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94375,12 +90410,6 @@ class Test_TC_DA_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94419,14 +90448,6 @@ class Test_TC_DA_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94444,12 +90465,6 @@ class Test_TC_DA_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94488,14 +90503,6 @@ class Test_TC_DA_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94513,12 +90520,6 @@ class Test_TC_DA_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94557,14 +90558,6 @@ class Test_TC_BINFO_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94582,12 +90575,6 @@ class Test_TC_BINFO_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94626,14 +90613,6 @@ class Test_TC_BINFO_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94651,12 +90630,6 @@ class Test_TC_BINFO_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94696,14 +90669,6 @@ class Test_TC_OPCREDS_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94721,12 +90686,6 @@ class Test_TC_OPCREDS_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94766,14 +90725,6 @@ class Test_TC_OPCREDS_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94791,12 +90742,6 @@ class Test_TC_OPCREDS_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94836,14 +90781,6 @@ class Test_TC_OPCREDS_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94861,12 +90798,6 @@ class Test_TC_OPCREDS_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94906,14 +90837,6 @@ class Test_TC_OPCREDS_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94931,12 +90854,6 @@ class Test_TC_OPCREDS_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94975,14 +90892,6 @@ class Test_TC_CNET_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95000,12 +90909,6 @@ class Test_TC_CNET_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95044,14 +90947,6 @@ class Test_TC_CNET_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95069,12 +90964,6 @@ class Test_TC_CNET_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95113,14 +91002,6 @@ class Test_TC_CNET_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95138,12 +91019,6 @@ class Test_TC_CNET_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95182,14 +91057,6 @@ class Test_TC_CNET_4_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95207,12 +91074,6 @@ class Test_TC_CNET_4_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95251,14 +91112,6 @@ class Test_TC_CNET_4_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95276,12 +91129,6 @@ class Test_TC_CNET_4_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95320,14 +91167,6 @@ class Test_TC_CNET_4_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95345,12 +91184,6 @@ class Test_TC_CNET_4_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95389,14 +91222,6 @@ class Test_TC_CNET_4_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95414,12 +91239,6 @@ class Test_TC_CNET_4_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95458,14 +91277,6 @@ class Test_TC_CNET_4_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95483,12 +91294,6 @@ class Test_TC_CNET_4_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95527,14 +91332,6 @@ class Test_TC_CNET_4_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95552,12 +91349,6 @@ class Test_TC_CNET_4_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95596,14 +91387,6 @@ class Test_TC_CNET_4_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95621,12 +91404,6 @@ class Test_TC_CNET_4_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95665,14 +91442,6 @@ class Test_TC_CNET_4_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95690,12 +91459,6 @@ class Test_TC_CNET_4_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95734,14 +91497,6 @@ class Test_TC_CNET_4_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95759,12 +91514,6 @@ class Test_TC_CNET_4_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95803,14 +91552,6 @@ class Test_TC_CNET_4_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95828,12 +91569,6 @@ class Test_TC_CNET_4_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95872,14 +91607,6 @@ class Test_TC_CNET_4_16Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95897,12 +91624,6 @@ class Test_TC_CNET_4_16Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95941,14 +91662,6 @@ class Test_TC_CNET_4_17Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95966,12 +91679,6 @@ class Test_TC_CNET_4_17Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96010,14 +91717,6 @@ class Test_TC_CNET_4_18Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96035,12 +91734,6 @@ class Test_TC_CNET_4_18Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96079,14 +91772,6 @@ class Test_TC_CNET_4_19Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96104,12 +91789,6 @@ class Test_TC_CNET_4_19Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96148,14 +91827,6 @@ class Test_TC_CNET_4_20Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96173,12 +91844,6 @@ class Test_TC_CNET_4_20Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96217,14 +91882,6 @@ class Test_TC_CNET_4_21Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96242,12 +91899,6 @@ class Test_TC_CNET_4_21Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96286,14 +91937,6 @@ class Test_TC_CNET_4_22Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96311,12 +91954,6 @@ class Test_TC_CNET_4_22Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96355,14 +91992,6 @@ class Test_TC_DLOG_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96380,12 +92009,6 @@ class Test_TC_DLOG_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96424,14 +92047,6 @@ class Test_TC_DLOG_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96449,12 +92064,6 @@ class Test_TC_DLOG_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96493,14 +92102,6 @@ class Test_TC_DLOG_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96518,12 +92119,6 @@ class Test_TC_DLOG_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96562,14 +92157,6 @@ class Test_TC_DESC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96587,12 +92174,6 @@ class Test_TC_DESC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96631,14 +92212,6 @@ class Test_TC_DGETH_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96656,12 +92229,6 @@ class Test_TC_DGETH_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96700,14 +92267,6 @@ class Test_TC_CGEN_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96725,12 +92284,6 @@ class Test_TC_CGEN_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96769,14 +92322,6 @@ class Test_TC_CGEN_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96794,12 +92339,6 @@ class Test_TC_CGEN_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96838,14 +92377,6 @@ class Test_TC_DGGEN_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96863,12 +92394,6 @@ class Test_TC_DGGEN_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96907,14 +92432,6 @@ class Test_TC_DGGEN_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96932,12 +92449,6 @@ class Test_TC_DGGEN_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96976,14 +92487,6 @@ class Test_TC_DGGEN_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97001,12 +92504,6 @@ class Test_TC_DGGEN_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97045,14 +92542,6 @@ class Test_TC_I_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97070,12 +92559,6 @@ class Test_TC_I_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97114,14 +92597,6 @@ class Test_TC_ILL_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97139,12 +92614,6 @@ class Test_TC_ILL_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97183,14 +92652,6 @@ class Test_TC_IDM_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97208,12 +92669,6 @@ class Test_TC_IDM_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97252,14 +92707,6 @@ class Test_TC_IDM_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97277,12 +92724,6 @@ class Test_TC_IDM_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97321,14 +92762,6 @@ class Test_TC_IDM_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97346,12 +92779,6 @@ class Test_TC_IDM_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97390,14 +92817,6 @@ class Test_TC_IDM_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97415,12 +92834,6 @@ class Test_TC_IDM_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97459,14 +92872,6 @@ class Test_TC_IDM_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97484,12 +92889,6 @@ class Test_TC_IDM_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97528,14 +92927,6 @@ class Test_TC_IDM_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97553,12 +92944,6 @@ class Test_TC_IDM_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97597,14 +92982,6 @@ class Test_TC_IDM_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97622,12 +92999,6 @@ class Test_TC_IDM_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97666,14 +93037,6 @@ class Test_TC_IDM_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97691,12 +93054,6 @@ class Test_TC_IDM_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97735,14 +93092,6 @@ class Test_TC_IDM_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97760,12 +93109,6 @@ class Test_TC_IDM_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97804,14 +93147,6 @@ class Test_TC_IDM_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97829,12 +93164,6 @@ class Test_TC_IDM_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97873,14 +93202,6 @@ class Test_TC_IDM_5_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97898,12 +93219,6 @@ class Test_TC_IDM_5_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97942,14 +93257,6 @@ class Test_TC_IDM_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97967,12 +93274,6 @@ class Test_TC_IDM_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98011,14 +93312,6 @@ class Test_TC_IDM_6_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98036,12 +93329,6 @@ class Test_TC_IDM_6_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98080,14 +93367,6 @@ class Test_TC_IDM_6_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98105,12 +93384,6 @@ class Test_TC_IDM_6_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98149,14 +93422,6 @@ class Test_TC_IDM_6_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98174,12 +93439,6 @@ class Test_TC_IDM_6_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98218,14 +93477,6 @@ class Test_TC_IDM_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98243,12 +93494,6 @@ class Test_TC_IDM_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98287,14 +93532,6 @@ class Test_TC_IDM_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98312,12 +93549,6 @@ class Test_TC_IDM_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98357,14 +93588,6 @@ class Test_TC_LOWPOWER_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98382,12 +93605,6 @@ class Test_TC_LOWPOWER_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98427,14 +93644,6 @@ class Test_TC_APPLAUNCHER_3_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98452,12 +93661,6 @@ class Test_TC_APPLAUNCHER_3_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98497,14 +93700,6 @@ class Test_TC_APPLAUNCHER_3_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98522,12 +93717,6 @@ class Test_TC_APPLAUNCHER_3_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98567,14 +93756,6 @@ class Test_TC_APPLAUNCHER_3_9_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98592,12 +93773,6 @@ class Test_TC_APPLAUNCHER_3_9_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98637,14 +93812,6 @@ class Test_TC_MEDIAINPUT_3_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98662,12 +93829,6 @@ class Test_TC_MEDIAINPUT_3_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98707,14 +93868,6 @@ class Test_TC_MEDIAINPUT_3_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98732,12 +93885,6 @@ class Test_TC_MEDIAINPUT_3_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98777,14 +93924,6 @@ class Test_TC_MEDIAINPUT_3_16Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98802,12 +93941,6 @@ class Test_TC_MEDIAINPUT_3_16Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98847,14 +93980,6 @@ class Test_TC_MEDIAINPUT_3_17Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98872,12 +93997,6 @@ class Test_TC_MEDIAINPUT_3_17Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98917,14 +94036,6 @@ class Test_TC_CHANNEL_5_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98942,12 +94053,6 @@ class Test_TC_CHANNEL_5_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98987,14 +94092,6 @@ class Test_TC_CHANNEL_5_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99012,12 +94109,6 @@ class Test_TC_CHANNEL_5_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99057,14 +94148,6 @@ class Test_TC_CHANNEL_5_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99082,12 +94165,6 @@ class Test_TC_CHANNEL_5_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99127,14 +94204,6 @@ class Test_TC_KEYPADINPUT_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99152,12 +94221,6 @@ class Test_TC_KEYPADINPUT_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99197,14 +94260,6 @@ class Test_TC_MEDIAPLAYBACK_6_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99222,12 +94277,6 @@ class Test_TC_MEDIAPLAYBACK_6_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99267,14 +94316,6 @@ class Test_TC_MEDIAPLAYBACK_6_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99292,12 +94333,6 @@ class Test_TC_MEDIAPLAYBACK_6_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99337,14 +94372,6 @@ class Test_TC_AUDIOOUTPUT_7_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99362,12 +94389,6 @@ class Test_TC_AUDIOOUTPUT_7_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99407,14 +94428,6 @@ class Test_TC_AUDIOOUTPUT_7_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99432,12 +94445,6 @@ class Test_TC_AUDIOOUTPUT_7_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99477,14 +94484,6 @@ class Test_TC_CONTENTLAUNCHER_10_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99502,12 +94501,6 @@ class Test_TC_CONTENTLAUNCHER_10_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99547,14 +94540,6 @@ class Test_TC_CONTENTLAUNCHER_10_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99572,12 +94557,6 @@ class Test_TC_CONTENTLAUNCHER_10_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99617,14 +94596,6 @@ class Test_TC_CONTENTLAUNCHER_10_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99642,12 +94613,6 @@ class Test_TC_CONTENTLAUNCHER_10_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99687,14 +94652,6 @@ class Test_TC_CONTENTLAUNCHER_10_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99712,12 +94669,6 @@ class Test_TC_CONTENTLAUNCHER_10_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99756,14 +94707,6 @@ class Test_TC_MC_11_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99781,12 +94724,6 @@ class Test_TC_MC_11_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99825,14 +94762,6 @@ class Test_TC_MC_11_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99850,12 +94779,6 @@ class Test_TC_MC_11_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99895,14 +94818,6 @@ class Test_TC_ALOGIN_12_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99920,12 +94835,6 @@ class Test_TC_ALOGIN_12_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99964,14 +94873,6 @@ class Test_TC_CADMIN_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99989,12 +94890,6 @@ class Test_TC_CADMIN_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100033,14 +94928,6 @@ class Test_TC_CADMIN_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100058,12 +94945,6 @@ class Test_TC_CADMIN_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100102,14 +94983,6 @@ class Test_TC_CADMIN_1_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100127,12 +95000,6 @@ class Test_TC_CADMIN_1_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100171,14 +95038,6 @@ class Test_TC_CADMIN_1_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100196,12 +95055,6 @@ class Test_TC_CADMIN_1_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100246,14 +95099,6 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100397,12 +95242,6 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -100701,14 +95540,6 @@ class Test_TC_CADMIN_1_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100726,12 +95557,6 @@ class Test_TC_CADMIN_1_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100771,14 +95596,6 @@ class Test_TC_CADMIN_1_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100796,12 +95613,6 @@ class Test_TC_CADMIN_1_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100849,14 +95660,6 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101019,12 +95822,6 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -101280,14 +96077,6 @@ class Test_TC_CADMIN_1_16Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101446,12 +96235,6 @@ class Test_TC_CADMIN_1_16Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -101654,14 +96437,6 @@ class Test_TC_CADMIN_1_17Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101679,12 +96454,6 @@ class Test_TC_CADMIN_1_17Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -101724,14 +96493,6 @@ class Test_TC_CADMIN_1_18Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101749,12 +96510,6 @@ class Test_TC_CADMIN_1_18Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -101794,14 +96549,6 @@ class Test_TC_CADMIN_1_19Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101819,12 +96566,6 @@ class Test_TC_CADMIN_1_19Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -101864,14 +96605,6 @@ class Test_TC_CADMIN_1_20Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101889,12 +96622,6 @@ class Test_TC_CADMIN_1_20Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -101931,14 +96658,6 @@ class Test_TC_CADMIN_1_21Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101994,12 +96713,6 @@ class Test_TC_CADMIN_1_21Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -102108,14 +96821,6 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -102171,12 +96876,6 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -102312,14 +97011,6 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -102475,12 +97166,6 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -102735,14 +97420,6 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -102897,12 +97574,6 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -103129,14 +97800,6 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -103235,12 +97898,6 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -103539,14 +98196,6 @@ class Test_TC_CADMIN_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -103640,12 +98289,6 @@ class Test_TC_CADMIN_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -103875,14 +98518,6 @@ class Test_TC_CADMIN_1_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -104007,12 +98642,6 @@ class Test_TC_CADMIN_1_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -104340,14 +98969,6 @@ class Test_TC_CADMIN_1_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -104468,12 +99089,6 @@ class Test_TC_CADMIN_1_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -104778,14 +99393,6 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -104981,12 +99588,6 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -105345,14 +99946,6 @@ class Test_TC_CADMIN_1_23Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105408,12 +100001,6 @@ class Test_TC_CADMIN_1_23Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -105522,14 +100109,6 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105585,12 +100164,6 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -105723,14 +100296,6 @@ class Test_TC_MOD_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105748,12 +100313,6 @@ class Test_TC_MOD_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -105792,14 +100351,6 @@ class Test_TC_MOD_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105817,12 +100368,6 @@ class Test_TC_MOD_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -105861,14 +100406,6 @@ class Test_TC_MOD_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105886,12 +100423,6 @@ class Test_TC_MOD_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -105930,14 +100461,6 @@ class Test_TC_MOD_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105955,12 +100478,6 @@ class Test_TC_MOD_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -105999,14 +100516,6 @@ class Test_TC_MOD_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106024,12 +100533,6 @@ class Test_TC_MOD_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106068,14 +100571,6 @@ class Test_TC_MOD_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106093,12 +100588,6 @@ class Test_TC_MOD_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106137,14 +100626,6 @@ class Test_TC_MOD_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106162,12 +100643,6 @@ class Test_TC_MOD_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106206,14 +100681,6 @@ class Test_TC_MOD_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106231,12 +100698,6 @@ class Test_TC_MOD_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106275,14 +100736,6 @@ class Test_TC_SU_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106300,12 +100753,6 @@ class Test_TC_SU_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106344,14 +100791,6 @@ class Test_TC_SU_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106369,12 +100808,6 @@ class Test_TC_SU_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106413,14 +100846,6 @@ class Test_TC_SU_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106438,12 +100863,6 @@ class Test_TC_SU_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106482,14 +100901,6 @@ class Test_TC_SU_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106507,12 +100918,6 @@ class Test_TC_SU_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106551,14 +100956,6 @@ class Test_TC_SU_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106576,12 +100973,6 @@ class Test_TC_SU_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106620,14 +101011,6 @@ class Test_TC_SU_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106645,12 +101028,6 @@ class Test_TC_SU_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106689,14 +101066,6 @@ class Test_TC_SU_2_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106714,12 +101083,6 @@ class Test_TC_SU_2_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106758,14 +101121,6 @@ class Test_TC_SU_2_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106783,12 +101138,6 @@ class Test_TC_SU_2_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106827,14 +101176,6 @@ class Test_TC_SU_2_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106852,12 +101193,6 @@ class Test_TC_SU_2_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106896,14 +101231,6 @@ class Test_TC_SU_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106921,12 +101248,6 @@ class Test_TC_SU_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106965,14 +101286,6 @@ class Test_TC_SU_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106990,12 +101303,6 @@ class Test_TC_SU_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107034,14 +101341,6 @@ class Test_TC_SU_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107059,12 +101358,6 @@ class Test_TC_SU_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107103,14 +101396,6 @@ class Test_TC_SU_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107128,12 +101413,6 @@ class Test_TC_SU_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107172,14 +101451,6 @@ class Test_TC_SU_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107197,12 +101468,6 @@ class Test_TC_SU_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107241,14 +101506,6 @@ class Test_TC_SU_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107266,12 +101523,6 @@ class Test_TC_SU_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107310,14 +101561,6 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107335,12 +101578,6 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107379,14 +101616,6 @@ class Test_TC_SC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107404,12 +101633,6 @@ class Test_TC_SC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107448,14 +101671,6 @@ class Test_TC_SC_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107473,12 +101688,6 @@ class Test_TC_SC_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107517,14 +101726,6 @@ class Test_TC_SC_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107542,12 +101743,6 @@ class Test_TC_SC_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107586,14 +101781,6 @@ class Test_TC_SC_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107611,12 +101798,6 @@ class Test_TC_SC_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107655,14 +101836,6 @@ class Test_TC_SC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107680,12 +101853,6 @@ class Test_TC_SC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107724,14 +101891,6 @@ class Test_TC_SC_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107749,12 +101908,6 @@ class Test_TC_SC_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107793,14 +101946,6 @@ class Test_TC_SC_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107818,12 +101963,6 @@ class Test_TC_SC_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107862,14 +102001,6 @@ class Test_TC_SC_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107887,12 +102018,6 @@ class Test_TC_SC_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107931,14 +102056,6 @@ class Test_TC_SC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107956,12 +102073,6 @@ class Test_TC_SC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108000,14 +102111,6 @@ class Test_TC_SC_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108025,12 +102128,6 @@ class Test_TC_SC_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108069,14 +102166,6 @@ class Test_TC_SC_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108094,12 +102183,6 @@ class Test_TC_SC_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108138,14 +102221,6 @@ class Test_TC_SC_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108163,12 +102238,6 @@ class Test_TC_SC_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108207,14 +102276,6 @@ class Test_TC_SC_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108232,12 +102293,6 @@ class Test_TC_SC_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108276,14 +102331,6 @@ class Test_TC_SC_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108301,12 +102348,6 @@ class Test_TC_SC_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108345,14 +102386,6 @@ class Test_TC_SC_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108370,12 +102403,6 @@ class Test_TC_SC_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108414,14 +102441,6 @@ class Test_TC_SC_4_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108439,12 +102458,6 @@ class Test_TC_SC_4_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108483,14 +102496,6 @@ class Test_TC_SC_4_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108508,12 +102513,6 @@ class Test_TC_SC_4_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108552,14 +102551,6 @@ class Test_TC_SC_4_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108577,12 +102568,6 @@ class Test_TC_SC_4_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108621,14 +102606,6 @@ class Test_TC_SC_4_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108646,12 +102623,6 @@ class Test_TC_SC_4_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108690,14 +102661,6 @@ class Test_TC_SC_4_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108715,12 +102678,6 @@ class Test_TC_SC_4_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108759,14 +102716,6 @@ class Test_TC_SC_4_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108784,12 +102733,6 @@ class Test_TC_SC_4_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108828,14 +102771,6 @@ class Test_TC_SC_4_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108853,12 +102788,6 @@ class Test_TC_SC_4_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108897,14 +102826,6 @@ class Test_TC_SC_5_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108922,12 +102843,6 @@ class Test_TC_SC_5_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108966,14 +102881,6 @@ class Test_TC_SC_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108991,12 +102898,6 @@ class Test_TC_SC_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109035,14 +102936,6 @@ class Test_TC_DGSW_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109060,12 +102953,6 @@ class Test_TC_DGSW_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109104,14 +102991,6 @@ class Test_TC_DGSW_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109129,12 +103008,6 @@ class Test_TC_DGSW_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109173,14 +103046,6 @@ class Test_TC_DGSW_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109198,12 +103063,6 @@ class Test_TC_DGSW_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109242,14 +103101,6 @@ class Test_TC_DGSW_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109267,12 +103118,6 @@ class Test_TC_DGSW_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109311,14 +103156,6 @@ class Test_TC_DGWIFI_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109336,12 +103173,6 @@ class Test_TC_DGWIFI_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109380,14 +103211,6 @@ class Test_TC_DGWIFI_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109405,12 +103228,6 @@ class Test_TC_DGWIFI_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109449,14 +103266,6 @@ class Test_TC_WNCV_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109474,12 +103283,6 @@ class Test_TC_WNCV_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109518,14 +103321,6 @@ class Test_TC_WNCV_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109543,12 +103338,6 @@ class Test_TC_WNCV_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109589,14 +103378,6 @@ class Test_TC_FLW_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109644,12 +103425,6 @@ class Test_TC_FLW_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -109720,14 +103495,6 @@ class Test_TC_OCC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109769,12 +103536,6 @@ class Test_TC_OCC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -109843,14 +103604,6 @@ class Test_TC_PS_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109868,12 +103621,6 @@ class Test_TC_PS_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109912,14 +103659,6 @@ class Test_TC_BOOL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109937,12 +103676,6 @@ class Test_TC_BOOL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109981,14 +103714,6 @@ class Test_TC_CC_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110006,12 +103731,6 @@ class Test_TC_CC_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110050,14 +103769,6 @@ class Test_TC_CC_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110075,12 +103786,6 @@ class Test_TC_CC_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110119,14 +103824,6 @@ class Test_TC_CC_4_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110144,12 +103841,6 @@ class Test_TC_CC_4_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110188,14 +103879,6 @@ class Test_TC_CC_5_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110213,12 +103896,6 @@ class Test_TC_CC_5_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110257,14 +103934,6 @@ class Test_TC_CC_6_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110282,12 +103951,6 @@ class Test_TC_CC_6_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110326,14 +103989,6 @@ class Test_TC_CC_7_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110351,12 +104006,6 @@ class Test_TC_CC_7_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110395,14 +104044,6 @@ class Test_TC_CC_9_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110420,12 +104061,6 @@ class Test_TC_CC_9_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110461,14 +104096,6 @@ class Test_TC_CC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110770,12 +104397,6 @@ class Test_TC_CC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -111256,14 +104877,6 @@ class Test_TC_CC_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -111570,12 +105183,6 @@ class Test_TC_CC_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -112064,14 +105671,6 @@ class Test_TC_CC_9_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -112537,12 +106136,6 @@ class Test_TC_CC_9_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -113301,14 +106894,6 @@ class Test_TC_CC_9_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -113518,12 +107103,6 @@ class Test_TC_CC_9_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -113847,14 +107426,6 @@ class Test_TC_CC_9_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114056,12 +107627,6 @@ class Test_TC_CC_9_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -114376,14 +107941,6 @@ class Test_TC_DRLK_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114401,12 +107958,6 @@ class Test_TC_DRLK_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114445,14 +107996,6 @@ class Test_TC_DRLK_2_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114470,12 +108013,6 @@ class Test_TC_DRLK_2_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114514,14 +108051,6 @@ class Test_TC_DRLK_2_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114539,12 +108068,6 @@ class Test_TC_DRLK_2_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114583,14 +108106,6 @@ class Test_TC_DRLK_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114608,12 +108123,6 @@ class Test_TC_DRLK_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114652,14 +108161,6 @@ class Test_TC_DRLK_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114677,12 +108178,6 @@ class Test_TC_DRLK_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114721,14 +108216,6 @@ class Test_TC_DRLK_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114746,12 +108233,6 @@ class Test_TC_DRLK_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114790,14 +108271,6 @@ class Test_TC_LCFG_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114815,12 +108288,6 @@ class Test_TC_LCFG_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114859,14 +108326,6 @@ class Test_TC_LVL_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114884,12 +108343,6 @@ class Test_TC_LVL_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114928,14 +108381,6 @@ class Test_TC_LVL_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114953,12 +108398,6 @@ class Test_TC_LVL_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114997,14 +108436,6 @@ class Test_TC_LVL_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -115022,12 +108453,6 @@ class Test_TC_LVL_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -115063,14 +108488,6 @@ class Test_TC_OO_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -115902,12 +109319,6 @@ class Test_TC_OO_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -116911,14 +110322,6 @@ class Test_TC_OO_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -116936,12 +110339,6 @@ class Test_TC_OO_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -116980,14 +110377,6 @@ class Test_TC_OO_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117005,12 +110394,6 @@ class Test_TC_OO_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117051,14 +110434,6 @@ class Test_TC_RH_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117124,12 +110499,6 @@ class Test_TC_RH_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -117210,14 +110579,6 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117235,12 +110596,6 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117279,14 +110634,6 @@ class Test_TC_SWTCH_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117304,12 +110651,6 @@ class Test_TC_SWTCH_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117350,14 +110691,6 @@ class Test_TC_TMP_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117425,12 +110758,6 @@ class Test_TC_TMP_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -117511,14 +110838,6 @@ class Test_TC_TMP_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117536,12 +110855,6 @@ class Test_TC_TMP_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117580,14 +110893,6 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117605,12 +110910,6 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117649,14 +110948,6 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117674,12 +110965,6 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117718,14 +111003,6 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117743,12 +111020,6 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117788,14 +111059,6 @@ class Test_TC_DGTHREAD_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117813,12 +111076,6 @@ class Test_TC_DGTHREAD_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117858,14 +111115,6 @@ class Test_TC_DGTHREAD_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117883,12 +111132,6 @@ class Test_TC_DGTHREAD_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117928,14 +111171,6 @@ class Test_TC_DGTHREAD_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117953,12 +111188,6 @@ class Test_TC_DGTHREAD_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117998,14 +111227,6 @@ class Test_TC_DGTHREAD_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118023,12 +111244,6 @@ class Test_TC_DGTHREAD_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118068,14 +111283,6 @@ class Test_TC_DGTHREAD_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118093,12 +111300,6 @@ class Test_TC_DGTHREAD_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118138,14 +111339,6 @@ class Test_TC_DGTHREAD_3_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118163,12 +111356,6 @@ class Test_TC_DGTHREAD_3_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118207,14 +111394,6 @@ class Test_TC_ACT_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118232,12 +111411,6 @@ class Test_TC_ACT_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118276,14 +111449,6 @@ class Test_TC_ACT_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118301,12 +111466,6 @@ class Test_TC_ACT_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118345,14 +111504,6 @@ class Test_TC_ACT_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118370,12 +111521,6 @@ class Test_TC_ACT_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118414,14 +111559,6 @@ class Test_TC_LTIME_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118439,12 +111576,6 @@ class Test_TC_LTIME_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118483,14 +111614,6 @@ class Test_TC_LTIME_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118508,12 +111631,6 @@ class Test_TC_LTIME_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118552,14 +111669,6 @@ class Test_TC_BIND_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118577,12 +111686,6 @@ class Test_TC_BIND_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118621,14 +111724,6 @@ class Test_TC_BIND_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118646,12 +111741,6 @@ class Test_TC_BIND_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118690,14 +111779,6 @@ class Test_TC_BIND_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118715,12 +111796,6 @@ class Test_TC_BIND_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118759,14 +111834,6 @@ class Test_TC_S_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118784,12 +111851,6 @@ class Test_TC_S_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118828,14 +111889,6 @@ class Test_TC_S_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118853,12 +111906,6 @@ class Test_TC_S_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118897,14 +111944,6 @@ class Test_TC_S_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118922,12 +111961,6 @@ class Test_TC_S_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118966,14 +111999,6 @@ class Test_TC_S_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118991,12 +112016,6 @@ class Test_TC_S_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119035,14 +112054,6 @@ class Test_TC_S_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119060,12 +112071,6 @@ class Test_TC_S_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119104,14 +112109,6 @@ class Test_TC_PCC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119129,12 +112126,6 @@ class Test_TC_PCC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119173,14 +112164,6 @@ class Test_TC_ACL_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119198,12 +112181,6 @@ class Test_TC_ACL_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119242,14 +112219,6 @@ class Test_TC_ACL_2_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119267,12 +112236,6 @@ class Test_TC_ACL_2_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119312,14 +112275,6 @@ class Test_TC_BRBINFO_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119337,12 +112292,6 @@ class Test_TC_BRBINFO_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119382,14 +112331,6 @@ class Test_TC_BRBINFO_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119407,12 +112348,6 @@ class Test_TC_BRBINFO_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119451,14 +112386,6 @@ class Test_TC_ACE_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119476,12 +112403,6 @@ class Test_TC_ACE_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index aacdf5da47674e..099b9d79b378d1 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -271,17 +271,10 @@ class TestAccessControlCluster : public TestCommandBridge { ~TestAccessControlCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestAccessControlCluster\n"); @@ -511,7 +504,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -657,7 +649,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1046,7 +1037,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1091,7 +1081,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1138,7 +1127,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1180,7 +1168,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1217,7 +1204,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1259,7 +1245,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1296,7 +1281,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1342,7 +1326,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1379,7 +1362,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1429,7 +1411,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1466,7 +1447,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1531,7 +1511,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1568,7 +1547,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1713,7 +1691,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1750,7 +1727,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1931,7 +1907,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2320,7 +2295,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2352,7 +2326,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2389,7 +2362,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2410,7 +2382,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2431,7 +2402,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2465,17 +2435,10 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { ~Test_TC_ACL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACL_1_1\n"); @@ -2590,7 +2553,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2615,7 +2577,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2640,7 +2601,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2670,7 +2630,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2692,7 +2651,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2717,7 +2675,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2755,17 +2712,10 @@ class Test_TC_ACL_2_1 : public TestCommandBridge { ~Test_TC_ACL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACL_2_1\n"); @@ -2867,7 +2817,6 @@ class Test_TC_ACL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2890,7 +2839,6 @@ class Test_TC_ACL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2913,7 +2861,6 @@ class Test_TC_ACL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2949,17 +2896,10 @@ class Test_TC_ACL_2_2 : public TestCommandBridge { ~Test_TC_ACL_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACL_2_2\n"); @@ -3048,7 +2988,6 @@ class Test_TC_ACL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3104,17 +3043,10 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { ~Test_TC_ACL_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACL_2_3\n"); @@ -3443,7 +3375,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -3468,7 +3399,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3497,7 +3427,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3531,7 +3460,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3570,7 +3498,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3611,7 +3538,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3657,7 +3583,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3702,7 +3627,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3751,7 +3675,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3801,7 +3724,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3840,7 +3762,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3885,7 +3806,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3930,7 +3850,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3975,7 +3894,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4020,7 +3938,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4059,7 +3976,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4110,7 +4026,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4148,7 +4063,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4175,7 +4089,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4216,17 +4129,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ~Test_TC_ACE_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACE_1_1\n"); @@ -4250,172 +4156,176 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { err = TestWaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : TP2 - Write ACL giving admin privilege on all EP0\n"); - err = TestTp2WriteAclGivingAdminPrivilegeOnAllEp0_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Read the commissioner node ID\n"); + err = TestReadTheCommissionerNodeId_1(); break; case 2: - ChipLogProgress(chipTool, - " ***** Test Step 2 : TP3 - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp3ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : TP2 - Write ACL giving admin privilege on all EP0\n"); + err = TestTp2WriteAclGivingAdminPrivilegeOnAllEp0_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : TP4 - Write the location attribute (Basic - requires administer)\n"); - err = TestTp4WriteTheLocationAttributeBasicRequiresAdminister_3(); + ChipLogProgress(chipTool, + " ***** Test Step 3 : TP3 - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp3ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_3(); break; case 4: - ChipLogProgress(chipTool, - " ***** Test Step 4 : TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp5SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : TP4 - Write the location attribute (Basic - requires administer)\n"); + err = TestTp4WriteTheLocationAttributeBasicRequiresAdminister_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : TP6 - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp6WriteNodeLabelAttributeBasicRequiresManage_5(); + ChipLogProgress(chipTool, + " ***** Test Step 5 : TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp5SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TP7 - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp7SendTestEventTriggerGeneralDiagnosticsRequiresManage_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : TP6 - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp6WriteNodeLabelAttributeBasicRequiresManage_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : TP8 - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp8TeadTheVendorIDAttributeBasicRequiresView_7(); + ChipLogProgress(chipTool, " ***** Test Step 7 : TP7 - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp7SendTestEventTriggerGeneralDiagnosticsRequiresManage_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0\n"); - err = TestTp9WriteAclGivingAdminPrivilegeAclManageForRestOfEp0_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : TP8 - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp8TeadTheVendorIDAttributeBasicRequiresView_8(); break; case 9: - ChipLogProgress(chipTool, - " ***** Test Step 9 : TP10 - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp10ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0\n"); + err = TestTp9WriteAclGivingAdminPrivilegeAclManageForRestOfEp0_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : TP11 - Write the location attribute (Basic - requires administer)\n"); - err = TestTp11WriteTheLocationAttributeBasicRequiresAdminister_10(); + ChipLogProgress(chipTool, + " ***** Test Step 10 : TP10 - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp10ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_10(); break; case 11: - ChipLogProgress(chipTool, - " ***** Test Step 11 : TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp12SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : TP11 - Write the location attribute (Basic - requires administer)\n"); + err = TestTp11WriteTheLocationAttributeBasicRequiresAdminister_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : TP13(6) - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp136WriteNodeLabelAttributeBasicRequiresManage_12(); + ChipLogProgress(chipTool, + " ***** Test Step 12 : TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp12SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_12(); break; case 13: - ChipLogProgress( - chipTool, " ***** Test Step 13 : TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp137SendTestEventTriggerGeneralDiagnosticsRequiresManage_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : TP13(6) - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp136WriteNodeLabelAttributeBasicRequiresManage_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : TP13(8) - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp138TeadTheVendorIDAttributeBasicRequiresView_14(); + ChipLogProgress( + chipTool, " ***** Test Step 14 : TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp137SendTestEventTriggerGeneralDiagnosticsRequiresManage_14(); break; case 15: - ChipLogProgress( - chipTool, " ***** Test Step 15 : TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0\n"); - err = TestTp14WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : TP13(8) - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp138TeadTheVendorIDAttributeBasicRequiresView_15(); break; case 16: - ChipLogProgress(chipTool, - " ***** Test Step 16 : TP15(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp1510ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_16(); + ChipLogProgress( + chipTool, " ***** Test Step 16 : TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0\n"); + err = TestTp14WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_16(); break; case 17: - ChipLogProgress( - chipTool, " ***** Test Step 17 : TP15(11) - Write the location attribute (Basic - requires administer)\n"); - err = TestTp1511WriteTheLocationAttributeBasicRequiresAdminister_17(); + ChipLogProgress(chipTool, + " ***** Test Step 17 : TP15(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp1510ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_17(); break; case 18: - ChipLogProgress(chipTool, - " ***** Test Step 18 : TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp1512SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_18(); + ChipLogProgress( + chipTool, " ***** Test Step 18 : TP15(11) - Write the location attribute (Basic - requires administer)\n"); + err = TestTp1511WriteTheLocationAttributeBasicRequiresAdminister_18(); break; case 19: - ChipLogProgress(chipTool, " ***** Test Step 19 : TP16 - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp16WriteNodeLabelAttributeBasicRequiresManage_19(); + ChipLogProgress(chipTool, + " ***** Test Step 19 : TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp1512SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_19(); break; case 20: - ChipLogProgress( - chipTool, " ***** Test Step 20 : TP17 - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp17SendTestEventTriggerGeneralDiagnosticsRequiresManage_20(); + ChipLogProgress(chipTool, " ***** Test Step 20 : TP16 - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp16WriteNodeLabelAttributeBasicRequiresManage_20(); break; case 21: - ChipLogProgress(chipTool, " ***** Test Step 21 : TP18(8) - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp188TeadTheVendorIDAttributeBasicRequiresView_21(); + ChipLogProgress( + chipTool, " ***** Test Step 21 : TP17 - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp17SendTestEventTriggerGeneralDiagnosticsRequiresManage_21(); break; case 22: - ChipLogProgress( - chipTool, " ***** Test Step 22 : TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0\n"); - err = TestTp19WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_22(); + ChipLogProgress(chipTool, " ***** Test Step 22 : TP18(8) - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp188TeadTheVendorIDAttributeBasicRequiresView_22(); break; case 23: - ChipLogProgress(chipTool, - " ***** Test Step 23 : TP20(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp2010ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_23(); + ChipLogProgress( + chipTool, " ***** Test Step 23 : TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0\n"); + err = TestTp19WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_23(); break; case 24: - ChipLogProgress( - chipTool, " ***** Test Step 24 : TP20(11) - Write the location attribute (Basic - requires administer)\n"); - err = TestTp2011WriteTheLocationAttributeBasicRequiresAdminister_24(); + ChipLogProgress(chipTool, + " ***** Test Step 24 : TP20(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp2010ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_24(); break; case 25: - ChipLogProgress(chipTool, - " ***** Test Step 25 : TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp2012SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_25(); + ChipLogProgress( + chipTool, " ***** Test Step 25 : TP20(11) - Write the location attribute (Basic - requires administer)\n"); + err = TestTp2011WriteTheLocationAttributeBasicRequiresAdminister_25(); break; case 26: - ChipLogProgress(chipTool, " ***** Test Step 26 : TP21(16) - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp2116WriteNodeLabelAttributeBasicRequiresManage_26(); + ChipLogProgress(chipTool, + " ***** Test Step 26 : TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp2012SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_26(); break; case 27: - ChipLogProgress( - chipTool, " ***** Test Step 27 : TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp2117SendTestEventTriggerGeneralDiagnosticsRequiresManage_27(); + ChipLogProgress(chipTool, " ***** Test Step 27 : TP21(16) - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp2116WriteNodeLabelAttributeBasicRequiresManage_27(); break; case 28: - ChipLogProgress(chipTool, " ***** Test Step 28 : TP22(8) - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp228TeadTheVendorIDAttributeBasicRequiresView_28(); + ChipLogProgress( + chipTool, " ***** Test Step 28 : TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp2117SendTestEventTriggerGeneralDiagnosticsRequiresManage_28(); break; case 29: - ChipLogProgress(chipTool, " ***** Test Step 29 : TP23 - Write ACL giving only admin privilege ACL cluster\n"); - err = TestTp23WriteAclGivingOnlyAdminPrivilegeAclCluster_29(); + ChipLogProgress(chipTool, " ***** Test Step 29 : TP22(8) - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp228TeadTheVendorIDAttributeBasicRequiresView_29(); break; case 30: - ChipLogProgress(chipTool, - " ***** Test Step 30 : TP24(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp2410ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_30(); + ChipLogProgress(chipTool, " ***** Test Step 30 : TP23 - Write ACL giving only admin privilege ACL cluster\n"); + err = TestTp23WriteAclGivingOnlyAdminPrivilegeAclCluster_30(); break; case 31: - ChipLogProgress( - chipTool, " ***** Test Step 31 : TP24(11) - Write the location attribute (Basic - requires administer)\n"); - err = TestTp2411WriteTheLocationAttributeBasicRequiresAdminister_31(); + ChipLogProgress(chipTool, + " ***** Test Step 31 : TP24(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp2410ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_31(); break; case 32: - ChipLogProgress(chipTool, - " ***** Test Step 32 : TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp2412SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_32(); + ChipLogProgress( + chipTool, " ***** Test Step 32 : TP24(11) - Write the location attribute (Basic - requires administer)\n"); + err = TestTp2411WriteTheLocationAttributeBasicRequiresAdminister_32(); break; case 33: - ChipLogProgress(chipTool, " ***** Test Step 33 : TP25(16) - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp2516WriteNodeLabelAttributeBasicRequiresManage_33(); + ChipLogProgress(chipTool, + " ***** Test Step 33 : TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp2412SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_33(); break; case 34: - ChipLogProgress( - chipTool, " ***** Test Step 34 : TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp2517SendTestEventTriggerGeneralDiagnosticsRequiresManage_34(); + ChipLogProgress(chipTool, " ***** Test Step 34 : TP25(16) - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp2516WriteNodeLabelAttributeBasicRequiresManage_34(); break; case 35: - ChipLogProgress(chipTool, " ***** Test Step 35 : TP26 - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp26TeadTheVendorIDAttributeBasicRequiresView_35(); + ChipLogProgress( + chipTool, " ***** Test Step 35 : TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp2517SendTestEventTriggerGeneralDiagnosticsRequiresManage_35(); break; case 36: - ChipLogProgress(chipTool, " ***** Test Step 36 : TP27 - Write ACL to restore full access\n"); - err = TestTp27WriteAclToRestoreFullAccess_36(); + ChipLogProgress(chipTool, " ***** Test Step 36 : TP26 - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp26TeadTheVendorIDAttributeBasicRequiresView_36(); + break; + case 37: + ChipLogProgress(chipTool, " ***** Test Step 37 : TP27 - Write ACL to restore full access\n"); + err = TestTp27WriteAclToRestoreFullAccess_37(); break; } @@ -4447,16 +4357,16 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 6: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 7: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); break; case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 9: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -4465,19 +4375,19 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 13: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 14: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); break; case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 16: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -4492,13 +4402,13 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 21: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 23: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -4513,13 +4423,13 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 28: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 30: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -4537,6 +4447,9 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 36: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + break; + case 37: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; } @@ -4552,7 +4465,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 37; + const uint16_t mTestCount = 38; chip::Optional mNodeId; chip::Optional mCluster; @@ -4566,12 +4479,24 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } + NSNumber * _Nonnull commissionerNodeId; + + CHIP_ERROR TestReadTheCommissionerNodeId_1() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeId = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } - CHIP_ERROR TestTp2WriteAclGivingAdminPrivilegeOnAllEp0_1() + CHIP_ERROR TestTp2WriteAclGivingAdminPrivilegeOnAllEp0_2() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4583,7 +4508,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -4611,11 +4536,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp3ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_2() + CHIP_ERROR TestTp3ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_3() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4640,11 +4564,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp4WriteTheLocationAttributeBasicRequiresAdminister_3() + CHIP_ERROR TestTp4WriteTheLocationAttributeBasicRequiresAdminister_4() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4662,11 +4585,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp5SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_4() + CHIP_ERROR TestTp5SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_5() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4689,11 +4611,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp6WriteNodeLabelAttributeBasicRequiresManage_5() + CHIP_ERROR TestTp6WriteNodeLabelAttributeBasicRequiresManage_6() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4711,11 +4632,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp7SendTestEventTriggerGeneralDiagnosticsRequiresManage_6() + CHIP_ERROR TestTp7SendTestEventTriggerGeneralDiagnosticsRequiresManage_7() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4739,11 +4659,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp8TeadTheVendorIDAttributeBasicRequiresView_7() + CHIP_ERROR TestTp8TeadTheVendorIDAttributeBasicRequiresView_8() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4758,11 +4677,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp9WriteAclGivingAdminPrivilegeAclManageForRestOfEp0_8() + CHIP_ERROR TestTp9WriteAclGivingAdminPrivilegeAclManageForRestOfEp0_9() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4774,7 +4692,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -4793,7 +4711,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = temp_3; } { @@ -4821,11 +4739,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp10ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_9() + CHIP_ERROR TestTp10ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_10() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4850,11 +4767,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp11WriteTheLocationAttributeBasicRequiresAdminister_10() + CHIP_ERROR TestTp11WriteTheLocationAttributeBasicRequiresAdminister_11() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4876,11 +4792,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp12SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_11() + CHIP_ERROR TestTp12SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_12() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4906,11 +4821,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp136WriteNodeLabelAttributeBasicRequiresManage_12() + CHIP_ERROR TestTp136WriteNodeLabelAttributeBasicRequiresManage_13() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4928,11 +4842,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp137SendTestEventTriggerGeneralDiagnosticsRequiresManage_13() + CHIP_ERROR TestTp137SendTestEventTriggerGeneralDiagnosticsRequiresManage_14() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4957,11 +4870,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp138TeadTheVendorIDAttributeBasicRequiresView_14() + CHIP_ERROR TestTp138TeadTheVendorIDAttributeBasicRequiresView_15() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4976,11 +4888,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp14WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_15() + CHIP_ERROR TestTp14WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_16() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4992,7 +4903,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -5011,7 +4922,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = temp_3; } { @@ -5039,11 +4950,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp1510ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_16() + CHIP_ERROR TestTp1510ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_17() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5068,11 +4978,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp1511WriteTheLocationAttributeBasicRequiresAdminister_17() + CHIP_ERROR TestTp1511WriteTheLocationAttributeBasicRequiresAdminister_18() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5094,11 +5003,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp1512SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_18() + CHIP_ERROR TestTp1512SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_19() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5124,11 +5032,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp16WriteNodeLabelAttributeBasicRequiresManage_19() + CHIP_ERROR TestTp16WriteNodeLabelAttributeBasicRequiresManage_20() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5150,11 +5057,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp17SendTestEventTriggerGeneralDiagnosticsRequiresManage_20() + CHIP_ERROR TestTp17SendTestEventTriggerGeneralDiagnosticsRequiresManage_21() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5178,11 +5084,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp188TeadTheVendorIDAttributeBasicRequiresView_21() + CHIP_ERROR TestTp188TeadTheVendorIDAttributeBasicRequiresView_22() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5197,11 +5102,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp19WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_22() + CHIP_ERROR TestTp19WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_23() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5213,7 +5117,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -5232,7 +5136,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = temp_3; } { @@ -5260,11 +5164,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2010ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_23() + CHIP_ERROR TestTp2010ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_24() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5289,11 +5192,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2011WriteTheLocationAttributeBasicRequiresAdminister_24() + CHIP_ERROR TestTp2011WriteTheLocationAttributeBasicRequiresAdminister_25() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5315,11 +5217,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2012SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_25() + CHIP_ERROR TestTp2012SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_26() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5345,11 +5246,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2116WriteNodeLabelAttributeBasicRequiresManage_26() + CHIP_ERROR TestTp2116WriteNodeLabelAttributeBasicRequiresManage_27() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5371,11 +5271,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2117SendTestEventTriggerGeneralDiagnosticsRequiresManage_27() + CHIP_ERROR TestTp2117SendTestEventTriggerGeneralDiagnosticsRequiresManage_28() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5400,11 +5299,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp228TeadTheVendorIDAttributeBasicRequiresView_28() + CHIP_ERROR TestTp228TeadTheVendorIDAttributeBasicRequiresView_29() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5419,11 +5317,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp23WriteAclGivingOnlyAdminPrivilegeAclCluster_29() + CHIP_ERROR TestTp23WriteAclGivingOnlyAdminPrivilegeAclCluster_30() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5435,7 +5332,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -5463,11 +5360,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2410ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_30() + CHIP_ERROR TestTp2410ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_31() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5492,11 +5388,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2411WriteTheLocationAttributeBasicRequiresAdminister_31() + CHIP_ERROR TestTp2411WriteTheLocationAttributeBasicRequiresAdminister_32() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5518,11 +5413,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2412SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_32() + CHIP_ERROR TestTp2412SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_33() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5548,11 +5442,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2516WriteNodeLabelAttributeBasicRequiresManage_33() + CHIP_ERROR TestTp2516WriteNodeLabelAttributeBasicRequiresManage_34() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5574,11 +5467,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2517SendTestEventTriggerGeneralDiagnosticsRequiresManage_34() + CHIP_ERROR TestTp2517SendTestEventTriggerGeneralDiagnosticsRequiresManage_35() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5603,11 +5495,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp26TeadTheVendorIDAttributeBasicRequiresView_35() + CHIP_ERROR TestTp26TeadTheVendorIDAttributeBasicRequiresView_36() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5623,11 +5514,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp27WriteAclToRestoreFullAccess_36() + CHIP_ERROR TestTp27WriteAclToRestoreFullAccess_37() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5639,7 +5529,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -5677,17 +5567,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { ~Test_TC_ACE_1_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACE_1_5\n"); @@ -5731,36 +5614,44 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { err = TestTh2ReadsTheFabricIndex_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TH1 writes ACL giving view privilege for descriptor cluster\n"); - err = TestTh1WritesAclGivingViewPrivilegeForDescriptorCluster_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : Read the commissioner node ID from the alpha fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheAlphaFabric_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : TH2 writes ACL giving view privilge for basic cluster\n"); - err = TestTh2WritesAclGivingViewPrivilgeForBasicCluster_7(); + ChipLogProgress(chipTool, " ***** Test Step 7 : TH1 writes ACL giving view privilege for descriptor cluster\n"); + err = TestTh1WritesAclGivingViewPrivilegeForDescriptorCluster_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : TH1 reads descriptor cluster - expect SUCCESS\n"); - err = TestTh1ReadsDescriptorClusterExpectSuccess_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : Read the commissioner node ID from the beta fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheBetaFabric_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : TH1 reads basic cluster - expect UNSUPPORTED_ACCESS\n"); - err = TestTh1ReadsBasicClusterExpectUnsupportedAccess_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : TH2 writes ACL giving view privilge for basic cluster\n"); + err = TestTh2WritesAclGivingViewPrivilgeForBasicCluster_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS\n"); - err = TestTh2ReadsDescriptorClusterExpectUnsupportedAccess_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : TH1 reads descriptor cluster - expect SUCCESS\n"); + err = TestTh1ReadsDescriptorClusterExpectSuccess_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : TH2 reads basic cluster - expect SUCCESS\n"); - err = TestTh2ReadsBasicClusterExpectSuccess_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : TH1 reads basic cluster - expect UNSUPPORTED_ACCESS\n"); + err = TestTh1ReadsBasicClusterExpectUnsupportedAccess_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : TH1 resets ACL to default\n"); - err = TestTh1ResetsAclToDefault_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS\n"); + err = TestTh2ReadsDescriptorClusterExpectUnsupportedAccess_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : TH1 sends RemoveFabric command for TH2\n"); - err = TestTh1SendsRemoveFabricCommandForTh2_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : TH2 reads basic cluster - expect SUCCESS\n"); + err = TestTh2ReadsBasicClusterExpectSuccess_13(); + break; + case 14: + ChipLogProgress(chipTool, " ***** Test Step 14 : TH1 resets ACL to default\n"); + err = TestTh1ResetsAclToDefault_14(); + break; + case 15: + ChipLogProgress(chipTool, " ***** Test Step 15 : TH1 sends RemoveFabric command for TH2\n"); + err = TestTh1SendsRemoveFabricCommandForTh2_15(); break; } @@ -5801,20 +5692,26 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 9: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 10: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 11: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 14: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 15: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -5828,7 +5725,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 14; + const uint16_t mTestCount = 16; chip::Optional mNodeId; chip::Optional mCluster; @@ -5849,7 +5746,6 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5874,7 +5770,6 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5916,7 +5811,6 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5936,12 +5830,24 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdAlpha; - CHIP_ERROR TestTh1WritesAclGivingViewPrivilegeForDescriptorCluster_6() + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheAlphaFabric_6() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdAlpha = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } + + CHIP_ERROR TestTh1WritesAclGivingViewPrivilegeForDescriptorCluster_7() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5953,7 +5859,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdAlpha copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -5995,12 +5901,24 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdBeta; + + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheBetaFabric_8() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("beta", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdBeta = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } - CHIP_ERROR TestTh2WritesAclGivingViewPrivilgeForBasicCluster_7() + CHIP_ERROR TestTh2WritesAclGivingViewPrivilgeForBasicCluster_9() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6012,7 +5930,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdBeta copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -6055,11 +5973,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh1ReadsDescriptorClusterExpectSuccess_8() + CHIP_ERROR TestTh1ReadsDescriptorClusterExpectSuccess_10() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6074,11 +5991,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh1ReadsBasicClusterExpectUnsupportedAccess_9() + CHIP_ERROR TestTh1ReadsBasicClusterExpectUnsupportedAccess_11() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6094,11 +6010,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh2ReadsDescriptorClusterExpectUnsupportedAccess_10() + CHIP_ERROR TestTh2ReadsDescriptorClusterExpectUnsupportedAccess_12() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6114,11 +6029,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh2ReadsBasicClusterExpectSuccess_11() + CHIP_ERROR TestTh2ReadsBasicClusterExpectSuccess_13() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6133,11 +6047,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh1ResetsAclToDefault_12() + CHIP_ERROR TestTh1ResetsAclToDefault_14() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6149,7 +6062,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdAlpha copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -6169,11 +6082,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh1SendsRemoveFabricCommandForTh2_13() + CHIP_ERROR TestTh1SendsRemoveFabricCommandForTh2_15() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -6211,17 +6123,10 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { ~Test_TC_BOOL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BOOL_1_1\n"); @@ -6325,7 +6230,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6350,7 +6254,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6375,7 +6278,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6402,7 +6304,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6427,7 +6328,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6465,17 +6365,10 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge { ~Test_TC_BOOL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BOOL_2_1\n"); @@ -6555,7 +6448,6 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6588,17 +6480,10 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { ~Test_TC_BRBINFO_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BRBINFO_1_1\n"); @@ -6857,7 +6742,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6884,7 +6768,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6911,7 +6794,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6940,7 +6822,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6964,7 +6845,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6988,7 +6868,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7012,7 +6891,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7036,7 +6914,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7060,7 +6937,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7084,7 +6960,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7108,7 +6983,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7132,7 +7006,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7156,7 +7029,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7180,7 +7052,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7204,7 +7075,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7228,7 +7098,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7252,7 +7121,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7276,7 +7144,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7303,7 +7170,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7343,17 +7209,10 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { ~Test_TC_ACT_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACT_1_1\n"); @@ -7468,7 +7327,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7493,7 +7351,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7518,7 +7375,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7546,7 +7402,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7568,7 +7423,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7589,7 +7443,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7627,17 +7480,10 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { ~Test_TC_BIND_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BIND_1_1\n"); @@ -7741,7 +7587,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7766,7 +7611,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7791,7 +7635,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7818,7 +7661,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7843,7 +7685,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7881,17 +7722,10 @@ class Test_TC_CC_1_1 : public TestCommandBridge { ~Test_TC_CC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_1_1\n"); @@ -8467,7 +8301,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8492,7 +8325,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8517,7 +8349,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8537,7 +8368,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8557,7 +8387,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8577,7 +8406,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8597,7 +8425,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8617,7 +8444,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8647,7 +8473,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8669,7 +8494,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8691,7 +8515,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8713,7 +8536,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8735,7 +8557,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8757,7 +8578,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8779,7 +8599,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8801,7 +8620,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8823,7 +8641,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8845,7 +8662,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8867,7 +8683,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8889,7 +8704,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8911,7 +8725,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8933,7 +8746,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8955,7 +8767,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8977,7 +8788,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8999,7 +8809,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9021,7 +8830,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9043,7 +8851,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9065,7 +8872,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9087,7 +8893,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9109,7 +8914,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9131,7 +8935,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9153,7 +8956,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9175,7 +8977,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9197,7 +8998,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9219,7 +9019,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9241,7 +9040,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9263,7 +9061,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9285,7 +9082,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9307,7 +9103,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9329,7 +9124,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9351,7 +9145,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9373,7 +9166,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9395,7 +9187,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9417,7 +9208,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9439,7 +9229,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9461,7 +9250,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9499,17 +9287,10 @@ class Test_TC_CC_2_1 : public TestCommandBridge { ~Test_TC_CC_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_2_1\n"); @@ -10194,7 +9975,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10217,7 +9997,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10240,7 +10019,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10263,7 +10041,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10286,7 +10063,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10309,7 +10085,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10332,7 +10107,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10353,7 +10127,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10376,7 +10149,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10399,7 +10171,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10422,7 +10193,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10445,7 +10215,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10468,7 +10237,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10491,7 +10259,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10514,7 +10281,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10537,7 +10303,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10560,7 +10325,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10584,7 +10348,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10607,7 +10370,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10635,7 +10397,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10658,7 +10419,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10681,7 +10441,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10705,7 +10464,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10732,7 +10490,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10956,7 +10713,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10979,7 +10735,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11002,7 +10757,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11025,7 +10779,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11048,7 +10801,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11074,7 +10826,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11097,7 +10848,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11120,7 +10870,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11146,7 +10895,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11169,7 +10917,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11192,7 +10939,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11231,17 +10977,10 @@ class Test_TC_CC_3_2 : public TestCommandBridge { ~Test_TC_CC_3_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_3_2\n"); @@ -11648,7 +11387,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11670,7 +11408,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11689,7 +11426,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11725,7 +11461,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11758,7 +11493,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11788,7 +11522,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11818,7 +11551,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11843,7 +11575,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11873,7 +11604,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11895,7 +11625,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11931,7 +11660,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11964,7 +11692,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11994,7 +11721,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12024,7 +11750,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12049,7 +11774,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12079,7 +11803,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12101,7 +11824,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12128,7 +11850,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12155,7 +11876,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12174,7 +11894,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12211,17 +11930,10 @@ class Test_TC_CC_3_3 : public TestCommandBridge { ~Test_TC_CC_3_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_3_3\n"); @@ -12562,7 +12274,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12584,7 +12295,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12603,7 +12313,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12639,7 +12348,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12675,7 +12383,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12705,7 +12412,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12735,7 +12441,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12757,7 +12462,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12793,7 +12497,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12829,7 +12532,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12859,7 +12561,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12889,7 +12590,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12911,7 +12611,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12938,7 +12637,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12965,7 +12663,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12984,7 +12681,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13022,17 +12718,10 @@ class Test_TC_CC_4_1 : public TestCommandBridge { ~Test_TC_CC_4_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_4_1\n"); @@ -13292,7 +12981,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13314,7 +13002,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13333,7 +13020,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13368,7 +13054,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13403,7 +13088,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13433,7 +13117,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13463,7 +13146,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13493,7 +13175,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13515,7 +13196,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13542,7 +13222,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13569,7 +13248,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13588,7 +13266,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13625,17 +13302,10 @@ class Test_TC_CC_4_2 : public TestCommandBridge { ~Test_TC_CC_4_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_4_2\n"); @@ -14077,7 +13747,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14099,7 +13768,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14118,7 +13786,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14153,7 +13820,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14189,7 +13855,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14219,7 +13884,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14249,7 +13913,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14271,7 +13934,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14306,7 +13968,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14341,7 +14002,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14371,7 +14031,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14401,7 +14060,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14423,7 +14081,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14458,7 +14115,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14494,7 +14150,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14516,7 +14171,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14543,7 +14197,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14573,7 +14226,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14595,7 +14247,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14622,7 +14273,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14649,7 +14299,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14668,7 +14317,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14705,17 +14353,10 @@ class Test_TC_CC_4_3 : public TestCommandBridge { ~Test_TC_CC_4_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_4_3\n"); @@ -15126,7 +14767,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15148,7 +14788,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15167,7 +14806,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15202,7 +14840,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15238,7 +14875,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15268,7 +14904,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15298,7 +14933,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15320,7 +14954,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15356,7 +14989,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15378,7 +15010,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15413,7 +15044,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15449,7 +15079,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15479,7 +15108,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15509,7 +15137,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15531,7 +15158,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15567,7 +15193,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15591,7 +15216,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15618,7 +15242,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15645,7 +15268,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15664,7 +15286,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15701,17 +15322,10 @@ class Test_TC_CC_4_4 : public TestCommandBridge { ~Test_TC_CC_4_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_4_4\n"); @@ -16004,7 +15618,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16026,7 +15639,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16045,7 +15657,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16081,7 +15692,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16103,7 +15713,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16125,7 +15734,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16161,7 +15769,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16183,7 +15790,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16213,7 +15819,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16235,7 +15840,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16266,7 +15870,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16288,7 +15891,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16310,7 +15912,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16337,7 +15938,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16364,7 +15964,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16383,7 +15982,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16420,17 +16018,10 @@ class Test_TC_CC_5_1 : public TestCommandBridge { ~Test_TC_CC_5_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_5_1\n"); @@ -17157,7 +16748,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17179,7 +16769,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17198,7 +16787,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17234,7 +16822,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17256,7 +16843,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17278,7 +16864,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17314,7 +16899,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17336,7 +16920,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17366,7 +16949,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17388,7 +16970,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17418,7 +16999,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17440,7 +17020,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17462,7 +17041,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17484,7 +17062,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17508,7 +17085,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17527,7 +17103,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17563,7 +17138,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17585,7 +17159,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17607,7 +17180,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17626,7 +17198,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17662,7 +17233,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17686,7 +17256,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17710,7 +17279,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17746,7 +17314,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17770,7 +17337,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17794,7 +17360,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17830,7 +17395,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17852,7 +17416,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17874,7 +17437,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17896,7 +17458,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17920,7 +17481,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17939,7 +17499,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17975,7 +17534,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17997,7 +17555,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18019,7 +17576,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18038,7 +17594,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18074,7 +17629,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18096,7 +17650,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18118,7 +17671,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18154,7 +17706,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18178,7 +17729,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18202,7 +17752,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18238,7 +17787,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18260,7 +17808,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18282,7 +17829,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18309,7 +17855,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18349,17 +17894,10 @@ class Test_TC_CC_5_2 : public TestCommandBridge { ~Test_TC_CC_5_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_5_2\n"); @@ -18661,7 +18199,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18683,7 +18220,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18702,7 +18238,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18738,7 +18273,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18771,7 +18305,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18793,7 +18326,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18823,7 +18355,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18845,7 +18376,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18876,7 +18406,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18902,7 +18431,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18927,7 +18455,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18950,7 +18477,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18972,7 +18498,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18994,7 +18519,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19021,7 +18545,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19048,7 +18571,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19067,7 +18589,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19104,17 +18625,10 @@ class Test_TC_CC_5_3 : public TestCommandBridge { ~Test_TC_CC_5_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_5_3\n"); @@ -19385,7 +18899,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19407,7 +18920,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19426,7 +18938,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19462,7 +18973,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19498,7 +19008,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19520,7 +19029,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19550,7 +19058,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19572,7 +19079,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19602,7 +19108,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19624,7 +19129,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19646,7 +19150,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19673,7 +19176,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19700,7 +19202,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19719,7 +19220,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19756,17 +19256,10 @@ class Test_TC_CC_6_1 : public TestCommandBridge { ~Test_TC_CC_6_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_6_1\n"); @@ -20059,7 +19552,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20081,7 +19573,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20101,7 +19592,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20128,7 +19618,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20154,7 +19643,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20179,7 +19667,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20214,7 +19701,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20249,7 +19735,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20279,7 +19764,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20309,7 +19793,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20339,7 +19822,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20361,7 +19843,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20388,7 +19869,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20415,7 +19895,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20434,7 +19913,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20471,17 +19949,10 @@ class Test_TC_CC_7_3 : public TestCommandBridge { ~Test_TC_CC_7_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_7_3\n"); @@ -20866,7 +20337,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20888,7 +20358,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20908,7 +20377,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20944,7 +20412,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20980,7 +20447,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21010,7 +20476,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21040,7 +20505,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21070,7 +20534,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21093,7 +20556,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21129,7 +20591,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21165,7 +20626,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21195,7 +20655,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21225,7 +20684,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21255,7 +20713,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21277,7 +20734,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21304,7 +20760,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21331,7 +20786,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21350,7 +20804,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21387,17 +20840,10 @@ class Test_TC_CC_7_4 : public TestCommandBridge { ~Test_TC_CC_7_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_7_4\n"); @@ -21690,7 +21136,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21712,7 +21157,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21732,7 +21176,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21770,7 +21213,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21792,7 +21234,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21814,7 +21255,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21850,7 +21290,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21873,7 +21312,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21903,7 +21341,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21926,7 +21363,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21956,7 +21392,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21980,7 +21415,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22004,7 +21438,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22031,7 +21464,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22058,7 +21490,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22077,7 +21508,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22114,17 +21544,10 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { ~Test_TC_OPCREDS_1_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OPCREDS_1_2\n"); @@ -22228,7 +21651,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22255,7 +21677,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22282,7 +21703,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22316,7 +21736,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22347,7 +21766,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22387,17 +21805,10 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { ~Test_TC_BINFO_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BINFO_1_1\n"); @@ -22589,7 +22000,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22614,7 +22024,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22639,7 +22048,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22677,7 +22085,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22699,7 +22106,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22721,7 +22127,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22743,7 +22148,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22765,7 +22169,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22787,7 +22190,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22809,7 +22211,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22831,7 +22232,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22853,7 +22253,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22878,7 +22277,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22916,17 +22314,10 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { ~Test_TC_CNET_1_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CNET_1_3\n"); @@ -23164,7 +22555,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23191,7 +22581,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23217,7 +22606,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23243,7 +22631,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23269,7 +22656,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23295,7 +22681,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23323,7 +22708,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23353,7 +22737,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23377,7 +22760,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23401,7 +22783,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23429,7 +22810,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23453,7 +22833,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23477,7 +22856,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23503,7 +22881,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23531,7 +22908,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23571,17 +22947,10 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { ~Test_TC_DESC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DESC_1_1\n"); @@ -23685,7 +23054,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23710,7 +23078,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23735,7 +23102,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23765,7 +23131,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23790,7 +23155,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23828,17 +23192,10 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { ~Test_TC_DLOG_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DLOG_1_1\n"); @@ -23942,7 +23299,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23967,7 +23323,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23992,7 +23347,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -24018,7 +23372,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -24044,7 +23397,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -24083,17 +23435,10 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { ~Test_TC_DGETH_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGETH_1_1\n"); @@ -24347,7 +23692,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24374,7 +23718,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24401,7 +23744,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24423,7 +23765,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24445,7 +23786,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24473,7 +23813,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24497,7 +23836,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24521,7 +23859,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24547,7 +23884,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24573,7 +23909,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24599,7 +23934,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24625,7 +23959,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24651,7 +23984,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24675,7 +24007,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24699,7 +24030,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24723,7 +24053,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24750,7 +24079,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24790,17 +24118,10 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { ~Test_TC_DGETH_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGETH_2_1\n"); @@ -25059,7 +24380,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25087,7 +24407,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25113,7 +24432,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25145,7 +24463,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25177,7 +24494,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25210,7 +24526,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25243,7 +24558,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25276,7 +24590,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25313,7 +24626,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25358,17 +24670,10 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { ~Test_TC_DGETH_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGETH_2_2\n"); @@ -25668,7 +24973,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25696,7 +25000,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25724,7 +25027,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25752,7 +25054,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25780,7 +25081,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25808,7 +25108,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25836,7 +25135,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25864,7 +25162,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25892,7 +25189,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25920,7 +25216,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25949,7 +25244,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25975,7 +25269,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26001,7 +25294,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26027,7 +25319,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26053,7 +25344,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26078,7 +25368,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26099,7 +25388,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26122,7 +25410,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26145,7 +25432,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26168,7 +25454,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26191,7 +25476,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26227,17 +25511,10 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { ~Test_TC_FLW_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_FLW_1_1\n"); @@ -26352,7 +25629,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26377,7 +25653,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26402,7 +25677,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26431,7 +25705,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26453,7 +25726,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26478,7 +25750,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26516,17 +25787,10 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { ~Test_TC_FLW_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_FLW_2_1\n"); @@ -26639,7 +25903,6 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26665,7 +25928,6 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26691,7 +25953,6 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26717,7 +25978,6 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26753,17 +26013,10 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { ~Test_TC_FLABEL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_FLABEL_1_1\n"); @@ -26867,7 +26120,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26892,7 +26144,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26917,7 +26168,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26944,7 +26194,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26969,7 +26218,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -27007,17 +26255,10 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { ~Test_TC_CGEN_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CGEN_1_1\n"); @@ -27121,7 +26362,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27148,7 +26388,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27175,7 +26414,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27208,7 +26446,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27234,7 +26471,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27273,17 +26509,10 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { ~Test_TC_CGEN_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CGEN_2_1\n"); @@ -27432,7 +26661,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27454,7 +26682,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27478,7 +26705,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27504,7 +26730,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27528,7 +26753,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27553,7 +26777,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27578,7 +26801,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27613,17 +26835,10 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { ~Test_TC_DGGEN_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGGEN_1_1\n"); @@ -27793,7 +27008,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27820,7 +27034,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27847,7 +27060,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27878,7 +27090,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27902,7 +27113,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27926,7 +27136,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27950,7 +27159,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27974,7 +27182,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27998,7 +27205,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28022,7 +27228,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28046,7 +27251,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28086,17 +27290,10 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { ~Test_TC_DGGEN_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGGEN_2_1\n"); @@ -28346,7 +27543,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28368,7 +27564,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28437,7 +27632,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28461,7 +27655,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28512,7 +27705,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28589,17 +27781,10 @@ class Test_TC_I_1_1 : public TestCommandBridge { ~Test_TC_I_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_I_1_1\n"); @@ -28714,7 +27899,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28739,7 +27923,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28764,7 +27947,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28792,7 +27974,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28814,7 +27995,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28836,7 +28016,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28874,17 +28053,10 @@ class Test_TC_I_2_1 : public TestCommandBridge { ~Test_TC_I_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_I_2_1\n"); @@ -28975,7 +28147,6 @@ class Test_TC_I_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28998,7 +28169,6 @@ class Test_TC_I_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29034,17 +28204,10 @@ class Test_TC_I_2_2 : public TestCommandBridge { ~Test_TC_I_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_I_2_2\n"); @@ -29220,7 +28383,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29243,7 +28405,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29273,7 +28434,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29306,7 +28466,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29330,7 +28489,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29354,7 +28512,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29385,7 +28542,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29420,17 +28576,10 @@ class Test_TC_I_2_3 : public TestCommandBridge { ~Test_TC_I_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_I_2_3\n"); @@ -29740,7 +28889,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29776,7 +28924,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29812,7 +28959,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29848,7 +28994,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29884,7 +29029,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29920,7 +29064,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29956,7 +29099,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29992,7 +29134,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -30028,7 +29169,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -30064,7 +29204,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -30112,17 +29251,10 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { ~Test_TC_ILL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ILL_1_1\n"); @@ -30248,7 +29380,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30275,7 +29406,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30302,7 +29432,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30333,7 +29462,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30357,7 +29485,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30381,7 +29508,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30408,7 +29534,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30448,17 +29573,10 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { ~Test_TC_ILL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ILL_2_1\n"); @@ -30582,7 +29700,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30610,7 +29727,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30638,7 +29754,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30666,7 +29781,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30691,7 +29805,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30732,17 +29845,10 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { ~Test_TC_ILL_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ILL_2_2\n"); @@ -30892,7 +29998,6 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30922,7 +30027,6 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30969,7 +30073,6 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -31014,7 +30117,6 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -31054,17 +30156,10 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { ~Test_TC_LVL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_1_1\n"); @@ -31308,7 +30403,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31333,7 +30427,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31358,7 +30451,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31378,7 +30470,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31398,7 +30489,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31418,7 +30508,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31447,7 +30536,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31470,7 +30558,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31494,7 +30581,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31516,7 +30602,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31538,7 +30623,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31560,7 +30644,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31582,7 +30665,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31604,7 +30686,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31626,7 +30707,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31655,7 +30735,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31677,7 +30756,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31715,17 +30793,10 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { ~Test_TC_LVL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_2_1\n"); @@ -32015,7 +31086,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32044,7 +31114,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32068,7 +31137,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32098,7 +31166,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32125,7 +31192,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32156,7 +31222,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32183,7 +31248,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32209,7 +31273,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32237,7 +31300,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32261,7 +31323,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32288,7 +31349,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32314,7 +31374,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32337,7 +31396,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32360,7 +31418,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32386,7 +31443,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32414,7 +31470,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32440,7 +31495,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32466,7 +31520,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32492,7 +31545,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32512,7 +31564,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32557,17 +31608,10 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { ~Test_TC_LVL_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_2_2\n"); @@ -32852,7 +31896,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32878,7 +31921,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32902,7 +31944,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32931,7 +31972,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32960,7 +32000,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32983,7 +32022,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33015,7 +32053,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33044,7 +32081,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33068,7 +32104,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33100,7 +32135,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33129,7 +32163,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33153,7 +32186,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33185,7 +32217,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33214,7 +32245,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33238,7 +32268,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33270,7 +32299,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33299,7 +32327,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33323,7 +32350,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33354,7 +32380,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33390,17 +32415,10 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { ~Test_TC_LVL_3_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_3_1\n"); @@ -33953,7 +32971,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33972,7 +32989,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33996,7 +33012,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34021,7 +33036,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34043,7 +33057,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34062,7 +33075,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34089,7 +33101,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34113,7 +33124,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34138,7 +33148,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34157,7 +33166,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34185,7 +33193,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34211,7 +33218,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34246,7 +33252,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34279,7 +33284,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34312,7 +33316,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34345,7 +33348,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34370,7 +33372,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34395,7 +33396,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34417,7 +33417,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34441,7 +33440,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34460,7 +33458,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34485,7 +33482,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34510,7 +33506,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34529,7 +33524,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34554,7 +33548,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34579,7 +33572,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34604,7 +33596,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34629,7 +33620,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34654,7 +33644,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34679,7 +33668,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34701,7 +33689,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34725,7 +33712,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34744,7 +33730,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34769,7 +33754,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34794,7 +33778,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34813,7 +33796,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34838,7 +33820,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34863,7 +33844,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34888,7 +33868,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34913,7 +33892,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34938,7 +33916,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34976,17 +33953,10 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { ~Test_TC_LVL_4_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_4_1\n"); @@ -35313,7 +34283,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35332,7 +34301,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35356,7 +34324,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35381,7 +34348,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35403,7 +34369,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35426,7 +34391,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35445,7 +34409,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35472,7 +34435,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35497,7 +34459,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35532,7 +34493,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35557,7 +34517,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35576,7 +34535,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35604,7 +34562,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35629,7 +34586,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35662,7 +34618,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35695,7 +34650,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35728,7 +34682,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35761,7 +34714,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35786,7 +34738,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35805,7 +34756,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35842,17 +34792,10 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { ~Test_TC_LVL_5_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_5_1\n"); @@ -36153,7 +35096,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36172,7 +35114,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36196,7 +35137,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36221,7 +35161,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36243,7 +35182,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36262,7 +35200,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36290,7 +35227,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36314,7 +35250,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36333,7 +35268,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36361,7 +35295,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36386,7 +35319,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36422,7 +35354,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36455,7 +35386,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36488,7 +35418,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36521,7 +35450,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36546,7 +35474,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36571,7 +35498,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36590,7 +35516,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36627,17 +35552,10 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { ~Test_TC_LVL_6_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_6_1\n"); @@ -36890,7 +35808,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36915,7 +35832,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36937,7 +35853,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36956,7 +35871,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36984,7 +35898,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37009,7 +35922,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37044,7 +35956,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37077,7 +35988,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37102,7 +36012,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37137,7 +36046,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37170,7 +36078,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37195,7 +36102,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37214,7 +36120,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37251,17 +36156,10 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { ~Test_TC_LCFG_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LCFG_1_1\n"); @@ -37365,7 +36263,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37392,7 +36289,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37419,7 +36315,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37449,7 +36344,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37476,7 +36370,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37516,17 +36409,10 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { ~Test_TC_LUNIT_1_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LUNIT_1_2\n"); @@ -37672,7 +36558,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37697,7 +36582,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37722,7 +36606,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37742,7 +36625,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37768,7 +36650,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37790,7 +36671,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37815,7 +36695,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37853,17 +36732,10 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { ~Test_TC_LUNIT_3_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LUNIT_3_1\n"); @@ -38020,7 +36892,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38040,7 +36911,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38062,7 +36932,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38086,7 +36955,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38108,7 +36976,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38132,7 +36999,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38154,7 +37020,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38178,7 +37043,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38217,17 +37081,10 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { ~Test_TC_LTIME_1_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LTIME_1_2\n"); @@ -38375,7 +37232,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38402,7 +37258,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38427,7 +37282,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38456,7 +37310,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38480,7 +37333,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38504,7 +37356,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38531,7 +37382,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38571,17 +37421,10 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { ~Test_TC_LOWPOWER_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LOWPOWER_1_1\n"); @@ -38685,7 +37528,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38710,7 +37552,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38735,7 +37576,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38765,7 +37605,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38791,7 +37630,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38829,17 +37667,10 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { ~Test_TC_KEYPADINPUT_1_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_KEYPADINPUT_1_2\n"); @@ -38980,7 +37811,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39005,7 +37835,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39030,7 +37859,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39050,7 +37878,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39070,7 +37897,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39090,7 +37916,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39116,7 +37941,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39138,7 +37962,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39173,17 +37996,10 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { ~Test_TC_APPLAUNCHER_1_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APPLAUNCHER_1_3\n"); @@ -39324,7 +38140,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39351,7 +38166,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39378,7 +38192,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39405,7 +38218,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39433,7 +38245,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39457,7 +38268,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39481,7 +38291,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39507,7 +38316,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39544,17 +38352,10 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_1_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_1_4\n"); @@ -39695,7 +38496,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39720,7 +38520,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39745,7 +38544,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39765,7 +38563,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39791,7 +38588,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39813,7 +38609,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39835,7 +38630,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39860,7 +38654,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39898,17 +38691,10 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { ~Test_TC_WAKEONLAN_1_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WAKEONLAN_1_5\n"); @@ -40023,7 +38809,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40048,7 +38833,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40073,7 +38857,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40099,7 +38882,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40121,7 +38903,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40146,7 +38927,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40184,17 +38964,10 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { ~Test_TC_CHANNEL_1_6() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CHANNEL_1_6\n"); @@ -40399,7 +39172,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40424,7 +39196,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40449,7 +39220,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40469,7 +39239,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40489,7 +39258,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40515,7 +39283,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40537,7 +39304,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40559,7 +39325,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40581,7 +39346,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40603,7 +39367,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40625,7 +39388,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40647,7 +39409,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40672,7 +39433,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40707,17 +39467,10 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_1_7() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_1_7\n"); @@ -41001,7 +39754,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41026,7 +39778,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41051,7 +39802,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41071,7 +39821,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41091,7 +39840,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41118,7 +39866,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41140,7 +39887,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41162,7 +39908,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41184,7 +39929,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41206,7 +39950,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41228,7 +39971,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41250,7 +39992,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41274,7 +40015,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41296,7 +40036,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41318,7 +40057,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41340,7 +40078,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41362,7 +40099,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41384,7 +40120,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41406,7 +40141,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41428,7 +40162,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41450,7 +40183,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41485,17 +40217,10 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { ~Test_TC_AUDIOOUTPUT_1_8() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_AUDIOOUTPUT_1_8\n"); @@ -41599,7 +40324,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41624,7 +40348,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41647,7 +40370,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41675,7 +40397,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41697,7 +40418,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41735,17 +40455,10 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { ~Test_TC_TGTNAV_1_9() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TGTNAV_1_9\n"); @@ -41860,7 +40573,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41885,7 +40597,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41910,7 +40621,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41937,7 +40647,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41959,7 +40668,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41981,7 +40689,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42016,17 +40723,10 @@ class Test_TC_TGTNAV_8_2 : public TestCommandBridge { ~Test_TC_TGTNAV_8_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TGTNAV_8_2\n"); @@ -42093,17 +40793,10 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { ~Test_TC_APBSC_1_10() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APBSC_1_10\n"); @@ -42240,7 +40933,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42265,7 +40957,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42290,7 +40981,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42321,7 +41011,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42343,7 +41032,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42365,7 +41053,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42387,7 +41074,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42412,7 +41098,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42450,17 +41135,10 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { ~Test_TC_CONTENTLAUNCHER_1_11() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CONTENTLAUNCHER_1_11\n"); @@ -42632,7 +41310,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42657,7 +41334,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42682,7 +41358,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42702,7 +41377,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42722,7 +41396,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42748,7 +41421,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42770,7 +41442,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42792,7 +41463,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42814,7 +41484,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42836,7 +41505,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42871,17 +41539,10 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { ~Test_TC_ALOGIN_1_12() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ALOGIN_1_12\n"); @@ -42985,7 +41646,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43010,7 +41670,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43035,7 +41694,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43061,7 +41719,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43085,7 +41742,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43123,17 +41779,10 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { ~Test_TC_ALOGIN_12_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ALOGIN_12_1\n"); @@ -43252,7 +41901,6 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -43293,7 +41941,6 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43326,7 +41973,6 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43354,7 +42000,6 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43386,17 +42031,10 @@ class Test_TC_LOWPOWER_2_1 : public TestCommandBridge { ~Test_TC_LOWPOWER_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LOWPOWER_2_1\n"); @@ -43476,7 +42114,6 @@ class Test_TC_LOWPOWER_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43508,17 +42145,10 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge { ~Test_TC_KEYPADINPUT_3_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_KEYPADINPUT_3_2\n"); @@ -43609,7 +42239,6 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43636,7 +42265,6 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43676,17 +42304,10 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { ~Test_TC_KEYPADINPUT_3_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_KEYPADINPUT_3_3\n"); @@ -43854,7 +42475,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43881,7 +42501,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43908,7 +42527,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43935,7 +42553,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43962,7 +42579,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43989,7 +42605,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44016,7 +42631,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44043,7 +42657,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44070,7 +42683,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44110,17 +42722,10 @@ class Test_TC_APPLAUNCHER_3_5 : public TestCommandBridge { ~Test_TC_APPLAUNCHER_3_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APPLAUNCHER_3_5\n"); @@ -44203,7 +42808,6 @@ class Test_TC_APPLAUNCHER_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -44239,17 +42843,10 @@ class Test_TC_APPLAUNCHER_3_6 : public TestCommandBridge { ~Test_TC_APPLAUNCHER_3_6() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APPLAUNCHER_3_6\n"); @@ -44333,7 +42930,6 @@ class Test_TC_APPLAUNCHER_3_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -44371,17 +42967,10 @@ class Test_TC_MEDIAINPUT_3_10 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_3_10() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_3_10\n"); @@ -44465,7 +43054,6 @@ class Test_TC_MEDIAINPUT_3_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44500,17 +43088,10 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_3_11() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_3_11\n"); @@ -44616,7 +43197,6 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44638,7 +43218,6 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44660,7 +43239,6 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44697,17 +43275,10 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_3_12() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_3_12\n"); @@ -44813,7 +43384,6 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44835,7 +43405,6 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44854,7 +43423,6 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44886,17 +43454,10 @@ class Test_TC_MEDIAINPUT_3_13 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_3_13() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_3_13\n"); @@ -45000,7 +43561,6 @@ class Test_TC_MEDIAINPUT_3_13 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45019,7 +43579,6 @@ class Test_TC_MEDIAINPUT_3_13 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45065,17 +43624,10 @@ class Test_TC_WAKEONLAN_4_1 : public TestCommandBridge { ~Test_TC_WAKEONLAN_4_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WAKEONLAN_4_1\n"); @@ -45178,7 +43730,6 @@ class Test_TC_WAKEONLAN_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45198,7 +43749,6 @@ class Test_TC_WAKEONLAN_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45240,17 +43790,10 @@ class Test_TC_CHANNEL_5_1 : public TestCommandBridge { ~Test_TC_CHANNEL_5_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CHANNEL_5_1\n"); @@ -45335,7 +43878,6 @@ class Test_TC_CHANNEL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45373,17 +43915,10 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { ~Test_TC_CHANNEL_5_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CHANNEL_5_2\n"); @@ -45498,7 +44033,6 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45518,7 +44052,6 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45554,7 +44087,6 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45600,17 +44132,10 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { ~Test_TC_CHANNEL_5_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CHANNEL_5_3\n"); @@ -45752,7 +44277,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45773,7 +44297,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45793,7 +44316,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45822,7 +44344,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45855,7 +44376,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45901,17 +44421,10 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_6_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_6_1\n"); @@ -46102,7 +44615,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46126,7 +44638,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46150,7 +44661,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46184,7 +44694,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46208,7 +44717,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46242,7 +44750,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46266,7 +44773,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46300,7 +44806,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46337,17 +44842,10 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_6_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_6_2\n"); @@ -46604,7 +45102,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46628,7 +45125,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46652,7 +45148,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46686,7 +45181,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46710,7 +45204,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46745,7 +45238,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46780,7 +45272,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46816,7 +45307,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46855,7 +45345,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46884,7 +45373,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46923,7 +45411,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46966,17 +45453,10 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_6_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_6_3\n"); @@ -47159,7 +45639,6 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47183,7 +45662,6 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47221,7 +45699,6 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47290,7 +45767,6 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47341,17 +45817,10 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_6_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_6_4\n"); @@ -47665,7 +46134,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47689,7 +46157,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47713,7 +46180,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47737,7 +46203,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47772,7 +46237,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47796,7 +46260,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47820,7 +46283,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47856,7 +46318,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47880,7 +46341,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47915,7 +46375,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47950,7 +46409,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47996,7 +46454,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48031,7 +46488,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48089,17 +46545,10 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { ~Test_TC_AUDIOOUTPUT_7_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_AUDIOOUTPUT_7_1\n"); @@ -48202,7 +46651,6 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48222,7 +46670,6 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48244,7 +46691,6 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48282,17 +46728,10 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge { ~Test_TC_AUDIOOUTPUT_7_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_AUDIOOUTPUT_7_2\n"); @@ -48398,7 +46837,6 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48422,7 +46860,6 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48469,17 +46906,10 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { ~Test_TC_TGTNAV_8_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TGTNAV_8_1\n"); @@ -48593,7 +47023,6 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48617,7 +47046,6 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48641,7 +47069,6 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48665,7 +47092,6 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48702,17 +47128,10 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { ~Test_TC_APBSC_9_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APBSC_9_1\n"); @@ -48869,7 +47288,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48890,7 +47308,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48910,7 +47327,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48931,7 +47347,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48954,7 +47369,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48975,7 +47389,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48997,7 +47410,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49018,7 +47430,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49051,17 +47462,10 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge { ~Test_TC_CONTENTLAUNCHER_10_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CONTENTLAUNCHER_10_1\n"); @@ -49152,7 +47556,6 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49172,7 +47575,6 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49205,17 +47607,10 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { ~Test_TC_MOD_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MOD_1_1\n"); @@ -49358,7 +47753,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49383,7 +47777,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49408,7 +47801,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49433,7 +47825,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49463,7 +47854,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49485,7 +47875,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49507,7 +47896,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49529,7 +47917,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49575,17 +47962,10 @@ class OTA_SuccessfulTransfer : public TestCommandBridge { ~OTA_SuccessfulTransfer() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: OTA_SuccessfulTransfer\n"); @@ -49773,7 +48153,6 @@ class OTA_SuccessfulTransfer : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49849,7 +48228,6 @@ class OTA_SuccessfulTransfer : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOTASoftwareUpdateRequestor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -49911,17 +48289,10 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { ~Test_TC_OCC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_1_1\n"); @@ -50025,7 +48396,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50050,7 +48420,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50075,7 +48444,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50104,7 +48472,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50129,7 +48496,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50167,17 +48533,10 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { ~Test_TC_OCC_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_2_1\n"); @@ -50382,7 +48741,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50405,7 +48763,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50428,7 +48785,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50451,7 +48807,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50474,7 +48829,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50497,7 +48851,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50521,7 +48874,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50547,7 +48899,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50573,7 +48924,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50599,7 +48949,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50625,7 +48974,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50651,7 +48999,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50690,17 +49037,10 @@ class Test_TC_OCC_2_3 : public TestCommandBridge { ~Test_TC_OCC_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_2_3\n"); @@ -50791,7 +49131,6 @@ class Test_TC_OCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50814,7 +49153,6 @@ class Test_TC_OCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50850,17 +49188,10 @@ class Test_TC_OO_1_1 : public TestCommandBridge { ~Test_TC_OO_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_1_1\n"); @@ -51002,7 +49333,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51027,7 +49357,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51052,7 +49381,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51072,7 +49400,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51099,7 +49426,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51124,7 +49450,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51148,7 +49473,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51172,7 +49496,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51210,17 +49533,10 @@ class Test_TC_OO_2_1 : public TestCommandBridge { ~Test_TC_OO_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_1\n"); @@ -51344,7 +49660,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51364,7 +49679,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51384,7 +49698,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51407,7 +49720,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51430,7 +49742,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51467,17 +49778,10 @@ class Test_TC_OO_2_2 : public TestCommandBridge { ~Test_TC_OO_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_2\n"); @@ -51780,7 +50084,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51799,7 +50102,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51823,7 +50125,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51842,7 +50143,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51866,7 +50166,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51885,7 +50184,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51909,7 +50207,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51928,7 +50225,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51952,7 +50248,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51971,7 +50266,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51995,7 +50289,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52022,7 +50315,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52046,7 +50338,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52073,7 +50364,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52107,7 +50397,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52141,7 +50430,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52165,7 +50453,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52184,7 +50471,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52221,17 +50507,10 @@ class Test_TC_OO_2_4 : public TestCommandBridge { ~Test_TC_OO_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_4\n"); @@ -52606,7 +50885,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52625,7 +50903,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52673,7 +50950,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52697,7 +50973,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52745,7 +51020,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52769,7 +51043,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52817,7 +51090,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52867,7 +51139,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52891,7 +51162,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52939,7 +51209,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52963,7 +51232,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53008,7 +51276,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53045,17 +51312,10 @@ class Test_TC_PS_1_1 : public TestCommandBridge { ~Test_TC_PS_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PS_1_1\n"); @@ -53254,7 +51514,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53279,7 +51538,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53304,7 +51562,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53324,7 +51581,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53344,7 +51600,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53364,7 +51619,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53384,7 +51638,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53413,7 +51666,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53435,7 +51687,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53459,7 +51710,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53482,7 +51732,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53505,7 +51754,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53530,7 +51778,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53568,17 +51815,10 @@ class Test_TC_PS_2_1 : public TestCommandBridge { ~Test_TC_PS_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PS_2_1\n"); @@ -53994,7 +52234,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54017,7 +52256,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54040,7 +52278,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54060,7 +52297,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54087,7 +52323,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54114,7 +52349,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54137,7 +52371,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54163,7 +52396,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54186,7 +52418,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54209,7 +52440,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54229,7 +52459,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54250,7 +52479,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54276,7 +52504,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54302,7 +52529,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54328,7 +52554,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54351,7 +52576,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54371,7 +52595,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54394,7 +52617,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54414,7 +52636,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54435,7 +52656,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54456,7 +52676,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54479,7 +52698,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54500,7 +52718,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54521,7 +52738,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54544,7 +52760,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54567,7 +52782,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54590,7 +52804,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54613,7 +52826,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54639,7 +52851,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54659,7 +52870,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54685,7 +52895,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54718,17 +52927,10 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { ~Test_TC_PRS_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_1_1\n"); @@ -54913,7 +53115,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -54940,7 +53141,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -54967,7 +53167,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -54989,7 +53188,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55020,7 +53218,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55044,7 +53241,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55068,7 +53264,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55092,7 +53287,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55116,7 +53310,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55140,7 +53333,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55164,7 +53356,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55191,7 +53382,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55231,17 +53421,10 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { ~Test_TC_PRS_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_2_1\n"); @@ -55409,7 +53592,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55437,7 +53619,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55465,7 +53646,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55493,7 +53673,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55518,7 +53697,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55546,7 +53724,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55574,7 +53751,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55602,7 +53778,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55627,7 +53802,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55665,17 +53839,10 @@ class Test_TC_PRS_2_2 : public TestCommandBridge { ~Test_TC_PRS_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_2_2\n"); @@ -55786,7 +53953,6 @@ class Test_TC_PRS_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55829,7 +53995,6 @@ class Test_TC_PRS_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55867,17 +54032,10 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { ~Test_TC_PCC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_1_1\n"); @@ -56256,7 +54414,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56283,7 +54440,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56310,7 +54466,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56332,7 +54487,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56354,7 +54508,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56376,7 +54529,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56398,7 +54550,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56420,7 +54571,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56442,7 +54592,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56464,7 +54613,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56499,7 +54647,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56523,7 +54670,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56547,7 +54693,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56571,7 +54716,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56595,7 +54739,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56619,7 +54762,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56643,7 +54785,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56667,7 +54808,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56691,7 +54831,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56715,7 +54854,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56739,7 +54877,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56763,7 +54900,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56787,7 +54923,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56811,7 +54946,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56835,7 +54969,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56859,7 +54992,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56883,7 +55015,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56910,7 +55041,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56950,17 +55080,10 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { ~Test_TC_PCC_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_1\n"); @@ -57282,7 +55405,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57310,7 +55432,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57338,7 +55459,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57366,7 +55486,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57394,7 +55513,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57422,7 +55540,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57450,7 +55567,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57478,7 +55594,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57506,7 +55621,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57534,7 +55648,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57562,7 +55675,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57590,7 +55702,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57618,7 +55729,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57646,7 +55756,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57671,7 +55780,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57696,7 +55804,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57721,7 +55828,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57749,7 +55855,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57777,7 +55882,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57805,7 +55909,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57833,7 +55936,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57861,7 +55963,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57886,7 +55987,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57924,17 +56024,10 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { ~Test_TC_PCC_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_2\n"); @@ -58092,7 +56185,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58116,7 +56208,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58142,7 +56233,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58166,7 +56256,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58192,7 +56281,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58218,7 +56306,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58244,7 +56331,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58268,7 +56354,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58307,17 +56392,10 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { ~Test_TC_PCC_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_3\n"); @@ -58540,7 +56618,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58564,7 +56641,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58590,7 +56666,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58614,7 +56689,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58640,7 +56714,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58664,7 +56737,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58690,7 +56762,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58714,7 +56785,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58740,7 +56810,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58764,7 +56833,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58790,7 +56858,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58814,7 +56881,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58840,7 +56906,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58864,7 +56929,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58903,17 +56967,10 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { ~Test_TC_PCC_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_4\n"); @@ -59114,7 +57171,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59138,7 +57194,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59165,7 +57220,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59189,7 +57243,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59216,7 +57269,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59240,7 +57292,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59267,7 +57318,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59292,7 +57342,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59319,7 +57368,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59344,7 +57392,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59371,7 +57418,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59396,7 +57442,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59436,17 +57481,10 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { ~Test_TC_PSCFG_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PSCFG_1_1\n"); @@ -59550,7 +57588,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59577,7 +57614,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59604,7 +57640,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59633,7 +57668,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59660,7 +57694,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59700,17 +57733,10 @@ class Test_TC_PSCFG_2_1 : public TestCommandBridge { ~Test_TC_PSCFG_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PSCFG_2_1\n"); @@ -59790,7 +57816,6 @@ class Test_TC_PSCFG_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59825,17 +57850,10 @@ class Test_TC_RH_1_1 : public TestCommandBridge { ~Test_TC_RH_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_RH_1_1\n"); @@ -59950,7 +57968,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59977,7 +57994,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60004,7 +58020,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60035,7 +58050,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60059,7 +58073,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60086,7 +58099,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60126,17 +58138,10 @@ class Test_TC_RH_2_1 : public TestCommandBridge { ~Test_TC_RH_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_RH_2_1\n"); @@ -60249,7 +58254,6 @@ class Test_TC_RH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60277,7 +58281,6 @@ class Test_TC_RH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60305,7 +58308,6 @@ class Test_TC_RH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60333,7 +58335,6 @@ class Test_TC_RH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60371,17 +58372,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { ~Test_TC_SC_5_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_SC_5_1\n"); @@ -60405,84 +58399,88 @@ class Test_TC_SC_5_1 : public TestCommandBridge { err = TestWaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : TH adds ACL Operate privileges for Group 0x0103\n"); - err = TestThAddsAclOperatePrivilegesForGroup0x0103_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Read the commissioner node ID\n"); + err = TestReadTheCommissionerNodeId_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : TH sends KeySetWrite command with incorrect key\n"); - err = TestThSendsKeySetWriteCommandWithIncorrectKey_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : TH adds ACL Operate privileges for Group 0x0103\n"); + err = TestThAddsAclOperatePrivilegesForGroup0x0103_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : TH sends KeySetWrite command with TH key\n"); - err = TestThSendsKeySetWriteCommandWithThKey_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : TH sends KeySetWrite command with incorrect key\n"); + err = TestThSendsKeySetWriteCommandWithIncorrectKey_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : TH binds GroupId to GroupKeySet\n"); - err = TestThBindsGroupIdToGroupKeySet_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : TH sends KeySetWrite command with TH key\n"); + err = TestThSendsKeySetWriteCommandWithThKey_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : TH sends RemoveAllGroups command\n"); - err = TestThSendsRemoveAllGroupsCommand_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : TH binds GroupId to GroupKeySet\n"); + err = TestThBindsGroupIdToGroupKeySet_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends AddGroup command\n"); - err = TestThSendsAddGroupCommand_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends RemoveAllGroups command\n"); + err = TestThSendsRemoveAllGroupsCommand_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : TH sends ViewGroup command\n"); - if (ShouldSkip("G.S.F00")) { - NextTest(); - return; - } - err = TestThSendsViewGroupCommand_7(); + ChipLogProgress(chipTool, " ***** Test Step 7 : TH sends AddGroup command\n"); + err = TestThSendsAddGroupCommand_7(); break; case 8: ChipLogProgress(chipTool, " ***** Test Step 8 : TH sends ViewGroup command\n"); - if (ShouldSkip("!(G.S.F00)")) { + if (ShouldSkip("G.S.F00")) { NextTest(); return; } err = TestThSendsViewGroupCommand_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : TH sends KeySetRead\n"); - err = TestThSendsKeySetRead_9(); - break; - case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads GroupTable attribute\n"); - if (ShouldSkip("G.S.F00")) { + ChipLogProgress(chipTool, " ***** Test Step 9 : TH sends ViewGroup command\n"); + if (ShouldSkip("!(G.S.F00)")) { NextTest(); return; } - err = TestThReadsGroupTableAttribute_10(); + err = TestThSendsViewGroupCommand_9(); + break; + case 10: + ChipLogProgress(chipTool, " ***** Test Step 10 : TH sends KeySetRead\n"); + err = TestThSendsKeySetRead_10(); break; case 11: ChipLogProgress(chipTool, " ***** Test Step 11 : TH reads GroupTable attribute\n"); - if (ShouldSkip("!(G.S.F00)")) { + if (ShouldSkip("G.S.F00")) { NextTest(); return; } err = TestThReadsGroupTableAttribute_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : TH removes the GroupKeySet\n"); - err = TestThRemovesTheGroupKeySet_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : TH reads GroupTable attribute\n"); + if (ShouldSkip("!(G.S.F00)")) { + NextTest(); + return; + } + err = TestThReadsGroupTableAttribute_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : TH verifies the corresponding GroupKeyMap entry has been removed\n"); - err = TestThVerifiesTheCorrespondingGroupKeyMapEntryHasBeenRemoved_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : TH removes the GroupKeySet\n"); + err = TestThRemovesTheGroupKeySet_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : TH cleans up groups using RemoveAllGroups command\n"); - err = TestThCleansUpGroupsUsingRemoveAllGroupsCommand_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : TH verifies the corresponding GroupKeyMap entry has been removed\n"); + err = TestThVerifiesTheCorrespondingGroupKeyMapEntryHasBeenRemoved_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : TH verifies the group has been removed in the GroupTable\n"); - err = TestThVerifiesTheGroupHasBeenRemovedInTheGroupTable_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : TH cleans up groups using RemoveAllGroups command\n"); + err = TestThCleansUpGroupsUsingRemoveAllGroupsCommand_15(); break; case 16: - ChipLogProgress(chipTool, " ***** Test Step 16 : TH removes ACL Operate privileges for Group 0x0103\n"); - err = TestThRemovesAclOperatePrivilegesForGroup0x0103_16(); + ChipLogProgress(chipTool, " ***** Test Step 16 : TH verifies the group has been removed in the GroupTable\n"); + err = TestThVerifiesTheGroupHasBeenRemovedInTheGroupTable_16(); + break; + case 17: + ChipLogProgress(chipTool, " ***** Test Step 17 : TH removes ACL Operate privileges for Group 0x0103\n"); + err = TestThRemovesAclOperatePrivilegesForGroup0x0103_17(); break; } @@ -60546,6 +58544,9 @@ class Test_TC_SC_5_1 : public TestCommandBridge { case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 17: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -60559,7 +58560,7 @@ class Test_TC_SC_5_1 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 17; + const uint16_t mTestCount = 18; chip::Optional mNodeId; chip::Optional mCluster; @@ -60573,12 +58574,24 @@ class Test_TC_SC_5_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } + NSNumber * _Nonnull commissionerNodeId; + + CHIP_ERROR TestReadTheCommissionerNodeId_1() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeId = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } - CHIP_ERROR TestThAddsAclOperatePrivilegesForGroup0x0103_1() + CHIP_ERROR TestThAddsAclOperatePrivilegesForGroup0x0103_2() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60590,7 +58603,7 @@ class Test_TC_SC_5_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -60621,11 +58634,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsKeySetWriteCommandWithIncorrectKey_2() + CHIP_ERROR TestThSendsKeySetWriteCommandWithIncorrectKey_3() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60662,11 +58674,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsKeySetWriteCommandWithThKey_3() + CHIP_ERROR TestThSendsKeySetWriteCommandWithThKey_4() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60703,11 +58714,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThBindsGroupIdToGroupKeySet_4() + CHIP_ERROR TestThBindsGroupIdToGroupKeySet_5() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60735,11 +58745,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsRemoveAllGroupsCommand_5() + CHIP_ERROR TestThSendsRemoveAllGroupsCommand_6() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60754,11 +58763,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsAddGroupCommand_6() + CHIP_ERROR TestThSendsAddGroupCommand_7() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60777,11 +58785,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsViewGroupCommand_7() + CHIP_ERROR TestThSendsViewGroupCommand_8() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60814,11 +58821,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsViewGroupCommand_8() + CHIP_ERROR TestThSendsViewGroupCommand_9() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60851,11 +58857,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsKeySetRead_9() + CHIP_ERROR TestThSendsKeySetRead_10() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60903,11 +58908,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsGroupTableAttribute_10() + CHIP_ERROR TestThReadsGroupTableAttribute_11() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60945,11 +58949,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsGroupTableAttribute_11() + CHIP_ERROR TestThReadsGroupTableAttribute_12() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60986,11 +58989,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThRemovesTheGroupKeySet_12() + CHIP_ERROR TestThRemovesTheGroupKeySet_13() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61010,11 +59012,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThVerifiesTheCorrespondingGroupKeyMapEntryHasBeenRemoved_13() + CHIP_ERROR TestThVerifiesTheCorrespondingGroupKeyMapEntryHasBeenRemoved_14() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61041,11 +59042,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThCleansUpGroupsUsingRemoveAllGroupsCommand_14() + CHIP_ERROR TestThCleansUpGroupsUsingRemoveAllGroupsCommand_15() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61060,11 +59060,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThVerifiesTheGroupHasBeenRemovedInTheGroupTable_15() + CHIP_ERROR TestThVerifiesTheGroupHasBeenRemovedInTheGroupTable_16() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61090,11 +59089,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThRemovesAclOperatePrivilegesForGroup0x0103_16() + CHIP_ERROR TestThRemovesAclOperatePrivilegesForGroup0x0103_17() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61106,7 +59104,7 @@ class Test_TC_SC_5_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -61143,17 +59141,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { ~Test_TC_SC_5_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_SC_5_2\n"); @@ -61177,52 +59168,56 @@ class Test_TC_SC_5_2 : public TestCommandBridge { err = TestWaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : TH adds ACL Operate privileges for Group 0x0103\n"); - err = TestThAddsAclOperatePrivilegesForGroup0x0103_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Read the commissioner node ID\n"); + err = TestReadTheCommissionerNodeId_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : TH sends KeySetWrite command with TH key\n"); - err = TestThSendsKeySetWriteCommandWithThKey_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : TH adds ACL Operate privileges for Group 0x0103\n"); + err = TestThAddsAclOperatePrivilegesForGroup0x0103_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : TH binds GroupId to GroupKeySet\n"); - err = TestThBindsGroupIdToGroupKeySet_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : TH sends KeySetWrite command with TH key\n"); + err = TestThSendsKeySetWriteCommandWithThKey_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : TH sends RemoveAllGroups command\n"); - err = TestThSendsRemoveAllGroupsCommand_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : TH binds GroupId to GroupKeySet\n"); + err = TestThBindsGroupIdToGroupKeySet_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : TH sends AddGroup command\n"); - err = TestThSendsAddGroupCommand_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : TH sends RemoveAllGroups command\n"); + err = TestThSendsRemoveAllGroupsCommand_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends ViewGroup command using group messaging\n"); - if (ShouldSkip("G.S.F00")) { - NextTest(); - return; - } - err = TestThSendsViewGroupCommandUsingGroupMessaging_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends AddGroup command\n"); + err = TestThSendsAddGroupCommand_6(); break; case 7: ChipLogProgress(chipTool, " ***** Test Step 7 : TH sends ViewGroup command using group messaging\n"); - if (ShouldSkip("!(G.S.F00)")) { + if (ShouldSkip("G.S.F00")) { NextTest(); return; } err = TestThSendsViewGroupCommandUsingGroupMessaging_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : TH removes the GroupKeySet\n"); - err = TestThRemovesTheGroupKeySet_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : TH sends ViewGroup command using group messaging\n"); + if (ShouldSkip("!(G.S.F00)")) { + NextTest(); + return; + } + err = TestThSendsViewGroupCommandUsingGroupMessaging_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : TH cleans up groups using RemoveAllGroups command\n"); - err = TestThCleansUpGroupsUsingRemoveAllGroupsCommand_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : TH removes the GroupKeySet\n"); + err = TestThRemovesTheGroupKeySet_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : TH removes ACL Operate privileges for Group 0x0103\n"); - err = TestThRemovesAclOperatePrivilegesForGroup0x0103_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : TH cleans up groups using RemoveAllGroups command\n"); + err = TestThCleansUpGroupsUsingRemoveAllGroupsCommand_10(); + break; + case 11: + ChipLogProgress(chipTool, " ***** Test Step 11 : TH removes ACL Operate privileges for Group 0x0103\n"); + err = TestThRemovesAclOperatePrivilegesForGroup0x0103_11(); break; } @@ -61268,6 +59263,9 @@ class Test_TC_SC_5_2 : public TestCommandBridge { case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 11: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -61281,7 +59279,7 @@ class Test_TC_SC_5_2 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 11; + const uint16_t mTestCount = 12; chip::Optional mNodeId; chip::Optional mCluster; @@ -61295,12 +59293,24 @@ class Test_TC_SC_5_2 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } + NSNumber * _Nonnull commissionerNodeId; + + CHIP_ERROR TestReadTheCommissionerNodeId_1() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeId = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } - CHIP_ERROR TestThAddsAclOperatePrivilegesForGroup0x0103_1() + CHIP_ERROR TestThAddsAclOperatePrivilegesForGroup0x0103_2() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61312,7 +59322,7 @@ class Test_TC_SC_5_2 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -61343,11 +59353,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsKeySetWriteCommandWithThKey_2() + CHIP_ERROR TestThSendsKeySetWriteCommandWithThKey_3() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61384,11 +59393,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThBindsGroupIdToGroupKeySet_3() + CHIP_ERROR TestThBindsGroupIdToGroupKeySet_4() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61416,11 +59424,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsRemoveAllGroupsCommand_4() + CHIP_ERROR TestThSendsRemoveAllGroupsCommand_5() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61435,11 +59442,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsAddGroupCommand_5() + CHIP_ERROR TestThSendsAddGroupCommand_6() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61458,11 +59464,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsViewGroupCommandUsingGroupMessaging_6() + CHIP_ERROR TestThSendsViewGroupCommandUsingGroupMessaging_7() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61495,11 +59500,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsViewGroupCommandUsingGroupMessaging_7() + CHIP_ERROR TestThSendsViewGroupCommandUsingGroupMessaging_8() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61532,11 +59536,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThRemovesTheGroupKeySet_8() + CHIP_ERROR TestThRemovesTheGroupKeySet_9() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61556,11 +59559,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThCleansUpGroupsUsingRemoveAllGroupsCommand_9() + CHIP_ERROR TestThCleansUpGroupsUsingRemoveAllGroupsCommand_10() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61575,11 +59577,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThRemovesAclOperatePrivilegesForGroup0x0103_10() + CHIP_ERROR TestThRemovesAclOperatePrivilegesForGroup0x0103_11() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61591,7 +59592,7 @@ class Test_TC_SC_5_2 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -61628,17 +59629,10 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { ~Test_TC_SWTCH_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_SWTCH_1_1\n"); @@ -61817,7 +59811,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61842,7 +59835,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61867,7 +59859,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61887,7 +59878,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61907,7 +59897,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61927,7 +59916,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61947,7 +59935,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61967,7 +59954,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61996,7 +59982,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62024,7 +60009,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62044,7 +60028,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62082,17 +60065,10 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { ~Test_TC_TMP_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TMP_1_1\n"); @@ -62207,7 +60183,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62234,7 +60209,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62261,7 +60235,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62292,7 +60265,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62316,7 +60288,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62343,7 +60314,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62383,17 +60353,10 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { ~Test_TC_TMP_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TMP_2_1\n"); @@ -62506,7 +60469,6 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62534,7 +60496,6 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62562,7 +60523,6 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62590,7 +60550,6 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62628,17 +60587,10 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { ~Test_TC_TSTAT_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSTAT_1_1\n"); @@ -62935,7 +60887,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62960,7 +60911,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62985,7 +60935,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63005,7 +60954,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63025,7 +60973,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63045,7 +60992,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63065,7 +61011,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63085,7 +61030,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63105,7 +61049,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63134,7 +61077,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63156,7 +61098,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63178,7 +61119,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63200,7 +61140,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63222,7 +61161,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63244,7 +61182,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63268,7 +61205,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63292,7 +61228,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63316,7 +61251,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63340,7 +61274,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63362,7 +61295,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63387,7 +61319,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63420,17 +61351,10 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { ~Test_TC_TSUIC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_1_1\n"); @@ -63534,7 +61458,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63561,7 +61484,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63588,7 +61510,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63619,7 +61540,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63646,7 +61566,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63686,17 +61605,10 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { ~Test_TC_TSUIC_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_2_1\n"); @@ -63798,7 +61710,6 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63823,7 +61734,6 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63848,7 +61758,6 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63886,17 +61795,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { ~Test_TC_TSUIC_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_2_2\n"); @@ -64367,7 +62269,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64404,7 +62305,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64425,7 +62325,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64462,7 +62361,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64488,7 +62386,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64518,7 +62415,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64544,7 +62440,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64578,7 +62473,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64604,7 +62498,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64638,7 +62531,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64664,7 +62556,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64698,7 +62589,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64724,7 +62614,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64758,7 +62647,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64784,7 +62672,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64818,7 +62705,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64844,7 +62730,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64878,7 +62763,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64904,7 +62788,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64934,7 +62817,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64960,7 +62842,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64996,7 +62877,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65022,7 +62902,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65058,7 +62937,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65084,7 +62962,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65114,7 +62991,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65153,17 +63029,10 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { ~Test_TC_DGTHREAD_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGTHREAD_1_1\n"); @@ -65388,7 +63257,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65415,7 +63283,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65442,7 +63309,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65464,7 +63330,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65486,7 +63351,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65508,7 +63372,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65530,7 +63393,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65575,7 +63437,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65599,7 +63460,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65630,7 +63490,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65687,7 +63546,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65711,7 +63569,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65735,7 +63592,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65759,7 +63615,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65783,7 +63638,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65823,17 +63677,10 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { ~Test_TC_ULABEL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_1_1\n"); @@ -65937,7 +63784,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -65962,7 +63808,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -65987,7 +63832,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66014,7 +63858,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66039,7 +63882,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66077,17 +63919,10 @@ class Test_TC_ULABEL_2_1 : public TestCommandBridge { ~Test_TC_ULABEL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_1\n"); @@ -66167,7 +64002,6 @@ class Test_TC_ULABEL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66200,17 +64034,10 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge { ~Test_TC_ULABEL_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_2\n"); @@ -66301,7 +64128,6 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66342,7 +64168,6 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66391,17 +64216,10 @@ class Test_TC_ULABEL_2_3 : public TestCommandBridge { ~Test_TC_ULABEL_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_3\n"); @@ -66492,7 +64310,6 @@ class Test_TC_ULABEL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66525,7 +64342,6 @@ class Test_TC_ULABEL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66571,17 +64387,10 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { ~Test_TC_ULABEL_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_4\n"); @@ -66694,7 +64503,6 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66727,7 +64535,6 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66757,7 +64564,6 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66786,7 +64592,6 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66825,17 +64630,10 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { ~Test_TC_DGWIFI_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGWIFI_1_1\n"); @@ -67019,7 +64817,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67046,7 +64843,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67073,7 +64869,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67095,7 +64890,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67117,7 +64911,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67150,7 +64943,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67178,7 +64970,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67203,7 +64994,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67227,7 +65017,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67254,7 +65043,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67278,7 +65066,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67318,17 +65105,10 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { ~Test_TC_DGWIFI_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGWIFI_2_1\n"); @@ -67540,7 +65320,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67566,7 +65345,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67592,7 +65370,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67620,7 +65397,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67648,7 +65424,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67676,7 +65451,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67704,7 +65478,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67732,7 +65505,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67760,7 +65532,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67788,7 +65559,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67816,7 +65586,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67844,7 +65613,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67870,7 +65638,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67909,17 +65676,10 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { ~Test_TC_DGWIFI_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGWIFI_2_3\n"); @@ -68065,7 +65825,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68086,7 +65845,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68114,7 +65872,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68142,7 +65899,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68170,7 +65926,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68198,7 +65953,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68226,7 +65980,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68267,17 +66020,10 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { ~Test_TC_WNCV_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_1_1\n"); @@ -68553,7 +66299,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68581,7 +66326,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68606,7 +66350,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68626,7 +66369,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68646,7 +66388,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68666,7 +66407,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68686,7 +66426,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68706,7 +66445,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68737,7 +66475,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68759,7 +66496,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68782,7 +66518,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68805,7 +66540,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68828,7 +66562,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68851,7 +66584,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68875,7 +66607,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68897,7 +66628,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68919,7 +66649,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68941,7 +66670,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68979,17 +66707,10 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { ~Test_TC_WNCV_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_1\n"); @@ -69321,7 +67042,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69344,7 +67064,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69367,7 +67086,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69390,7 +67108,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69413,7 +67130,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69436,7 +67152,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69458,7 +67173,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69486,7 +67200,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69514,7 +67227,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69543,7 +67255,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69572,7 +67283,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69595,7 +67305,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69618,7 +67327,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69641,7 +67349,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69664,7 +67371,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69687,7 +67393,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69710,7 +67415,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69733,7 +67437,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69759,7 +67462,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69785,7 +67487,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69808,7 +67509,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69831,7 +67531,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69859,7 +67558,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69900,17 +67598,10 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge { ~Test_TC_WNCV_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_2\n"); @@ -70015,17 +67706,10 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { ~Test_TC_WNCV_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_3\n"); @@ -70282,7 +67966,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70304,7 +67987,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70326,7 +68008,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70348,7 +68029,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70370,7 +68050,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70393,7 +68072,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70418,7 +68096,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70438,7 +68115,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70460,7 +68136,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70482,7 +68157,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70504,7 +68178,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70523,7 +68196,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70545,7 +68217,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70566,7 +68237,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70591,7 +68261,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70613,7 +68282,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70632,7 +68300,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70667,17 +68334,10 @@ class Test_TC_WNCV_2_4 : public TestCommandBridge { ~Test_TC_WNCV_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_4\n"); @@ -70780,17 +68440,10 @@ class Test_TC_WNCV_2_5 : public TestCommandBridge { ~Test_TC_WNCV_2_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_5\n"); @@ -70870,7 +68523,6 @@ class Test_TC_WNCV_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70906,17 +68558,10 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { ~Test_TC_WNCV_3_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_1\n"); @@ -71291,7 +68936,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71318,7 +68962,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71347,7 +68990,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71375,7 +69017,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71404,7 +69045,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71434,7 +69074,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71455,7 +69094,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71489,7 +69127,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71516,7 +69153,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71541,7 +69177,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71574,7 +69209,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71594,7 +69228,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71614,7 +69247,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71634,7 +69266,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71654,7 +69285,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71682,7 +69312,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71711,7 +69340,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71739,7 +69367,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71768,7 +69395,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71796,7 +69422,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71823,7 +69448,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71855,7 +69479,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71883,7 +69506,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71924,17 +69546,10 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { ~Test_TC_WNCV_3_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_2\n"); @@ -72309,7 +69924,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72336,7 +69950,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72365,7 +69978,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72393,7 +70005,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72422,7 +70033,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72452,7 +70062,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72473,7 +70082,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72507,7 +70115,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72534,7 +70141,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72559,7 +70165,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72592,7 +70197,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72612,7 +70216,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72632,7 +70235,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72652,7 +70254,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72672,7 +70273,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72700,7 +70300,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72729,7 +70328,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72757,7 +70355,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72786,7 +70383,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72814,7 +70410,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72841,7 +70436,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72873,7 +70467,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72901,7 +70494,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72942,17 +70534,10 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { ~Test_TC_WNCV_3_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_3\n"); @@ -73190,7 +70775,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73217,7 +70801,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73244,7 +70827,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73275,7 +70857,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73296,7 +70877,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73330,7 +70910,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73357,7 +70936,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73389,7 +70967,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73414,7 +70991,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73446,7 +71022,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73478,7 +71053,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73510,7 +71084,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73556,17 +71129,10 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { ~Test_TC_WNCV_3_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_4\n"); @@ -73735,7 +71301,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73762,7 +71327,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73789,7 +71353,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73813,7 +71376,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73839,7 +71401,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73864,7 +71425,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73890,7 +71450,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73930,17 +71489,10 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { ~Test_TC_WNCV_3_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_5\n"); @@ -74109,7 +71661,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74136,7 +71687,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74163,7 +71713,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74187,7 +71736,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74213,7 +71761,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74238,7 +71785,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74264,7 +71810,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74303,17 +71848,10 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { ~Test_TC_WNCV_4_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_1\n"); @@ -74558,7 +72096,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74585,7 +72122,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74609,7 +72145,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74639,7 +72174,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74672,7 +72206,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74696,7 +72229,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74722,7 +72254,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74747,7 +72278,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74777,7 +72307,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74810,7 +72339,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74834,7 +72362,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74860,7 +72387,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74899,17 +72425,10 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { ~Test_TC_WNCV_4_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_2\n"); @@ -75154,7 +72673,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75181,7 +72699,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75205,7 +72722,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75235,7 +72751,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75268,7 +72783,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75292,7 +72806,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75318,7 +72831,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75343,7 +72855,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75373,7 +72884,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75406,7 +72916,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75430,7 +72939,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75456,7 +72964,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75494,17 +73001,10 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { ~Test_TC_WNCV_4_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_3\n"); @@ -75632,7 +73132,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75664,7 +73163,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75699,7 +73197,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75724,7 +73221,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75749,7 +73245,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75787,17 +73282,10 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { ~Test_TC_WNCV_4_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_4\n"); @@ -75925,7 +73413,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75957,7 +73444,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75992,7 +73478,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76017,7 +73502,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76042,7 +73526,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76080,17 +73563,10 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { ~Test_TC_WNCV_4_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_5\n"); @@ -76313,7 +73789,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76332,7 +73807,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76363,7 +73837,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76390,7 +73863,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76421,7 +73893,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76449,7 +73920,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76477,7 +73947,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76530,7 +73999,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76561,7 +74029,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76605,17 +74072,10 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { ~TV_TargetNavigatorCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_TargetNavigatorCluster\n"); @@ -76705,7 +74165,6 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76737,7 +74196,6 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76761,7 +74219,6 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76808,17 +74265,10 @@ class TV_AudioOutputCluster : public TestCommandBridge { ~TV_AudioOutputCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_AudioOutputCluster\n"); @@ -76922,7 +74372,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76958,7 +74407,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76982,7 +74430,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77004,7 +74451,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77027,7 +74473,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77076,17 +74521,10 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { ~TV_ApplicationLauncherCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_ApplicationLauncherCluster\n"); @@ -77190,7 +74628,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77218,7 +74655,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77245,7 +74681,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77286,7 +74721,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77325,7 +74759,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77377,17 +74810,10 @@ class TV_KeypadInputCluster : public TestCommandBridge { ~TV_KeypadInputCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_KeypadInputCluster\n"); @@ -77463,7 +74889,6 @@ class TV_KeypadInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77503,17 +74928,10 @@ class TV_AccountLoginCluster : public TestCommandBridge { ~TV_AccountLoginCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_AccountLoginCluster\n"); @@ -77603,7 +75021,6 @@ class TV_AccountLoginCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77631,7 +75048,6 @@ class TV_AccountLoginCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77654,7 +75070,6 @@ class TV_AccountLoginCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77686,17 +75101,10 @@ class TV_WakeOnLanCluster : public TestCommandBridge { ~TV_WakeOnLanCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_WakeOnLanCluster\n"); @@ -77772,7 +75180,6 @@ class TV_WakeOnLanCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77809,17 +75216,10 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { ~TV_ApplicationBasicCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_ApplicationBasicCluster\n"); @@ -77944,7 +75344,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77968,7 +75367,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77992,7 +75390,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78016,7 +75413,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78040,7 +75436,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78064,7 +75459,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78092,7 +75486,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78116,7 +75509,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78155,17 +75547,10 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { ~TV_MediaPlaybackCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_MediaPlaybackCluster\n"); @@ -78381,7 +75766,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78405,7 +75789,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78430,7 +75813,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78455,7 +75837,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78486,7 +75867,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78510,7 +75890,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78535,7 +75914,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78560,7 +75938,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78589,7 +75966,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78618,7 +75994,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78647,7 +76022,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78677,7 +76051,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78707,7 +76080,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78736,7 +76108,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78765,7 +76136,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78795,7 +76165,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78828,7 +76197,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78859,7 +76227,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78892,7 +76259,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78923,7 +76289,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78955,7 +76320,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78999,17 +76363,10 @@ class TV_ChannelCluster : public TestCommandBridge { ~TV_ChannelCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_ChannelCluster\n"); @@ -79120,7 +76477,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79174,7 +76530,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79206,7 +76561,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79238,7 +76592,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79271,7 +76624,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79294,7 +76646,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79329,17 +76680,10 @@ class TV_LowPowerCluster : public TestCommandBridge { ~TV_LowPowerCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_LowPowerCluster\n"); @@ -79415,7 +76759,6 @@ class TV_LowPowerCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79447,17 +76790,10 @@ class TV_ContentLauncherCluster : public TestCommandBridge { ~TV_ContentLauncherCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_ContentLauncherCluster\n"); @@ -79554,7 +76890,6 @@ class TV_ContentLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79580,7 +76915,6 @@ class TV_ContentLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79604,7 +76938,6 @@ class TV_ContentLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79656,7 +76989,6 @@ class TV_ContentLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79900,17 +77232,10 @@ class TV_MediaInputCluster : public TestCommandBridge { ~TV_MediaInputCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_MediaInputCluster\n"); @@ -80028,7 +77353,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80064,7 +77388,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80088,7 +77411,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80110,7 +77432,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80129,7 +77450,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80148,7 +77468,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80171,7 +77490,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80221,17 +77539,10 @@ class TestCASERecovery : public TestCommandBridge { ~TestCASERecovery() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestCASERecovery\n"); @@ -80342,7 +77653,6 @@ class TestCASERecovery : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80383,7 +77693,6 @@ class TestCASERecovery : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80413,7 +77722,6 @@ class TestCASERecovery : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80450,17 +77758,10 @@ class TestCluster : public TestCommandBridge { ~TestCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestCluster\n"); @@ -84065,7 +81366,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84084,7 +81384,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84104,7 +81403,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84129,7 +81427,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84158,7 +81455,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84185,7 +81481,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84209,7 +81504,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84231,7 +81525,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84255,7 +81548,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84277,7 +81569,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84301,7 +81592,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84325,7 +81615,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84347,7 +81636,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84371,7 +81659,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84393,7 +81680,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84417,7 +81703,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84441,7 +81726,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84463,7 +81747,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84487,7 +81770,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84509,7 +81791,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84533,7 +81814,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84557,7 +81837,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84579,7 +81858,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84603,7 +81881,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84625,7 +81902,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84649,7 +81925,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84673,7 +81948,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84695,7 +81969,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84719,7 +81992,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84741,7 +82013,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84765,7 +82036,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84789,7 +82059,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84811,7 +82080,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84835,7 +82103,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84857,7 +82124,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84881,7 +82147,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84905,7 +82170,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84927,7 +82191,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84951,7 +82214,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84973,7 +82235,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84997,7 +82258,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85021,7 +82281,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85043,7 +82302,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85067,7 +82325,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85089,7 +82346,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85113,7 +82369,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85137,7 +82392,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85159,7 +82413,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85183,7 +82436,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85205,7 +82457,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85229,7 +82480,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85253,7 +82503,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85275,7 +82524,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85299,7 +82547,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85321,7 +82568,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85345,7 +82591,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85367,7 +82612,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85391,7 +82635,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85415,7 +82658,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85437,7 +82679,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85461,7 +82702,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85483,7 +82723,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85507,7 +82746,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85529,7 +82767,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85553,7 +82790,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85577,7 +82813,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85599,7 +82834,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85623,7 +82857,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85645,7 +82878,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85669,7 +82901,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85691,7 +82922,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85715,7 +82945,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85739,7 +82968,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85761,7 +82989,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85785,7 +83012,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85807,7 +83033,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85831,7 +83056,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85853,7 +83077,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85877,7 +83100,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85901,7 +83123,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85923,7 +83144,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85947,7 +83167,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85969,7 +83188,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85993,7 +83211,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86015,7 +83232,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86039,7 +83255,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86061,7 +83276,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86085,7 +83299,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86109,7 +83322,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86131,7 +83343,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86155,7 +83366,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86177,7 +83387,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86201,7 +83410,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86223,7 +83431,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86247,7 +83454,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86269,7 +83475,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86293,7 +83498,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86317,7 +83521,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86339,7 +83542,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86363,7 +83565,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86385,7 +83586,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86409,7 +83609,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86433,7 +83632,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86455,7 +83653,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86479,7 +83676,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86501,7 +83697,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86525,7 +83720,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86549,7 +83743,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86571,7 +83764,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86596,7 +83788,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86618,7 +83809,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86643,7 +83833,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86665,7 +83854,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86690,7 +83878,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86712,7 +83899,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86737,7 +83923,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86763,7 +83948,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86788,7 +83972,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86810,7 +83993,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86834,7 +84016,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86860,7 +84041,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86890,7 +84070,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86912,7 +84091,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86936,7 +84114,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86958,7 +84135,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86982,7 +84158,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87008,7 +84183,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87032,7 +84206,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87054,7 +84227,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87078,7 +84250,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87103,7 +84274,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87130,7 +84300,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87152,7 +84321,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87212,7 +84380,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87278,7 +84445,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87347,7 +84513,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87405,7 +84570,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87429,7 +84593,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87451,7 +84614,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87475,7 +84637,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87497,7 +84658,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87521,7 +84681,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87545,7 +84704,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87567,7 +84725,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87591,7 +84748,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87613,7 +84769,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87637,7 +84792,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87666,7 +84820,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87693,7 +84846,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(200) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87713,7 +84865,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87733,7 +84884,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87757,7 +84907,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87779,7 +84928,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87803,7 +84951,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87825,7 +84972,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87859,7 +85005,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87893,7 +85038,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87930,7 +85074,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87967,7 +85110,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88017,7 +85159,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88066,7 +85207,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88160,7 +85300,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88254,7 +85393,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88308,7 +85446,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88350,7 +85487,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88393,7 +85529,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88443,7 +85578,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88476,7 +85610,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88529,7 +85662,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88582,7 +85714,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88682,7 +85813,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88782,7 +85912,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88812,7 +85941,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88840,7 +85968,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88869,7 +85996,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88897,7 +86023,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88940,7 +86065,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88976,7 +86100,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89020,7 +86143,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89047,7 +86169,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89079,7 +86200,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89117,7 +86237,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89156,7 +86275,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89179,7 +86297,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89206,7 +86323,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89228,7 +86344,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89253,7 +86368,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89276,7 +86390,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89298,7 +86411,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89323,7 +86435,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89350,7 +86461,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89378,7 +86488,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89400,7 +86509,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89424,7 +86532,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89447,7 +86554,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89469,7 +86575,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89494,7 +86599,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89520,7 +86624,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89545,7 +86648,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89567,7 +86669,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89591,7 +86692,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89613,7 +86713,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89638,7 +86737,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89664,7 +86762,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89689,7 +86786,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89711,7 +86807,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89735,7 +86830,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89757,7 +86851,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89782,7 +86875,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89808,7 +86900,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89833,7 +86924,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89855,7 +86945,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89879,7 +86968,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89901,7 +86989,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89926,7 +87013,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89948,7 +87034,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89973,7 +87058,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89999,7 +87083,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90024,7 +87107,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90047,7 +87129,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90069,7 +87150,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90093,7 +87173,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90118,7 +87197,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90141,7 +87219,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90163,7 +87240,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90188,7 +87264,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90211,7 +87286,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90233,7 +87307,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90258,7 +87331,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90280,7 +87352,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90305,7 +87376,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90331,7 +87401,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90356,7 +87425,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90378,7 +87446,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90402,7 +87469,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90427,7 +87493,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90450,7 +87515,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90472,7 +87536,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90497,7 +87560,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90520,7 +87582,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90542,7 +87603,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90567,7 +87627,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90589,7 +87648,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90614,7 +87672,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90640,7 +87697,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90665,7 +87721,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90687,7 +87742,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90711,7 +87765,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90736,7 +87789,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90759,7 +87811,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90781,7 +87832,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90806,7 +87856,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90829,7 +87878,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90851,7 +87899,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90876,7 +87923,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90898,7 +87944,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90923,7 +87968,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90949,7 +87993,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90974,7 +88017,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90996,7 +88038,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91020,7 +88061,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91046,7 +88086,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91069,7 +88108,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91091,7 +88129,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91117,7 +88154,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91140,7 +88176,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91162,7 +88197,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91187,7 +88221,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91213,7 +88246,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91238,7 +88270,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91260,7 +88291,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91284,7 +88314,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91309,7 +88338,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91332,7 +88360,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91354,7 +88381,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91379,7 +88405,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91402,7 +88427,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91424,7 +88448,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91449,7 +88472,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91475,7 +88497,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91500,7 +88521,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91522,7 +88542,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91546,7 +88565,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91571,7 +88589,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91594,7 +88611,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91616,7 +88632,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91641,7 +88656,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91664,7 +88678,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91686,7 +88699,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91711,7 +88723,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91737,7 +88748,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91762,7 +88772,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91784,7 +88793,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91808,7 +88816,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91833,7 +88840,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91856,7 +88862,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91878,7 +88883,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91903,7 +88907,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91926,7 +88929,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91948,7 +88950,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91973,7 +88974,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91999,7 +88999,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92024,7 +89023,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92046,7 +89044,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92070,7 +89067,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92095,7 +89091,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92118,7 +89113,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92140,7 +89134,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92165,7 +89158,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92188,7 +89180,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92210,7 +89201,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92235,7 +89225,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92257,7 +89246,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92282,7 +89270,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92304,7 +89291,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92329,7 +89315,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92351,7 +89336,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92375,7 +89359,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92397,7 +89380,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92422,7 +89404,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92444,7 +89425,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92469,7 +89449,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92491,7 +89470,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92516,7 +89494,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92538,7 +89515,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92563,7 +89539,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92585,7 +89560,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92609,7 +89583,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92631,7 +89604,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92656,7 +89628,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92678,7 +89649,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92703,7 +89673,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92725,7 +89694,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92750,7 +89718,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92776,7 +89743,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92801,7 +89767,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92823,7 +89788,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92847,7 +89811,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92869,7 +89832,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92894,7 +89856,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92916,7 +89877,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92941,7 +89901,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92967,7 +89926,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92992,7 +89950,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93014,7 +89971,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93038,7 +89994,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93060,7 +90015,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93085,7 +90039,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93107,7 +90060,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93132,7 +90084,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93159,7 +90110,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93187,7 +90137,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93209,7 +90158,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93233,7 +90181,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93256,7 +90203,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93282,7 +90228,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93305,7 +90250,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93334,7 +90278,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93356,7 +90299,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93380,7 +90322,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93402,7 +90343,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93428,7 +90368,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93451,7 +90390,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93476,7 +90414,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93499,7 +90436,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93527,7 +90463,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93556,7 +90491,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93578,7 +90512,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93602,7 +90535,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93624,7 +90556,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93649,7 +90580,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93672,7 +90602,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(200) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93692,7 +90621,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93712,7 +90640,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93739,7 +90666,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93765,7 +90691,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93794,7 +90719,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93828,7 +90752,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93857,7 +90780,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93885,7 +90807,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93909,7 +90830,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93937,7 +90857,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93965,7 +90884,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93993,7 +90911,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94021,7 +90938,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94045,7 +90961,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94069,7 +90984,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94093,7 +91007,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94117,7 +91030,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94141,7 +91053,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94165,7 +91076,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94189,7 +91099,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94213,7 +91122,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94241,7 +91149,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94269,7 +91176,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94297,7 +91203,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94325,7 +91230,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94349,7 +91253,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94373,7 +91276,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94397,7 +91299,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94421,7 +91322,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94445,7 +91345,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94469,7 +91368,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94493,7 +91391,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94517,7 +91414,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94544,7 +91440,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94572,7 +91467,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94600,7 +91494,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94627,7 +91520,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94651,7 +91543,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94676,7 +91567,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94700,7 +91590,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94725,7 +91614,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94749,7 +91637,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94773,7 +91660,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94797,7 +91683,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94821,7 +91706,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94849,7 +91733,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94877,7 +91760,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94905,7 +91787,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94933,7 +91814,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94957,7 +91837,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94981,7 +91860,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95005,7 +91883,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95029,7 +91906,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95053,7 +91929,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95077,7 +91952,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95101,7 +91975,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95126,7 +91999,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95154,7 +92026,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95182,7 +92053,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95210,7 +92080,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95238,7 +92107,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95263,7 +92131,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95287,7 +92154,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95312,7 +92178,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95336,7 +92201,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95361,7 +92225,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95385,7 +92248,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95410,7 +92272,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95434,7 +92295,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95458,7 +92318,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95483,7 +92342,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95511,7 +92369,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95539,7 +92396,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95567,7 +92423,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95595,7 +92450,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95620,7 +92474,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95644,7 +92497,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95669,7 +92521,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95693,7 +92544,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95718,7 +92568,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95742,7 +92591,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95767,7 +92615,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95791,7 +92638,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95815,7 +92661,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95840,7 +92685,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95868,7 +92712,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95896,7 +92739,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95924,7 +92766,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95952,7 +92793,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95977,7 +92817,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96001,7 +92840,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96026,7 +92864,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96050,7 +92887,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96075,7 +92911,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96099,7 +92934,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96124,7 +92958,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96148,7 +92981,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96172,7 +93004,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96197,7 +93028,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96225,7 +93055,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96253,7 +93082,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96281,7 +93109,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96309,7 +93136,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96334,7 +93160,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96358,7 +93183,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96383,7 +93207,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96407,7 +93230,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96432,7 +93254,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96456,7 +93277,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96481,7 +93301,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96505,7 +93324,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96529,7 +93347,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96555,7 +93372,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96583,7 +93399,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96603,7 +93418,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96623,7 +93437,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96665,7 +93478,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96698,7 +93510,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96729,7 +93540,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96775,17 +93585,10 @@ class TestConstraints : public TestCommandBridge { ~TestConstraints() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestConstraints\n"); @@ -97087,7 +93890,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97116,7 +93918,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97139,7 +93940,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97161,7 +93961,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97186,7 +93985,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97210,7 +94008,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97232,7 +94029,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97256,7 +94052,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97280,7 +94075,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97304,7 +94098,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97328,7 +94121,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97350,7 +94142,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97372,7 +94163,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97393,7 +94183,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97414,7 +94203,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97435,7 +94223,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97457,7 +94244,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97479,7 +94265,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97499,7 +94284,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97519,7 +94303,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97539,7 +94322,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97559,7 +94341,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97581,7 +94362,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97602,7 +94382,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97624,7 +94403,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97645,7 +94423,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97667,7 +94444,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97688,7 +94464,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97710,7 +94485,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97730,7 +94504,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97752,7 +94525,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97772,7 +94544,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97807,17 +94578,10 @@ class TestDelayCommands : public TestCommandBridge { ~TestDelayCommands() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestDelayCommands\n"); @@ -97914,17 +94678,10 @@ class TestLogCommands : public TestCommandBridge { ~TestLogCommands() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestLogCommands\n"); @@ -98036,17 +94793,10 @@ class TestSaveAs : public TestCommandBridge { ~TestSaveAs() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSaveAs\n"); @@ -98885,7 +95635,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -98917,7 +95666,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -98946,7 +95694,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -98974,7 +95721,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99001,7 +95747,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99023,7 +95768,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99044,7 +95788,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99066,7 +95809,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99091,7 +95833,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99118,7 +95859,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99140,7 +95880,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99161,7 +95900,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99183,7 +95921,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99208,7 +95945,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99235,7 +95971,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99257,7 +95992,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99278,7 +96012,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99300,7 +96033,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99325,7 +96057,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99352,7 +96083,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99374,7 +96104,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99395,7 +96124,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99417,7 +96145,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99442,7 +96169,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99469,7 +96195,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99491,7 +96216,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99512,7 +96236,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99534,7 +96257,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99559,7 +96281,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99586,7 +96307,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99608,7 +96328,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99629,7 +96348,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99651,7 +96369,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99676,7 +96393,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99703,7 +96419,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99725,7 +96440,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99746,7 +96460,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99768,7 +96481,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99793,7 +96505,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99820,7 +96531,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99842,7 +96552,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99863,7 +96572,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99885,7 +96593,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99910,7 +96617,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99937,7 +96643,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99959,7 +96664,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99980,7 +96684,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100002,7 +96705,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100027,7 +96729,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100054,7 +96755,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100076,7 +96776,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100097,7 +96796,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100119,7 +96817,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100144,7 +96841,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100171,7 +96867,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100193,7 +96888,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100214,7 +96908,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100236,7 +96929,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100261,7 +96953,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100288,7 +96979,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100310,7 +97000,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100331,7 +97020,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100353,7 +97041,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100378,7 +97065,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100405,7 +97091,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100427,7 +97112,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100448,7 +97132,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100470,7 +97153,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100495,7 +97177,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100522,7 +97203,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100544,7 +97224,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100565,7 +97244,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100587,7 +97265,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100612,7 +97289,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100639,7 +97315,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100661,7 +97336,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100682,7 +97356,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100704,7 +97377,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100729,7 +97401,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100756,7 +97427,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100778,7 +97448,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100799,7 +97468,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100821,7 +97489,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100846,7 +97513,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100873,7 +97539,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100895,7 +97560,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100916,7 +97580,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100938,7 +97601,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100963,7 +97625,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100990,7 +97651,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101012,7 +97672,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101033,7 +97692,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101055,7 +97713,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101080,7 +97737,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101107,7 +97763,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101131,7 +97786,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101154,7 +97808,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101183,7 +97836,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101209,7 +97861,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101231,7 +97882,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101255,7 +97905,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101278,7 +97927,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101305,7 +97953,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101329,7 +97976,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101352,7 +97998,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101382,7 +98027,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101408,7 +98052,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101431,7 +98074,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101456,7 +98098,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101493,17 +98134,10 @@ class TestConfigVariables : public TestCommandBridge { ~TestConfigVariables() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestConfigVariables\n"); @@ -101589,7 +98223,6 @@ class TestConfigVariables : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101621,7 +98254,6 @@ class TestConfigVariables : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101664,17 +98296,10 @@ class TestDescriptorCluster : public TestCommandBridge { ~TestDescriptorCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestDescriptorCluster\n"); @@ -101771,7 +98396,6 @@ class TestDescriptorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101798,7 +98422,6 @@ class TestDescriptorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101850,7 +98473,6 @@ class TestDescriptorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101875,7 +98497,6 @@ class TestDescriptorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101914,17 +98535,10 @@ class TestBasicInformation : public TestCommandBridge { ~TestBasicInformation() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestBasicInformation\n"); @@ -102112,7 +98726,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102136,7 +98749,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102158,7 +98770,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102182,7 +98793,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102204,7 +98814,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102253,7 +98862,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102277,7 +98885,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102299,7 +98906,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102323,7 +98929,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102347,7 +98952,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102369,7 +98973,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102408,7 +99011,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102432,7 +99034,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102454,7 +99055,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102478,7 +99078,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102515,17 +99114,10 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { ~TestFabricRemovalWhileSubscribed() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestFabricRemovalWhileSubscribed\n"); @@ -102652,7 +99244,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102680,7 +99271,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102707,7 +99297,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102750,7 +99339,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102773,7 +99361,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102809,7 +99396,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102849,17 +99435,10 @@ class TestGeneralCommissioning : public TestCommandBridge { ~TestGeneralCommissioning() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestGeneralCommissioning\n"); @@ -103143,7 +99722,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103167,7 +99745,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103193,7 +99770,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103217,7 +99793,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103258,7 +99833,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103284,7 +99858,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103308,7 +99881,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103334,7 +99906,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103361,7 +99932,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103387,7 +99957,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103411,7 +99980,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103442,7 +100010,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103468,7 +100035,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103509,7 +100075,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103540,7 +100105,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103566,7 +100130,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103597,7 +100160,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103623,7 +100185,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103650,7 +100211,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103676,7 +100236,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103703,7 +100262,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103729,7 +100287,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103760,7 +100317,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103786,7 +100342,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103817,7 +100372,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103843,7 +100397,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103878,17 +100431,10 @@ class TestIdentifyCluster : public TestCommandBridge { ~TestIdentifyCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestIdentifyCluster\n"); @@ -103964,7 +100510,6 @@ class TestIdentifyCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -103999,17 +100544,10 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { ~TestOperationalCredentialsCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestOperationalCredentialsCluster\n"); @@ -104127,7 +100665,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104151,7 +100688,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104176,7 +100712,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104203,7 +100738,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104233,7 +100767,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104269,7 +100802,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104304,7 +100836,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104353,17 +100884,10 @@ class TestModeSelectCluster : public TestCommandBridge { ~TestModeSelectCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestModeSelectCluster\n"); @@ -104650,7 +101174,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104674,7 +101197,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104699,7 +101221,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104756,7 +101277,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104780,7 +101300,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104805,7 +101324,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104829,7 +101347,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104852,7 +101369,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104879,7 +101395,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104904,7 +101419,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104923,7 +101437,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104942,7 +101455,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104966,7 +101478,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104992,7 +101503,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105015,7 +101525,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105043,7 +101552,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105062,7 +101570,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105081,7 +101588,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105105,7 +101611,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105131,7 +101636,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105153,7 +101657,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105178,7 +101681,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105200,7 +101702,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105222,7 +101723,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105259,7 +101759,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105283,7 +101782,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105320,7 +101818,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105357,17 +101854,10 @@ class TestSelfFabricRemoval : public TestCommandBridge { ~TestSelfFabricRemoval() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSelfFabricRemoval\n"); @@ -105457,7 +101947,6 @@ class TestSelfFabricRemoval : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -105485,7 +101974,6 @@ class TestSelfFabricRemoval : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -105512,7 +102000,6 @@ class TestSelfFabricRemoval : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -105551,17 +102038,10 @@ class TestSystemCommands : public TestCommandBridge { ~TestSystemCommands() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSystemCommands\n"); @@ -105988,17 +102468,10 @@ class TestBinding : public TestCommandBridge { ~TestBinding() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestBinding\n"); @@ -106123,7 +102596,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106148,7 +102620,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106175,7 +102646,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106214,7 +102684,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106254,7 +102723,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106299,7 +102767,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106329,7 +102796,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106362,7 +102828,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106420,17 +102885,10 @@ class TestUserLabelCluster : public TestCommandBridge { ~TestUserLabelCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestUserLabelCluster\n"); @@ -106555,7 +103013,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106596,7 +103053,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106631,7 +103087,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106656,7 +103111,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106680,7 +103134,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106736,7 +103189,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106784,17 +103236,10 @@ class TestUserLabelClusterConstraints : public TestCommandBridge { ~TestUserLabelClusterConstraints() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestUserLabelClusterConstraints\n"); @@ -106877,7 +103322,6 @@ class TestUserLabelClusterConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106910,7 +103354,6 @@ class TestUserLabelClusterConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106955,17 +103398,10 @@ class TestArmFailSafe : public TestCommandBridge { ~TestArmFailSafe() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestArmFailSafe\n"); @@ -107096,7 +103532,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107132,7 +103567,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107163,7 +103597,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107187,7 +103620,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107215,7 +103647,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107245,7 +103676,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107272,7 +103702,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107314,17 +103743,10 @@ class TestFanControl : public TestCommandBridge { ~TestFanControl() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestFanControl\n"); @@ -107561,7 +103983,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107583,7 +104004,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107607,7 +104027,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107629,7 +104048,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107653,7 +104071,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107675,7 +104092,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107700,7 +104116,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107725,7 +104140,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107749,7 +104163,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107771,7 +104184,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107796,7 +104208,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107818,7 +104229,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107843,7 +104253,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107868,7 +104277,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107892,7 +104300,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107914,7 +104321,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107939,7 +104345,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107961,7 +104366,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107986,7 +104390,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108010,7 +104413,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108035,7 +104437,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108059,7 +104460,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108081,7 +104481,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108105,7 +104504,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108142,17 +104540,10 @@ class TestAccessControlConstraints : public TestCommandBridge { ~TestAccessControlConstraints() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestAccessControlConstraints\n"); @@ -108296,7 +104687,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108345,7 +104735,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108396,7 +104785,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108445,7 +104833,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108495,7 +104882,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108549,7 +104935,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108605,7 +104990,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108651,7 +105035,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108703,7 +105086,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108755,7 +105137,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108820,17 +105201,10 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { ~TestLevelControlWithOnOffDependency() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestLevelControlWithOnOffDependency\n"); @@ -109123,7 +105497,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109156,7 +105529,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109181,7 +105553,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109211,7 +105582,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109235,7 +105605,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109265,7 +105634,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109290,7 +105658,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109314,7 +105681,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109333,7 +105699,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109365,7 +105730,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109390,7 +105754,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109409,7 +105772,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109441,7 +105803,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109466,7 +105827,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109499,7 +105859,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109524,7 +105883,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109554,7 +105912,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109578,7 +105935,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109597,7 +105953,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109629,7 +105984,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109654,7 +106008,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109673,7 +106026,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109705,7 +106057,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109746,17 +106097,10 @@ class TestCommissioningWindow : public TestCommandBridge { ~TestCommissioningWindow() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestCommissioningWindow\n"); @@ -110018,7 +106362,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110043,7 +106386,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110069,7 +106411,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110095,7 +106436,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110121,7 +106461,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110145,7 +106484,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110171,7 +106509,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110202,7 +106539,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110227,7 +106563,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110248,7 +106583,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110274,7 +106608,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110300,7 +106633,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110326,7 +106658,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110367,7 +106698,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110393,7 +106723,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110419,7 +106748,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110446,7 +106774,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110471,7 +106798,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110495,7 +106821,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110521,7 +106846,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110553,7 +106877,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110581,7 +106904,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110606,7 +106928,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110632,7 +106953,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110658,7 +106978,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110703,17 +107022,10 @@ class TestCommissionerNodeId : public TestCommandBridge { ~TestCommissionerNodeId() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestCommissionerNodeId\n"); @@ -110765,48 +107077,60 @@ class TestCommissionerNodeId : public TestCommandBridge { err = TestReadTheFabricIdFromTheAlphaFabric_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : Read the fabric ID from the beta fabric\n"); - err = TestReadTheFabricIdFromTheBetaFabric_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : Read the commissioner node ID from the alpha fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheAlphaFabric_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : Read the fabric ID from the gamma fabric\n"); - err = TestReadTheFabricIdFromTheGammaFabric_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : Read the fabric ID from the beta fabric\n"); + err = TestReadTheFabricIdFromTheBetaFabric_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : Read the ACL from alpha and check commissioner node id\n"); - err = TestReadTheAclFromAlphaAndCheckCommissionerNodeId_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : Read the commissioner node ID from the beta fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheBetaFabric_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : Read the ACL from beta and check commissioner node id\n"); - err = TestReadTheAclFromBetaAndCheckCommissionerNodeId_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : Read the fabric ID from the gamma fabric\n"); + err = TestReadTheFabricIdFromTheGammaFabric_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : Read the ACL from gamma and check commissioner node id\n"); - err = TestReadTheAclFromGammaAndCheckCommissionerNodeId_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : Read the commissioner node ID from the gamma fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheGammaFabric_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : Write the ACL using the commissioner node id value\n"); - err = TestWriteTheAclUsingTheCommissionerNodeIdValue_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : Read the ACL from alpha and check commissioner node id\n"); + err = TestReadTheAclFromAlphaAndCheckCommissionerNodeId_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : Write the ACL using the commissioner node id value\n"); - err = TestWriteTheAclUsingTheCommissionerNodeIdValue_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : Read the ACL from beta and check commissioner node id\n"); + err = TestReadTheAclFromBetaAndCheckCommissionerNodeId_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : Read the ACL from beta and check commissioner node id\n"); - err = TestReadTheAclFromBetaAndCheckCommissionerNodeId_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : Read the ACL from gamma and check commissioner node id\n"); + err = TestReadTheAclFromGammaAndCheckCommissionerNodeId_15(); break; case 16: - ChipLogProgress(chipTool, " ***** Test Step 16 : Read the ACL from gamma and check commissioner node id\n"); - err = TestReadTheAclFromGammaAndCheckCommissionerNodeId_16(); + ChipLogProgress(chipTool, " ***** Test Step 16 : Write the ACL using the commissioner node id value\n"); + err = TestWriteTheAclUsingTheCommissionerNodeIdValue_16(); break; case 17: - ChipLogProgress(chipTool, " ***** Test Step 17 : Remove beta fabric\n"); - err = TestRemoveBetaFabric_17(); + ChipLogProgress(chipTool, " ***** Test Step 17 : Write the ACL using the commissioner node id value\n"); + err = TestWriteTheAclUsingTheCommissionerNodeIdValue_17(); break; case 18: - ChipLogProgress(chipTool, " ***** Test Step 18 : Remove gamma fabric\n"); - err = TestRemoveGammaFabric_18(); + ChipLogProgress(chipTool, " ***** Test Step 18 : Read the ACL from beta and check commissioner node id\n"); + err = TestReadTheAclFromBetaAndCheckCommissionerNodeId_18(); + break; + case 19: + ChipLogProgress(chipTool, " ***** Test Step 19 : Read the ACL from gamma and check commissioner node id\n"); + err = TestReadTheAclFromGammaAndCheckCommissionerNodeId_19(); + break; + case 20: + ChipLogProgress(chipTool, " ***** Test Step 20 : Remove beta fabric\n"); + err = TestRemoveBetaFabric_20(); + break; + case 21: + ChipLogProgress(chipTool, " ***** Test Step 21 : Remove gamma fabric\n"); + err = TestRemoveGammaFabric_21(); break; } @@ -110876,6 +107200,15 @@ class TestCommissionerNodeId : public TestCommandBridge { case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 19: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 20: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 21: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -110889,7 +107222,7 @@ class TestCommissionerNodeId : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 19; + const uint16_t mTestCount = 22; chip::Optional mNodeId; chip::Optional mEndpoint; @@ -110909,7 +107242,6 @@ class TestCommissionerNodeId : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110950,7 +107282,6 @@ class TestCommissionerNodeId : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110992,7 +107323,6 @@ class TestCommissionerNodeId : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111012,13 +107342,25 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdAlpha; + + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheAlphaFabric_8() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdAlpha = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } NSNumber * _Nonnull betaIndex; - CHIP_ERROR TestReadTheFabricIdFromTheBetaFabric_8() + CHIP_ERROR TestReadTheFabricIdFromTheBetaFabric_9() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111038,13 +107380,25 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdBeta; + + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheBetaFabric_10() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("beta", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdBeta = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } NSNumber * _Nonnull gammaIndex; - CHIP_ERROR TestReadTheFabricIdFromTheGammaFabric_9() + CHIP_ERROR TestReadTheFabricIdFromTheGammaFabric_11() { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111064,12 +107418,24 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdGamma; + + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheGammaFabric_12() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("gamma", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdGamma = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } - CHIP_ERROR TestReadTheAclFromAlphaAndCheckCommissionerNodeId_10() + CHIP_ERROR TestReadTheAclFromAlphaAndCheckCommissionerNodeId_13() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111095,7 +107461,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdAlpha)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111109,11 +107475,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheAclFromBetaAndCheckCommissionerNodeId_11() + CHIP_ERROR TestReadTheAclFromBetaAndCheckCommissionerNodeId_14() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111139,7 +107504,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdBeta)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111153,11 +107518,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheAclFromGammaAndCheckCommissionerNodeId_12() + CHIP_ERROR TestReadTheAclFromGammaAndCheckCommissionerNodeId_15() { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111183,7 +107547,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdGamma)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111197,11 +107561,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteTheAclUsingTheCommissionerNodeIdValue_13() + CHIP_ERROR TestWriteTheAclUsingTheCommissionerNodeIdValue_16() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111213,7 +107576,7 @@ class TestCommissionerNodeId : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdBeta copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -111233,11 +107596,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteTheAclUsingTheCommissionerNodeIdValue_14() + CHIP_ERROR TestWriteTheAclUsingTheCommissionerNodeIdValue_17() { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111249,7 +107611,7 @@ class TestCommissionerNodeId : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdGamma copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -111269,11 +107631,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheAclFromBetaAndCheckCommissionerNodeId_15() + CHIP_ERROR TestReadTheAclFromBetaAndCheckCommissionerNodeId_18() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111299,7 +107660,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdBeta)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111313,11 +107674,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheAclFromGammaAndCheckCommissionerNodeId_16() + CHIP_ERROR TestReadTheAclFromGammaAndCheckCommissionerNodeId_19() { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111343,7 +107703,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdGamma)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111357,11 +107717,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRemoveBetaFabric_17() + CHIP_ERROR TestRemoveBetaFabric_20() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111382,11 +107741,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRemoveGammaFabric_18() + CHIP_ERROR TestRemoveGammaFabric_21() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111428,17 +107786,10 @@ class TestMultiAdmin : public TestCommandBridge { ~TestMultiAdmin() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestMultiAdmin\n"); @@ -111656,7 +108007,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111689,7 +108039,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111721,7 +108070,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111742,7 +108090,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111783,7 +108130,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111825,7 +108171,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111852,7 +108197,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111874,7 +108218,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111895,7 +108238,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111930,17 +108272,10 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { ~Test_TC_DGSW_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGSW_1_1\n"); @@ -112120,7 +108455,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112147,7 +108481,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112174,7 +108507,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112196,7 +108528,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112224,7 +108555,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112248,7 +108578,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112272,7 +108601,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112296,7 +108624,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112320,7 +108647,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112344,7 +108670,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112371,7 +108696,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112411,17 +108735,10 @@ class TestSubscribe_OnOff : public TestCommandBridge { ~TestSubscribe_OnOff() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSubscribe_OnOff\n"); @@ -112539,7 +108856,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112560,7 +108876,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112585,7 +108900,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112619,7 +108933,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112638,7 +108951,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112662,7 +108974,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112681,7 +108992,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112719,17 +109029,10 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { ~TestSubscribe_AdministratorCommissioning() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSubscribe_AdministratorCommissioning\n"); @@ -112933,7 +109236,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112960,7 +109262,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112988,7 +109289,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113024,7 +109324,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113048,7 +109347,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113075,7 +109373,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113096,7 +109393,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113125,7 +109421,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113153,7 +109448,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113189,7 +109483,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113213,7 +109506,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113241,7 +109533,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113262,7 +109553,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113291,7 +109581,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113319,7 +109608,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113355,7 +109643,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113379,7 +109666,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113411,7 +109697,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113432,7 +109717,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113472,17 +109756,10 @@ class DL_UsersAndCredentials : public TestCommandBridge { ~DL_UsersAndCredentials() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: DL_UsersAndCredentials\n"); @@ -114419,7 +110696,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114492,7 +110768,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114519,7 +110794,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114543,7 +110817,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114567,7 +110840,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114595,7 +110867,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114673,7 +110944,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114703,7 +110973,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114731,7 +111000,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114809,7 +111077,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114837,7 +111104,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114916,7 +111182,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114944,7 +111209,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115023,7 +111287,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115051,7 +111314,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115130,7 +111392,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115158,7 +111419,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115237,7 +111497,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115265,7 +111524,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115344,7 +111602,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115372,7 +111629,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115451,7 +111707,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115481,7 +111736,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115553,7 +111807,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115583,7 +111836,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115655,7 +111907,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115683,7 +111934,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115762,7 +112012,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115790,7 +112039,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115868,7 +112116,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115898,7 +112145,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115928,7 +112174,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115950,7 +112195,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116023,7 +112267,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116051,7 +112294,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116130,7 +112372,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116155,7 +112396,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116180,7 +112420,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116202,7 +112441,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116274,7 +112512,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116347,7 +112584,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116374,7 +112610,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116425,7 +112660,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116476,7 +112710,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116529,7 +112762,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116576,7 +112808,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116623,7 +112854,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116671,7 +112901,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116754,7 +112983,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116808,7 +113036,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116855,7 +113082,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116903,7 +113129,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116930,7 +113155,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116981,7 +113205,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117029,7 +113252,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117082,7 +113304,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117133,7 +113354,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117180,7 +113400,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117267,7 +113486,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117321,7 +113539,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117368,7 +113585,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117415,7 +113631,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117462,7 +113677,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117509,7 +113723,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117556,7 +113769,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117603,7 +113815,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117650,7 +113861,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117697,7 +113907,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117744,7 +113953,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117791,7 +113999,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117838,7 +114045,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117885,7 +114091,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117933,7 +114138,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117980,7 +114184,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118027,7 +114230,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118119,7 +114321,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118166,7 +114367,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118262,7 +114462,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118287,7 +114486,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118339,7 +114537,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118431,7 +114628,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118456,7 +114652,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118508,7 +114703,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118580,7 +114774,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118628,7 +114821,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118653,7 +114845,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118704,7 +114895,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118755,7 +114945,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118806,7 +114995,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118890,7 +115078,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118962,7 +115149,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119010,7 +115196,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119058,7 +115243,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119106,7 +115290,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119128,7 +115311,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119179,7 +115361,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119230,7 +115411,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119281,7 +115461,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119353,7 +115532,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119425,7 +115603,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119497,7 +115674,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119569,7 +115745,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119615,7 +115790,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119662,7 +115836,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119745,7 +115918,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119799,7 +115971,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119845,7 +116016,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119873,7 +116043,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119901,7 +116070,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119929,7 +116097,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119958,7 +116125,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119986,7 +116152,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120015,7 +116180,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120037,7 +116201,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120109,7 +116272,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120160,7 +116322,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120208,7 +116369,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120255,7 +116415,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120302,7 +116461,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120349,7 +116507,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120396,7 +116553,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120443,7 +116599,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120478,17 +116633,10 @@ class DL_LockUnlock : public TestCommandBridge { ~DL_LockUnlock() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: DL_LockUnlock\n"); @@ -120818,7 +116966,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120839,7 +116986,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120864,7 +117010,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120885,7 +117030,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120910,7 +117054,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120958,7 +117101,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120982,7 +117124,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121007,7 +117148,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121032,7 +117172,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121054,7 +117193,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121079,7 +117217,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121104,7 +117241,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121129,7 +117265,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121151,7 +117286,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121176,7 +117310,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121198,7 +117331,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121222,7 +117354,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121244,7 +117375,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121268,7 +117398,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121293,7 +117422,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121318,7 +117446,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121343,7 +117470,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121368,7 +117494,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121401,7 +117526,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121423,7 +117547,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121448,7 +117571,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121470,7 +117592,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121518,7 +117639,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121543,7 +117663,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121568,7 +117687,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121590,7 +117708,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121615,7 +117732,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121640,7 +117756,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121665,7 +117780,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121687,7 +117801,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121712,7 +117825,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121747,17 +117859,10 @@ class DL_Schedules : public TestCommandBridge { ~DL_Schedules() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: DL_Schedules\n"); @@ -122716,7 +118821,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122765,7 +118869,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122793,7 +118896,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122822,7 +118924,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122851,7 +118952,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122879,7 +118979,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122910,7 +119009,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122941,7 +119039,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122972,7 +119069,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123003,7 +119099,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123034,7 +119129,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123065,7 +119159,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123096,7 +119189,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123127,7 +119219,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123158,7 +119249,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123189,7 +119279,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123220,7 +119309,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123251,7 +119339,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123282,7 +119369,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123315,7 +119401,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123354,7 +119439,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123393,7 +119477,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123433,7 +119516,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123472,7 +119554,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123512,7 +119593,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123551,7 +119631,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123579,7 +119658,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123607,7 +119685,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123635,7 +119712,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123663,7 +119739,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123691,7 +119766,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123719,7 +119793,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123758,7 +119831,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123797,7 +119869,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123837,7 +119908,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123876,7 +119946,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123916,7 +119985,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123955,7 +120023,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123983,7 +120050,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124011,7 +120077,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124039,7 +120104,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124067,7 +120131,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124100,7 +120163,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124133,7 +120195,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124167,7 +120228,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124192,7 +120252,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124240,7 +120299,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124268,7 +120326,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124332,7 +120389,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124357,7 +120413,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124406,7 +120461,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124433,7 +120487,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124460,7 +120513,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124487,7 +120539,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124514,7 +120565,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124541,7 +120591,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124605,7 +120654,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124654,7 +120702,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124702,7 +120749,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124729,7 +120775,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124756,7 +120801,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124783,7 +120827,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124810,7 +120853,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124837,7 +120879,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124901,7 +120942,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124950,7 +120990,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124998,7 +121037,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125024,7 +121062,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125050,7 +121087,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125114,7 +121150,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125163,7 +121198,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125211,7 +121245,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125239,7 +121272,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125303,7 +121335,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125328,7 +121359,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125377,7 +121407,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125402,7 +121431,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125450,7 +121478,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125473,7 +121500,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125512,7 +121538,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125535,7 +121560,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125574,7 +121598,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125623,7 +121646,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125672,7 +121694,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125720,7 +121741,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125768,7 +121788,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125796,7 +121815,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125819,7 +121837,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125858,7 +121875,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125881,7 +121897,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125920,7 +121935,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125984,7 +121998,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126007,7 +122020,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126035,7 +122047,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126063,7 +122074,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126127,7 +122137,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126152,7 +122161,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126201,7 +122209,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126229,7 +122236,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126293,7 +122299,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126318,7 +122323,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126367,7 +122371,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126389,7 +122392,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126428,7 +122430,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126467,7 +122468,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126506,7 +122506,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126545,7 +122544,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126593,7 +122591,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126641,7 +122638,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126666,7 +122662,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126715,7 +122710,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126763,7 +122757,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126791,7 +122784,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126816,7 +122808,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126838,7 +122829,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126886,7 +122876,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126919,7 +122908,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126968,7 +122956,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127032,7 +123019,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127081,7 +123067,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127103,7 +123088,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127136,7 +123120,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127169,7 +123152,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127203,7 +123185,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127267,7 +123248,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127316,7 +123296,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127351,17 +123330,10 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { ~Test_TC_DRLK_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_1_1\n"); @@ -127897,7 +123869,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127922,7 +123893,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127947,7 +123917,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127967,7 +123936,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127987,7 +123955,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128007,7 +123974,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128027,7 +123993,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128047,7 +124012,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128067,7 +124031,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128087,7 +124050,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128107,7 +124069,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128127,7 +124088,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128147,7 +124107,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128178,7 +124137,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128200,7 +124158,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128224,7 +124181,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128248,7 +124204,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128272,7 +124227,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128294,7 +124248,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128316,7 +124269,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128338,7 +124290,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128361,7 +124312,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128383,7 +124333,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128405,7 +124354,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128427,7 +124375,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128449,7 +124396,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128471,7 +124417,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128493,7 +124438,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128515,7 +124459,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128537,7 +124480,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128559,7 +124501,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128581,7 +124522,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128603,7 +124543,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128626,7 +124565,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128650,7 +124588,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128674,7 +124611,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128698,7 +124634,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128725,7 +124660,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128747,7 +124681,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128769,7 +124702,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128791,7 +124723,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128813,7 +124744,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128850,17 +124780,10 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { ~Test_TC_DRLK_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_2\n"); @@ -129215,7 +125138,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129243,7 +125165,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129322,7 +125243,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129369,7 +125289,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129423,7 +125342,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129447,7 +125365,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129477,7 +125394,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129501,7 +125417,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129522,7 +125437,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129544,7 +125458,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129568,7 +125481,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129598,7 +125510,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129622,7 +125533,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129644,7 +125554,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129669,7 +125578,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129693,7 +125601,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129747,7 +125654,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129771,7 +125677,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129799,7 +125704,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129822,7 +125726,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129848,7 +125751,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129877,7 +125779,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129899,7 +125800,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129937,17 +125837,10 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { ~Test_TC_DRLK_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_3\n"); @@ -130398,7 +126291,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130426,7 +126318,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130505,7 +126396,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130552,7 +126442,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130606,7 +126495,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130630,7 +126518,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130660,7 +126547,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130684,7 +126570,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130705,7 +126590,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130727,7 +126611,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130751,7 +126634,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130781,7 +126663,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130805,7 +126686,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130827,7 +126707,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130852,7 +126731,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130876,7 +126754,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130900,7 +126777,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130928,7 +126804,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130953,7 +126828,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130982,7 +126856,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131007,7 +126880,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131032,7 +126904,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131057,7 +126928,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131082,7 +126952,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131107,7 +126976,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131132,7 +127000,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131156,7 +127023,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131180,7 +127046,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131208,7 +127073,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131236,7 +127100,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131260,7 +127123,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131304,7 +127166,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131326,7 +127187,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131364,17 +127224,10 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { ~Test_TC_DRLK_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_4\n"); @@ -131544,7 +127397,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131572,7 +127424,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131651,7 +127502,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131698,7 +127548,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131752,7 +127601,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131776,7 +127624,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131804,7 +127651,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131835,7 +127681,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131860,7 +127705,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131882,7 +127726,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131920,17 +127763,10 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { ~Test_TC_DRLK_2_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_5\n"); @@ -132108,7 +127944,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132136,7 +127971,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132216,7 +128050,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132245,7 +128078,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132270,7 +128102,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132298,7 +128129,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132367,7 +128197,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132398,7 +128227,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132457,7 +128285,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132480,7 +128307,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132539,7 +128365,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132574,17 +128399,10 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { ~Test_TC_DRLK_2_6() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_6\n"); @@ -132750,7 +128568,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132776,7 +128593,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132801,7 +128617,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132855,7 +128670,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132883,7 +128697,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132916,7 +128729,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132949,7 +128761,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132971,7 +128782,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133004,7 +128814,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133039,17 +128848,10 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { ~Test_TC_DRLK_2_7() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_7\n"); @@ -133289,7 +129091,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133317,7 +129118,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133397,7 +129197,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133426,7 +129225,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133451,7 +129249,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133476,7 +129273,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133531,7 +129327,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133559,7 +129354,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133606,7 +129400,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133634,7 +129427,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133682,7 +129474,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133705,7 +129496,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133752,7 +129542,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133777,7 +129566,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133832,7 +129620,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133859,7 +129646,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133882,7 +129668,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133917,17 +129702,10 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { ~Test_TC_DRLK_2_9() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_9\n"); @@ -134207,7 +129985,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134235,7 +130012,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134315,7 +130091,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134340,7 +130115,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134387,7 +130161,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134437,7 +130210,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134484,7 +130256,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134564,7 +130335,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134589,7 +130359,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134640,7 +130409,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134668,7 +130436,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134715,7 +130482,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134740,7 +130506,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134791,7 +130556,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134842,7 +130606,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134870,7 +130633,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134892,7 +130654,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134927,17 +130688,10 @@ class TestGroupsCluster : public TestCommandBridge { ~TestGroupsCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestGroupsCluster\n"); @@ -135188,7 +130942,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135220,7 +130973,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135252,7 +131004,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135285,7 +131036,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -135326,7 +131076,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -135363,7 +131112,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135396,7 +131144,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135433,7 +131180,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135465,7 +131211,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135502,7 +131247,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135535,7 +131279,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135572,7 +131315,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135604,7 +131346,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135641,7 +131382,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135678,7 +131418,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135718,7 +131457,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135750,7 +131488,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135782,7 +131519,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135814,7 +131550,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135851,7 +131586,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135883,7 +131617,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135924,7 +131657,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135943,7 +131675,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135975,7 +131706,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136007,7 +131737,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136039,7 +131768,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136093,17 +131821,10 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { ~TestGroupKeyManagementCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestGroupKeyManagementCluster\n"); @@ -136382,7 +132103,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136405,7 +132125,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136428,7 +132147,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136469,7 +132187,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136510,7 +132227,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136562,7 +132278,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136598,7 +132313,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136659,7 +132373,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136706,7 +132419,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136769,7 +132481,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136802,7 +132513,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136835,7 +132545,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136868,7 +132577,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136901,7 +132609,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136991,7 +132698,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137015,7 +132721,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137043,7 +132748,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137095,7 +132799,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137127,7 +132830,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137202,7 +132904,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137221,7 +132922,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137251,7 +132951,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137275,7 +132974,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137303,7 +133001,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137344,7 +133041,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137385,7 +133081,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137427,7 +133122,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137451,7 +133145,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137490,7 +133183,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137514,7 +133206,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137558,17 +133249,10 @@ class Test_TC_G_1_1 : public TestCommandBridge { ~Test_TC_G_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_G_1_1\n"); @@ -137687,7 +133371,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137712,7 +133395,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137737,7 +133419,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137757,7 +133438,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137784,7 +133464,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137811,7 +133490,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h index 2cc8f1f37ee3a8..0d4ba7e4832f6c 100644 --- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h @@ -50,14 +50,6 @@ class Test_TC_BINFO_2_3_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -83,12 +75,6 @@ class Test_TC_BINFO_2_3_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -212,14 +198,6 @@ class Test_TC_ACT_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -241,12 +219,6 @@ class Test_TC_ACT_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -299,14 +271,6 @@ class Test_TC_BOOL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -328,12 +292,6 @@ class Test_TC_BOOL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -378,14 +336,6 @@ class Test_TC_DESC_2_2_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -407,12 +357,6 @@ class Test_TC_DESC_2_2_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -473,14 +417,6 @@ class Test_TC_DGETH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -502,12 +438,6 @@ class Test_TC_DGETH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -602,14 +532,6 @@ class Test_TC_DGSW_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -631,12 +553,6 @@ class Test_TC_DGSW_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -698,14 +614,6 @@ class Test_TC_DGWIFI_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -727,12 +635,6 @@ class Test_TC_DGWIFI_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -844,14 +746,6 @@ class Test_TC_FLW_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -873,12 +767,6 @@ class Test_TC_FLW_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -935,14 +823,6 @@ class Test_TC_G_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -964,12 +844,6 @@ class Test_TC_G_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1015,14 +889,6 @@ class Test_TC_I_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1044,12 +910,6 @@ class Test_TC_I_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1106,14 +966,6 @@ class Test_TC_PRS_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1135,12 +987,6 @@ class Test_TC_PRS_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1217,14 +1063,6 @@ class Test_TC_PS_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1246,12 +1084,6 @@ class Test_TC_PS_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1416,14 +1248,6 @@ class Test_TC_PSCFG_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1445,12 +1269,6 @@ class Test_TC_PSCFG_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1495,14 +1313,6 @@ class Test_TC_RH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1524,12 +1334,6 @@ class Test_TC_RH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1590,14 +1394,6 @@ class Test_TC_SWTCH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1619,12 +1415,6 @@ class Test_TC_SWTCH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1677,14 +1467,6 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1706,12 +1488,6 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1777,14 +1553,6 @@ class Test_TC_LCFG_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1806,12 +1574,6 @@ class Test_TC_LCFG_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1864,14 +1626,6 @@ class Test_TC_LUNIT_1_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1893,12 +1647,6 @@ class Test_TC_LUNIT_1_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1964,14 +1712,6 @@ class Test_TC_LUNIT_2_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1993,12 +1733,6 @@ class Test_TC_LUNIT_2_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2054,14 +1788,6 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2083,12 +1809,6 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2198,14 +1918,6 @@ class Test_TC_OCC_2_4_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2227,12 +1939,6 @@ class Test_TC_OCC_2_4_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2283,14 +1989,6 @@ class Test_TC_ULABEL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2312,12 +2010,6 @@ class Test_TC_ULABEL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2368,14 +2060,6 @@ class Test_TC_FLABEL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2397,12 +2081,6 @@ class Test_TC_FLABEL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2448,14 +2126,6 @@ class Test_TC_LTIME_1_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2477,12 +2147,6 @@ class Test_TC_LTIME_1_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h index 2cc8f1f37ee3a8..0d4ba7e4832f6c 100644 --- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h @@ -50,14 +50,6 @@ class Test_TC_BINFO_2_3_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -83,12 +75,6 @@ class Test_TC_BINFO_2_3_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -212,14 +198,6 @@ class Test_TC_ACT_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -241,12 +219,6 @@ class Test_TC_ACT_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -299,14 +271,6 @@ class Test_TC_BOOL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -328,12 +292,6 @@ class Test_TC_BOOL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -378,14 +336,6 @@ class Test_TC_DESC_2_2_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -407,12 +357,6 @@ class Test_TC_DESC_2_2_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -473,14 +417,6 @@ class Test_TC_DGETH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -502,12 +438,6 @@ class Test_TC_DGETH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -602,14 +532,6 @@ class Test_TC_DGSW_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -631,12 +553,6 @@ class Test_TC_DGSW_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -698,14 +614,6 @@ class Test_TC_DGWIFI_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -727,12 +635,6 @@ class Test_TC_DGWIFI_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -844,14 +746,6 @@ class Test_TC_FLW_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -873,12 +767,6 @@ class Test_TC_FLW_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -935,14 +823,6 @@ class Test_TC_G_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -964,12 +844,6 @@ class Test_TC_G_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1015,14 +889,6 @@ class Test_TC_I_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1044,12 +910,6 @@ class Test_TC_I_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1106,14 +966,6 @@ class Test_TC_PRS_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1135,12 +987,6 @@ class Test_TC_PRS_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1217,14 +1063,6 @@ class Test_TC_PS_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1246,12 +1084,6 @@ class Test_TC_PS_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1416,14 +1248,6 @@ class Test_TC_PSCFG_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1445,12 +1269,6 @@ class Test_TC_PSCFG_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1495,14 +1313,6 @@ class Test_TC_RH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1524,12 +1334,6 @@ class Test_TC_RH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1590,14 +1394,6 @@ class Test_TC_SWTCH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1619,12 +1415,6 @@ class Test_TC_SWTCH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1677,14 +1467,6 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1706,12 +1488,6 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1777,14 +1553,6 @@ class Test_TC_LCFG_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1806,12 +1574,6 @@ class Test_TC_LCFG_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1864,14 +1626,6 @@ class Test_TC_LUNIT_1_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1893,12 +1647,6 @@ class Test_TC_LUNIT_1_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1964,14 +1712,6 @@ class Test_TC_LUNIT_2_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1993,12 +1733,6 @@ class Test_TC_LUNIT_2_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2054,14 +1788,6 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2083,12 +1809,6 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2198,14 +1918,6 @@ class Test_TC_OCC_2_4_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2227,12 +1939,6 @@ class Test_TC_OCC_2_4_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2283,14 +1989,6 @@ class Test_TC_ULABEL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2312,12 +2010,6 @@ class Test_TC_ULABEL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2368,14 +2060,6 @@ class Test_TC_FLABEL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2397,12 +2081,6 @@ class Test_TC_FLABEL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2448,14 +2126,6 @@ class Test_TC_LTIME_1_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2477,12 +2147,6 @@ class Test_TC_LTIME_1_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: {