From 749c15ca44d849fd60c677e74e6f59f7a65f595b Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Fri, 11 Feb 2022 19:38:07 +0100 Subject: [PATCH] [YAML] Get nodeId to be an optional parameter for tests (#15072) * [YAML] Get NodeId to be an optional parameter of the test run * [YAML] Update the tests to have a nodeId optional parameters, and to use it into WaitForCommissionee * [YAML] Update src/darwin/Framework/CHIP test template * Update generated code --- .../chip-tool/commands/tests/TestCommand.cpp | 6 +- .../chip-tool/commands/tests/TestCommand.h | 5 +- scripts/tests/chiptest/test_definition.py | 2 +- src/app/tests/suites/DL_LockUnlock.yaml | 5 + src/app/tests/suites/DL_Schedules.yaml | 5 + .../tests/suites/DL_UsersAndCredentials.yaml | 5 + .../tests/suites/TV_AccountLoginCluster.yaml | 5 + .../suites/TV_ApplicationBasicCluster.yaml | 5 + .../suites/TV_ApplicationLauncherCluster.yaml | 5 + .../tests/suites/TV_AudioOutputCluster.yaml | 5 + src/app/tests/suites/TV_ChannelCluster.yaml | 5 + .../suites/TV_ContentLauncherCluster.yaml | 5 + .../tests/suites/TV_KeypadInputCluster.yaml | 5 + src/app/tests/suites/TV_LowPowerCluster.yaml | 5 + .../tests/suites/TV_MediaInputCluster.yaml | 5 + .../tests/suites/TV_MediaPlaybackCluster.yaml | 5 + .../suites/TV_TargetNavigatorCluster.yaml | 5 + src/app/tests/suites/TV_WakeOnLanCluster.yaml | 5 + .../tests/suites/TestBasicInformation.yaml | 5 + src/app/tests/suites/TestCluster.yaml | 5 + .../tests/suites/TestClusterComplexTypes.yaml | 5 + src/app/tests/suites/TestConfigVariables.yaml | 5 + src/app/tests/suites/TestConstraints.yaml | 5 + src/app/tests/suites/TestDelayCommands.yaml | 5 + .../tests/suites/TestDescriptorCluster.yaml | 5 + src/app/tests/suites/TestDiscovery.yaml | 9 + .../tests/suites/TestGroupDemoCommand.yaml | 5 + src/app/tests/suites/TestGroupDemoConfig.yaml | 5 + .../suites/TestGroupKeyManagementCluster.yaml | 5 + src/app/tests/suites/TestGroupMessaging.yaml | 5 + src/app/tests/suites/TestGroupsCluster.yaml | 5 + src/app/tests/suites/TestIdentifyCluster.yaml | 5 + src/app/tests/suites/TestLogCommands.yaml | 5 + .../tests/suites/TestModeSelectCluster.yaml | 5 + .../TestOperationalCredentialsCluster.yaml | 5 + src/app/tests/suites/TestSaveAs.yaml | 5 + src/app/tests/suites/TestSubscribe_OnOff.yaml | 5 + src/app/tests/suites/TestSystemCommands.yaml | 5 + .../suites/certification/Test_TC_BDX_1_1.yaml | 1 + .../suites/certification/Test_TC_BDX_1_2.yaml | 1 + .../suites/certification/Test_TC_BDX_2_1.yaml | 1 + .../suites/certification/Test_TC_BDX_2_2.yaml | 1 + .../suites/certification/Test_TC_BI_1_1.yaml | 5 + .../suites/certification/Test_TC_BI_2_1.yaml | 5 + .../suites/certification/Test_TC_BI_2_2.yaml | 5 + .../certification/Test_TC_BOOL_1_1.yaml | 5 + .../certification/Test_TC_BOOL_2_1.yaml | 5 + .../certification/Test_TC_BRAC_1_1.yaml | 5 + .../suites/certification/Test_TC_CC_1_1.yaml | 5 + .../suites/certification/Test_TC_CC_2_1.yaml | 5 + .../suites/certification/Test_TC_CC_3_1.yaml | 5 + .../suites/certification/Test_TC_CC_3_2.yaml | 5 + .../suites/certification/Test_TC_CC_3_3.yaml | 5 + .../suites/certification/Test_TC_CC_4_1.yaml | 5 + .../suites/certification/Test_TC_CC_4_2.yaml | 5 + .../suites/certification/Test_TC_CC_4_3.yaml | 5 + .../suites/certification/Test_TC_CC_4_4.yaml | 5 + .../suites/certification/Test_TC_CC_5_1.yaml | 5 + .../suites/certification/Test_TC_CC_5_2.yaml | 5 + .../suites/certification/Test_TC_CC_5_3.yaml | 5 + .../suites/certification/Test_TC_CC_6_1.yaml | 5 + .../suites/certification/Test_TC_CC_6_2.yaml | 5 + .../suites/certification/Test_TC_CC_6_3.yaml | 5 + .../suites/certification/Test_TC_CC_7_1.yaml | 5 + .../suites/certification/Test_TC_CC_7_2.yaml | 5 + .../suites/certification/Test_TC_CC_7_3.yaml | 5 + .../suites/certification/Test_TC_CC_7_4.yaml | 5 + .../suites/certification/Test_TC_CC_8_1.yaml | 5 + .../suites/certification/Test_TC_CC_9_1.yaml | 5 + .../suites/certification/Test_TC_CC_9_2.yaml | 5 + .../suites/certification/Test_TC_CC_9_3.yaml | 5 + .../suites/certification/Test_TC_DD_1_10.yaml | 1 + .../suites/certification/Test_TC_DD_1_5.yaml | 1 + .../suites/certification/Test_TC_DD_1_6.yaml | 1 + .../suites/certification/Test_TC_DD_1_7.yaml | 1 + .../suites/certification/Test_TC_DD_1_8.yaml | 1 + .../suites/certification/Test_TC_DD_1_9.yaml | 1 + .../certification/Test_TC_DIAG_TH_NW_1_1.yaml | 5 + .../suites/certification/Test_TC_DM_1_1.yaml | 5 + .../Test_TC_DM_1_3_Simulated.yaml | 1 + .../suites/certification/Test_TC_DM_2_2.yaml | 5 + .../Test_TC_DM_2_3_Simulated.yaml | 1 + .../suites/certification/Test_TC_DM_3_1.yaml | 5 + .../Test_TC_DM_3_3_Simulated.yaml | 1 + .../suites/certification/Test_TC_EMR_1_1.yaml | 5 + .../certification/Test_TC_ETHDIAG_1_1.yaml | 5 + .../certification/Test_TC_ETHDIAG_2_1.yaml | 5 + .../suites/certification/Test_TC_FLW_1_1.yaml | 5 + .../suites/certification/Test_TC_FLW_2_1.yaml | 5 + .../suites/certification/Test_TC_FLW_2_2.yaml | 5 + .../suites/certification/Test_TC_ILL_1_1.yaml | 5 + .../suites/certification/Test_TC_LVL_1_1.yaml | 5 + .../suites/certification/Test_TC_LVL_2_1.yaml | 5 + .../suites/certification/Test_TC_LVL_2_2.yaml | 5 + .../suites/certification/Test_TC_LVL_3_1.yaml | 5 + .../suites/certification/Test_TC_LVL_4_1.yaml | 5 + .../suites/certification/Test_TC_LVL_5_1.yaml | 5 + .../suites/certification/Test_TC_LVL_6_1.yaml | 5 + .../suites/certification/Test_TC_MC_1_1.yaml | 5 + .../suites/certification/Test_TC_MC_2_1.yaml | 5 + .../suites/certification/Test_TC_MC_3_1.yaml | 5 + .../suites/certification/Test_TC_MC_3_10.yaml | 5 + .../suites/certification/Test_TC_MC_3_11.yaml | 5 + .../suites/certification/Test_TC_MC_3_2.yaml | 5 + .../suites/certification/Test_TC_MC_3_3.yaml | 5 + .../suites/certification/Test_TC_MC_3_4.yaml | 5 + .../suites/certification/Test_TC_MC_3_5.yaml | 5 + .../suites/certification/Test_TC_MC_3_6.yaml | 5 + .../suites/certification/Test_TC_MC_3_7.yaml | 5 + .../suites/certification/Test_TC_MC_3_8.yaml | 5 + .../suites/certification/Test_TC_MC_3_9.yaml | 5 + .../suites/certification/Test_TC_MC_5_1.yaml | 5 + .../suites/certification/Test_TC_MC_5_2.yaml | 5 + .../suites/certification/Test_TC_MC_5_3.yaml | 5 + .../suites/certification/Test_TC_MC_6_1.yaml | 5 + .../suites/certification/Test_TC_MC_6_2.yaml | 5 + .../suites/certification/Test_TC_MC_6_3.yaml | 5 + .../suites/certification/Test_TC_MC_6_4.yaml | 5 + .../suites/certification/Test_TC_MC_7_1.yaml | 5 + .../suites/certification/Test_TC_MC_7_2.yaml | 5 + .../suites/certification/Test_TC_MC_8_1.yaml | 5 + .../suites/certification/Test_TC_MC_9_1.yaml | 5 + .../suites/certification/Test_TC_OCC_1_1.yaml | 5 + .../suites/certification/Test_TC_OCC_2_1.yaml | 5 + .../suites/certification/Test_TC_OCC_2_2.yaml | 5 + .../suites/certification/Test_TC_OO_1_1.yaml | 5 + .../suites/certification/Test_TC_OO_2_1.yaml | 5 + .../suites/certification/Test_TC_OO_2_2.yaml | 5 + .../suites/certification/Test_TC_OO_2_3.yaml | 5 + .../suites/certification/Test_TC_PCC_1_1.yaml | 5 + .../suites/certification/Test_TC_PCC_2_1.yaml | 5 + .../suites/certification/Test_TC_PCC_2_2.yaml | 5 + .../suites/certification/Test_TC_PCC_2_3.yaml | 5 + .../suites/certification/Test_TC_PRS_1_1.yaml | 5 + .../suites/certification/Test_TC_PRS_2_1.yaml | 5 + .../suites/certification/Test_TC_PS_1_1.yaml | 5 + .../suites/certification/Test_TC_RH_1_1.yaml | 5 + .../suites/certification/Test_TC_RH_2_1.yaml | 5 + .../suites/certification/Test_TC_RH_2_2.yaml | 5 + .../certification/Test_TC_SWDIAG_1_1.yaml | 5 + .../certification/Test_TC_SWDIAG_2_1.yaml | 1 + .../certification/Test_TC_SWDIAG_3_1.yaml | 5 + .../certification/Test_TC_SWTCH_2_1.yaml | 5 + .../certification/Test_TC_SWTCH_2_2.yaml | 5 + .../suites/certification/Test_TC_TM_1_1.yaml | 5 + .../suites/certification/Test_TC_TM_2_1.yaml | 5 + .../suites/certification/Test_TC_TM_2_2.yaml | 5 + .../certification/Test_TC_TSTAT_1_1.yaml | 5 + .../certification/Test_TC_TSTAT_2_1.yaml | 5 + .../certification/Test_TC_TSTAT_2_2.yaml | 5 + .../certification/Test_TC_TSUIC_1_1.yaml | 5 + .../certification/Test_TC_TSUIC_2_1.yaml | 5 + .../certification/Test_TC_TSUIC_2_2.yaml | 5 + .../certification/Test_TC_WIFIDIAG_1_1.yaml | 5 + .../certification/Test_TC_WIFIDIAG_3_1.yaml | 5 + .../certification/Test_TC_WNCV_1_1.yaml | 5 + .../certification/Test_TC_WNCV_2_1.yaml | 5 + .../certification/Test_TC_WNCV_2_2.yaml | 5 + .../certification/Test_TC_WNCV_2_4.yaml | 5 + .../certification/Test_TC_WNCV_2_5.yaml | 5 + .../certification/Test_TC_WNCV_3_1.yaml | 5 + .../certification/Test_TC_WNCV_3_2.yaml | 5 + .../certification/Test_TC_WNCV_3_3.yaml | 5 + .../suites/commands/delay/DelayCommands.h | 2 +- .../clusters/DelayCommands.js | 2 +- .../common/variables/Variables.js | 1 + .../CHIP/templates/clusters-tests.zapt | 14 +- .../Framework/CHIPTests/CHIPClustersTests.m | 260 ++++---- .../chip-tool/zap-generated/test/Commands.h | 608 +++++++++++++----- .../app1/zap-generated/test/Commands.h | 6 + .../app2/zap-generated/test/Commands.h | 6 + 171 files changed, 1366 insertions(+), 294 deletions(-) diff --git a/examples/chip-tool/commands/tests/TestCommand.cpp b/examples/chip-tool/commands/tests/TestCommand.cpp index 5be9c79305bd2d..a4b7b34c819196 100644 --- a/examples/chip-tool/commands/tests/TestCommand.cpp +++ b/examples/chip-tool/commands/tests/TestCommand.cpp @@ -30,10 +30,10 @@ CHIP_ERROR TestCommand::RunCommand() return CHIP_NO_ERROR; } -CHIP_ERROR TestCommand::WaitForCommissionee() +CHIP_ERROR TestCommand::WaitForCommissionee(chip::NodeId nodeId) { - CurrentCommissioner().ReleaseOperationalDevice(mNodeId); - return CurrentCommissioner().GetConnectedDevice(mNodeId, &mOnDeviceConnectedCallback, &mOnDeviceConnectionFailureCallback); + CurrentCommissioner().ReleaseOperationalDevice(nodeId); + return CurrentCommissioner().GetConnectedDevice(nodeId, &mOnDeviceConnectedCallback, &mOnDeviceConnectionFailureCallback); } void TestCommand::OnDeviceConnectedFn(void * context, chip::OperationalDeviceProxy * device) diff --git a/examples/chip-tool/commands/tests/TestCommand.h b/examples/chip-tool/commands/tests/TestCommand.h index e9707d65d4ad84..01d17856b5454e 100644 --- a/examples/chip-tool/commands/tests/TestCommand.h +++ b/examples/chip-tool/commands/tests/TestCommand.h @@ -45,7 +45,6 @@ class TestCommand : public CHIPCommand, CHIPCommand(commandName, credsIssuerConfig), mOnDeviceConnectedCallback(OnDeviceConnectedFn, this), mOnDeviceConnectionFailureCallback(OnDeviceConnectionFailureFn, this) { - AddArgument("node-id", 0, UINT64_MAX, &mNodeId); AddArgument("delayInMs", 0, UINT64_MAX, &mDelayInMs); AddArgument("PICS", &mPICSFilePath); } @@ -60,11 +59,10 @@ class TestCommand : public CHIPCommand, protected: /////////// DelayCommands Interface ///////// - CHIP_ERROR WaitForCommissionee() override; + CHIP_ERROR WaitForCommissionee(chip::NodeId nodeId) override; void OnWaitForMs() override { NextTest(); }; std::map mDevices; - chip::NodeId mNodeId; static void OnDeviceConnectedFn(void * context, chip::OperationalDeviceProxy * device); static void OnDeviceConnectionFailureFn(void * context, PeerId peerId, CHIP_ERROR error); @@ -87,6 +85,5 @@ class TestCommand : public CHIPCommand, }; chip::Optional mDelayInMs; chip::Optional mPICSFilePath; - chip::Optional mEndpointId; chip::Optional mTimeout; }; diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py index cd9b8162fcee2b..6dc79ad965dff2 100644 --- a/scripts/tests/chiptest/test_definition.py +++ b/scripts/tests/chiptest/test_definition.py @@ -232,7 +232,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths): runner.RunSubprocess(tool_cmd + ['pairing', 'qrcode', TEST_NODE_ID, app.setupCode], name='PAIR', dependencies=[apps_register]) - runner.RunSubprocess(tool_cmd + ['tests', self.run_name, TEST_NODE_ID], + runner.RunSubprocess(tool_cmd + ['tests', self.run_name], name='TEST', dependencies=[apps_register]) except: logging.error("!!!!!!!!!!!!!!!!!!!! ERROR !!!!!!!!!!!!!!!!!!!!!!") diff --git a/src/app/tests/suites/DL_LockUnlock.yaml b/src/app/tests/suites/DL_LockUnlock.yaml index cc86a7de2ccf53..0cf5e6f9f94c0b 100644 --- a/src/app/tests/suites/DL_LockUnlock.yaml +++ b/src/app/tests/suites/DL_LockUnlock.yaml @@ -15,6 +15,7 @@ name: Door Lock Cluster Lock/Unlock tests config: + nodeId: 0x12344321 cluster: "Door Lock" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Create new PIN credential and lock/unlock user" command: "SetCredential" diff --git a/src/app/tests/suites/DL_Schedules.yaml b/src/app/tests/suites/DL_Schedules.yaml index 70f893e02aa274..1cf5a7433e2df9 100644 --- a/src/app/tests/suites/DL_Schedules.yaml +++ b/src/app/tests/suites/DL_Schedules.yaml @@ -15,6 +15,7 @@ name: Door Lock Cluster Schedules tests config: + nodeId: 0x12344321 cluster: "Door Lock" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Create new PIN credential and schedule user" command: "SetCredential" diff --git a/src/app/tests/suites/DL_UsersAndCredentials.yaml b/src/app/tests/suites/DL_UsersAndCredentials.yaml index ed3a5dda5a586e..648d51e37a6799 100644 --- a/src/app/tests/suites/DL_UsersAndCredentials.yaml +++ b/src/app/tests/suites/DL_UsersAndCredentials.yaml @@ -15,6 +15,7 @@ name: Door Lock Cluster Users and Credentials tests config: + nodeId: 0x12344321 cluster: "Door Lock" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read available user slot and verify response fields" command: "GetUser" diff --git a/src/app/tests/suites/TV_AccountLoginCluster.yaml b/src/app/tests/suites/TV_AccountLoginCluster.yaml index 3bfc2195950dc0..d84663176b1d6d 100644 --- a/src/app/tests/suites/TV_AccountLoginCluster.yaml +++ b/src/app/tests/suites/TV_AccountLoginCluster.yaml @@ -15,6 +15,7 @@ name: Account Login Cluster Tests config: + nodeId: 0x12344321 cluster: "Account Login" endpoint: 3 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Get Setup PIN Command" command: "getSetupPINRequest" diff --git a/src/app/tests/suites/TV_ApplicationBasicCluster.yaml b/src/app/tests/suites/TV_ApplicationBasicCluster.yaml index b885be3290111c..17a676a6016851 100644 --- a/src/app/tests/suites/TV_ApplicationBasicCluster.yaml +++ b/src/app/tests/suites/TV_ApplicationBasicCluster.yaml @@ -15,6 +15,7 @@ name: Application Basic Cluster Tests config: + nodeId: 0x12344321 cluster: "Application Basic" endpoint: 3 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # TODO(#14054): Support chars validation - label: "Read attribute vendor name" diff --git a/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml b/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml index d0672a9a924720..a0ef6ef0e8b30a 100644 --- a/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml +++ b/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml @@ -15,6 +15,7 @@ name: Application Launcher Cluster Tests config: + nodeId: 0x12344321 cluster: "Application Launcher" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read attribute Application Launcher list" command: "readAttribute" diff --git a/src/app/tests/suites/TV_AudioOutputCluster.yaml b/src/app/tests/suites/TV_AudioOutputCluster.yaml index 633d5420ab7bc3..6d24d8b015f14b 100644 --- a/src/app/tests/suites/TV_AudioOutputCluster.yaml +++ b/src/app/tests/suites/TV_AudioOutputCluster.yaml @@ -15,6 +15,7 @@ name: Audio Output Cluster Tests config: + nodeId: 0x12344321 cluster: "Audio Output" endpoint: 2 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read attribute Audio Output list" command: "readAttribute" diff --git a/src/app/tests/suites/TV_ChannelCluster.yaml b/src/app/tests/suites/TV_ChannelCluster.yaml index eefe82e06587c0..c17462d271ff7c 100644 --- a/src/app/tests/suites/TV_ChannelCluster.yaml +++ b/src/app/tests/suites/TV_ChannelCluster.yaml @@ -15,6 +15,7 @@ name: Channel Cluster Tests config: + nodeId: 0x12344321 cluster: "Channel" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read attribute Channel list" command: "readAttribute" diff --git a/src/app/tests/suites/TV_ContentLauncherCluster.yaml b/src/app/tests/suites/TV_ContentLauncherCluster.yaml index 773c3998aee0a5..0fe56f28b82412 100644 --- a/src/app/tests/suites/TV_ContentLauncherCluster.yaml +++ b/src/app/tests/suites/TV_ContentLauncherCluster.yaml @@ -15,6 +15,7 @@ name: Content Launcher Cluster Tests config: + nodeId: 0x12344321 cluster: "Content Launcher" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read attribute accept header list" command: "readAttribute" diff --git a/src/app/tests/suites/TV_KeypadInputCluster.yaml b/src/app/tests/suites/TV_KeypadInputCluster.yaml index c60851fefc27f4..0c56aff5bcc787 100644 --- a/src/app/tests/suites/TV_KeypadInputCluster.yaml +++ b/src/app/tests/suites/TV_KeypadInputCluster.yaml @@ -15,6 +15,7 @@ name: Keypad Input Cluster Tests config: + nodeId: 0x12344321 cluster: "Keypad Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Key Command" command: "sendKeyRequest" diff --git a/src/app/tests/suites/TV_LowPowerCluster.yaml b/src/app/tests/suites/TV_LowPowerCluster.yaml index ae245e5f6f418a..e4ea3a8c2eddd9 100644 --- a/src/app/tests/suites/TV_LowPowerCluster.yaml +++ b/src/app/tests/suites/TV_LowPowerCluster.yaml @@ -15,6 +15,7 @@ name: Low Power Cluster Tests config: + nodeId: 0x12344321 cluster: "Low Power" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Sleep Input Status Command" command: "sleep" diff --git a/src/app/tests/suites/TV_MediaInputCluster.yaml b/src/app/tests/suites/TV_MediaInputCluster.yaml index 53a6844431ecf3..504a26d5aa5085 100644 --- a/src/app/tests/suites/TV_MediaInputCluster.yaml +++ b/src/app/tests/suites/TV_MediaInputCluster.yaml @@ -15,6 +15,7 @@ name: Media Input Cluster Tests config: + nodeId: 0x12344321 cluster: "Media Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read attribute media input list" command: "readAttribute" diff --git a/src/app/tests/suites/TV_MediaPlaybackCluster.yaml b/src/app/tests/suites/TV_MediaPlaybackCluster.yaml index edafcffe6ae856..496df7520f043d 100644 --- a/src/app/tests/suites/TV_MediaPlaybackCluster.yaml +++ b/src/app/tests/suites/TV_MediaPlaybackCluster.yaml @@ -15,6 +15,7 @@ name: Media Playback Cluster Tests config: + nodeId: 0x12344321 cluster: "Media Playback" endpoint: 3 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read attribute playback state" command: "readAttribute" diff --git a/src/app/tests/suites/TV_TargetNavigatorCluster.yaml b/src/app/tests/suites/TV_TargetNavigatorCluster.yaml index eb1c9bde08cfda..4b427927f4d51e 100644 --- a/src/app/tests/suites/TV_TargetNavigatorCluster.yaml +++ b/src/app/tests/suites/TV_TargetNavigatorCluster.yaml @@ -15,6 +15,7 @@ name: Target Navigator Cluster Tests config: + nodeId: 0x12344321 cluster: "Target Navigator" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read attribute Target Navigator list" command: "readAttribute" diff --git a/src/app/tests/suites/TV_WakeOnLanCluster.yaml b/src/app/tests/suites/TV_WakeOnLanCluster.yaml index 8ff550c752d46d..926016b53c2693 100644 --- a/src/app/tests/suites/TV_WakeOnLanCluster.yaml +++ b/src/app/tests/suites/TV_WakeOnLanCluster.yaml @@ -15,6 +15,7 @@ name: Wake on LAN Cluster Tests config: + nodeId: 0x12344321 cluster: "Wake on LAN" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read mac address" command: "readAttribute" diff --git a/src/app/tests/suites/TestBasicInformation.yaml b/src/app/tests/suites/TestBasicInformation.yaml index c2a14b8865bd80..d165d12b6366ec 100644 --- a/src/app/tests/suites/TestBasicInformation.yaml +++ b/src/app/tests/suites/TestBasicInformation.yaml @@ -15,6 +15,7 @@ name: Basic Information Cluster Tests config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read location" command: "readAttribute" diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml index 093315f0aae6e5..bd6e8af8e58db6 100644 --- a/src/app/tests/suites/TestCluster.yaml +++ b/src/app/tests/suites/TestCluster.yaml @@ -15,6 +15,7 @@ name: Test Cluster Tests config: + nodeId: 0x12344321 cluster: "Test Cluster" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Test Command" command: "test" diff --git a/src/app/tests/suites/TestClusterComplexTypes.yaml b/src/app/tests/suites/TestClusterComplexTypes.yaml index 3cde68b2812b95..9b88113ba57111 100644 --- a/src/app/tests/suites/TestClusterComplexTypes.yaml +++ b/src/app/tests/suites/TestClusterComplexTypes.yaml @@ -15,6 +15,7 @@ name: Test Cluster Complex Types Tests config: + nodeId: 0x12344321 cluster: "Test Cluster" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Test Command with optional arg set to null." # Not in TestCluster.yaml for now because this test depends on diff --git a/src/app/tests/suites/TestConfigVariables.yaml b/src/app/tests/suites/TestConfigVariables.yaml index 868cc79be7784a..5889887896fd69 100644 --- a/src/app/tests/suites/TestConfigVariables.yaml +++ b/src/app/tests/suites/TestConfigVariables.yaml @@ -15,6 +15,7 @@ name: Test Cluster Config Variables Tests config: + nodeId: 0x12344321 cluster: "Test Cluster" endpoint: 1 arg1: @@ -28,6 +29,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Test Add Arguments Command" command: "testAddArguments" diff --git a/src/app/tests/suites/TestConstraints.yaml b/src/app/tests/suites/TestConstraints.yaml index 30ed159b32ce06..9e09a1bb25255f 100644 --- a/src/app/tests/suites/TestConstraints.yaml +++ b/src/app/tests/suites/TestConstraints.yaml @@ -15,6 +15,7 @@ name: Test Cluster Constraints Tests config: + nodeId: 0x12344321 cluster: "Test Cluster" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # Tests for INT32U attribute diff --git a/src/app/tests/suites/TestDelayCommands.yaml b/src/app/tests/suites/TestDelayCommands.yaml index 9f1983fa88faad..8e89bdfa68f85d 100644 --- a/src/app/tests/suites/TestDelayCommands.yaml +++ b/src/app/tests/suites/TestDelayCommands.yaml @@ -15,6 +15,7 @@ name: Delay Commands Tests config: + nodeId: 0x12344321 cluster: "Test Cluster" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Wait 100ms" cluster: "DelayCommands" diff --git a/src/app/tests/suites/TestDescriptorCluster.yaml b/src/app/tests/suites/TestDescriptorCluster.yaml index 5222872557b30f..e8b4425f8d716f 100644 --- a/src/app/tests/suites/TestDescriptorCluster.yaml +++ b/src/app/tests/suites/TestDescriptorCluster.yaml @@ -15,6 +15,7 @@ name: Descriptor Cluster Tests config: + nodeId: 0x12344321 cluster: "Descriptor" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read attribute Device list" command: "readAttribute" diff --git a/src/app/tests/suites/TestDiscovery.yaml b/src/app/tests/suites/TestDiscovery.yaml index a55914949a10b2..ad43438f437dce 100644 --- a/src/app/tests/suites/TestDiscovery.yaml +++ b/src/app/tests/suites/TestDiscovery.yaml @@ -15,6 +15,7 @@ name: Test Discovery config: + nodeId: 0x12344321 endpoint: 0 discriminator: type: INT16U @@ -41,6 +42,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Open Commissioning Window" cluster: "AdministratorCommissioning" @@ -278,6 +283,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Open Commissioning Window" cluster: "AdministratorCommissioning" diff --git a/src/app/tests/suites/TestGroupDemoCommand.yaml b/src/app/tests/suites/TestGroupDemoCommand.yaml index de7b77339da9de..5db244622f38ab 100644 --- a/src/app/tests/suites/TestGroupDemoCommand.yaml +++ b/src/app/tests/suites/TestGroupDemoCommand.yaml @@ -27,6 +27,7 @@ name: Group Messaging Demo Commands config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 @@ -34,6 +35,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # Toggle 1 - label: "Turn On the light to see attribute change" diff --git a/src/app/tests/suites/TestGroupDemoConfig.yaml b/src/app/tests/suites/TestGroupDemoConfig.yaml index 58e6fd0cd29f34..9ffb73bd9c0db8 100644 --- a/src/app/tests/suites/TestGroupDemoConfig.yaml +++ b/src/app/tests/suites/TestGroupDemoConfig.yaml @@ -26,6 +26,7 @@ name: Group Messaging Demo - Configuration config: + nodeId: 0x12344321 cluster: "Groups" endpoint: 0 @@ -33,6 +34,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Add Group 1 - endpoint 1" command: "AddGroup" diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml index a511199184f42e..2fe4ff9b624844 100644 --- a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml +++ b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml @@ -15,6 +15,7 @@ name: GroupKeyManagement Cluster Tests config: + nodeId: 0x12344321 cluster: "Group Key Management" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read maxGroupsPerFabric" command: "readAttribute" diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml index 244e93e261c657..58a548ed6cf42e 100644 --- a/src/app/tests/suites/TestGroupMessaging.yaml +++ b/src/app/tests/suites/TestGroupMessaging.yaml @@ -21,6 +21,7 @@ name: Basic Group Messaging Tests config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 @@ -28,6 +29,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Add Group 1 (endpoint 1)" cluster: "Groups" diff --git a/src/app/tests/suites/TestGroupsCluster.yaml b/src/app/tests/suites/TestGroupsCluster.yaml index 3c3031de30775a..2b1a1401b699b8 100644 --- a/src/app/tests/suites/TestGroupsCluster.yaml +++ b/src/app/tests/suites/TestGroupsCluster.yaml @@ -15,6 +15,7 @@ name: Groups Cluster Tests config: + nodeId: 0x12344321 cluster: "Groups" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "View Group 0 (invalid)" command: "ViewGroup" diff --git a/src/app/tests/suites/TestIdentifyCluster.yaml b/src/app/tests/suites/TestIdentifyCluster.yaml index df27936293b4af..fe0c3a68e811fc 100644 --- a/src/app/tests/suites/TestIdentifyCluster.yaml +++ b/src/app/tests/suites/TestIdentifyCluster.yaml @@ -15,6 +15,7 @@ name: Identify Cluster Tests config: + nodeId: 0x12344321 cluster: "Identify" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Identify command and expect success response" command: "identify" diff --git a/src/app/tests/suites/TestLogCommands.yaml b/src/app/tests/suites/TestLogCommands.yaml index 60e3cd7093f0dc..fc9a1ebf37c1a0 100644 --- a/src/app/tests/suites/TestLogCommands.yaml +++ b/src/app/tests/suites/TestLogCommands.yaml @@ -15,6 +15,7 @@ name: Log Commands Tests config: + nodeId: 0x12344321 cluster: "Test Cluster" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Log a simple message" cluster: "LogCommands" diff --git a/src/app/tests/suites/TestModeSelectCluster.yaml b/src/app/tests/suites/TestModeSelectCluster.yaml index c1b1ae6f248516..000d0be8f02914 100644 --- a/src/app/tests/suites/TestModeSelectCluster.yaml +++ b/src/app/tests/suites/TestModeSelectCluster.yaml @@ -15,6 +15,7 @@ name: Mode Select Cluster Tests config: + nodeId: 0x12344321 cluster: "Mode Select" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read CurrentMode" command: "readAttribute" diff --git a/src/app/tests/suites/TestOperationalCredentialsCluster.yaml b/src/app/tests/suites/TestOperationalCredentialsCluster.yaml index 6b56cf330b678c..abbb09b5b0597a 100644 --- a/src/app/tests/suites/TestOperationalCredentialsCluster.yaml +++ b/src/app/tests/suites/TestOperationalCredentialsCluster.yaml @@ -15,6 +15,7 @@ name: Operational Credentials Cluster Tests config: + nodeId: 0x12344321 cluster: "Operational Credentials" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read number of supported fabrics" command: "readAttribute" diff --git a/src/app/tests/suites/TestSaveAs.yaml b/src/app/tests/suites/TestSaveAs.yaml index e67cadbe3065b0..8913168c3a6b59 100644 --- a/src/app/tests/suites/TestSaveAs.yaml +++ b/src/app/tests/suites/TestSaveAs.yaml @@ -15,6 +15,7 @@ name: Test Cluster Tests config: + nodeId: 0x12344321 cluster: "Test Cluster" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Test Add Arguments Command" command: "testAddArguments" diff --git a/src/app/tests/suites/TestSubscribe_OnOff.yaml b/src/app/tests/suites/TestSubscribe_OnOff.yaml index 296eab196e7efc..c8d7a82e8d71a3 100644 --- a/src/app/tests/suites/TestSubscribe_OnOff.yaml +++ b/src/app/tests/suites/TestSubscribe_OnOff.yaml @@ -15,6 +15,7 @@ name: Subscribe Tests - OnOff Cluster config: + nodeId: 0x12344321 cluster: "On/Off" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Set OnOff Attribute to false" command: "Off" diff --git a/src/app/tests/suites/TestSystemCommands.yaml b/src/app/tests/suites/TestSystemCommands.yaml index b22b2b5c6cfb0b..a448647cd1cf83 100644 --- a/src/app/tests/suites/TestSystemCommands.yaml +++ b/src/app/tests/suites/TestSystemCommands.yaml @@ -15,6 +15,7 @@ name: System Commands Tests config: + nodeId: 0x12344321 cluster: "SystemCommands" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Stop the accessory" command: "Stop" diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml index e5d6fe083188f5..0921b2d68613f5 100644 --- a/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml @@ -15,6 +15,7 @@ name: 28.1.1. [TC-BDX-1.1] Sender Initiated BDX Transfer session config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_2.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_2.yaml index d3a44828192388..5982f83c1c6206 100644 --- a/src/app/tests/suites/certification/Test_TC_BDX_1_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_BDX_1_2.yaml @@ -15,6 +15,7 @@ name: 28.1.2. [TC-BDX-1.2] Receiver Initiated BDX Transfer session config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BDX_2_1.yaml index 159ba8a710875a..f142f45cce3c69 100644 --- a/src/app/tests/suites/certification/Test_TC_BDX_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BDX_2_1.yaml @@ -15,6 +15,7 @@ name: 28.2.1. [TC-BDX-2.1] Synchronous file sending config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BDX_2_2.yaml index 0bad845483af2e..76d6937e4d3419 100644 --- a/src/app/tests/suites/certification/Test_TC_BDX_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_BDX_2_2.yaml @@ -15,6 +15,7 @@ name: 28.2.2. [TC-BDX-2.2] Synchronous file receiving config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_BI_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BI_1_1.yaml index 01226055708a61..71fa3a81e7672b 100644 --- a/src/app/tests/suites/certification/Test_TC_BI_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BI_1_1.yaml @@ -15,6 +15,7 @@ name: 18.1.1. [TC-BI-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Binary Input (Basic)" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BI_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BI_2_1.yaml index e03d8780d69676..0de63ce18ae806 100644 --- a/src/app/tests/suites/certification/Test_TC_BI_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BI_2_1.yaml @@ -15,6 +15,7 @@ name: 18.2.1. [TC-BI-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Binary Input (Basic)" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read mandatory non-global attribute: OutOfService" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BI_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BI_2_2.yaml index b849c03eebed12..0ed11a1cf1af61 100644 --- a/src/app/tests/suites/certification/Test_TC_BI_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_BI_2_2.yaml @@ -15,6 +15,7 @@ name: 18.2.2. [TC-BI-2.2] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Binary Input (Basic)" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads PresentValue attribute from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml index 2f934b8d7bfb2e..cd84a7b688c345 100644 --- a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml @@ -15,6 +15,7 @@ name: 68.1.1. [TC-BOOL-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Boolean State" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml index a37048bb3ba297..cb3b6eb42adb51 100644 --- a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml @@ -15,6 +15,7 @@ name: 68.2.1. [TC-BOOL-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Boolean State" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read mandatory non-global attribute: StateValue" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BRAC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BRAC_1_1.yaml index 7cb7fcc9e8a35a..eea942c4607424 100644 --- a/src/app/tests/suites/certification/Test_TC_BRAC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BRAC_1_1.yaml @@ -15,6 +15,7 @@ name: 77.1.1. [TC-BRAC-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Bridged Actions" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml index 241bfd8dc2262e..9d7b0c8e00e082 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml @@ -15,6 +15,7 @@ name: 27.1.1. [TC-CC-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml index 0cca35681ba801..f218410205c5cf 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml @@ -15,6 +15,7 @@ name: 27.2.1. [TC-CC-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads mandatory attribute: CurrentHue" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml index 8a630cb5ce873c..c81484dc66566d 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml @@ -15,6 +15,7 @@ name: 27.2.2. [TC-CC-3.1] Hue MoveTo functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml index bf85a6238f32f8..5dc6541e81f5e9 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml @@ -15,6 +15,7 @@ name: 27.2.3. [TC-CC-3.2] Hue Move functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml index 0ee1e43cedb1f7..7f9ef03a8e1482 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml @@ -15,6 +15,7 @@ name: 27.2.4. [TC-CC-3.3] Hue Step functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml index c162f181b97ab9..b5f7aee70a6b32 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml @@ -15,6 +15,7 @@ name: 27.2.5. [TC-CC-4.1] Saturation MoveTo functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml index 0c3809d0699420..628940d6272e7a 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml @@ -15,6 +15,7 @@ name: 27.2.6. [TC-CC-4.2] Saturation Move functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml index 67353151f5a500..d7e1c71994a45e 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml @@ -15,6 +15,7 @@ name: 27.2.7. [TC-CC-4.3] Saturation Step functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml index a22f77d6d0cd43..e85d190496f315 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml @@ -16,6 +16,7 @@ name: 27.2.8. [TC-CC-4.4] MoveToHueAndSaturation functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -23,6 +24,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml index 20ff5bdfdd6bdd..df1d37f69c8950 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml @@ -15,6 +15,7 @@ name: 27.2.9. [TC-CC-5.1] Color MoveTo functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml index 92d94127259042..860ea548facd3e 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml @@ -15,6 +15,7 @@ name: 27.2.10. [TC-CC-5.2] Color Move functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml index 00719c604a6076..c8b280b1643ac3 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml @@ -15,6 +15,7 @@ name: 27.2.11. [TC-CC-5.3] Color Step functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml index cf8b4ca0845f9c..9aea73ecf0a868 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml @@ -17,6 +17,7 @@ name: DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -24,6 +25,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml index fb57aa523d9a47..888d6fb086dc0a 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml @@ -16,6 +16,7 @@ name: 27.2.13. [TC-CC-6.2] Color Temperature Move functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -23,6 +24,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml index b8eae71b4f590d..e4be1256d85d6d 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml @@ -16,6 +16,7 @@ name: 27.2.14. [TC-CC-6.3] Color Temperature Step functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -23,6 +24,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml index c64b90899c5a68..484110cbc1df8b 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml @@ -15,6 +15,7 @@ name: 27.2.15. [TC-CC-7.1] Enhanced MoveToHue functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml index afb287b9a6855a..c41316a8ff6405 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml @@ -15,6 +15,7 @@ name: 27.2.16. [TC-CC-7.2] Enhanced MoveHue functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml index 17bc4a10f12c5f..8e1556eb3ed967 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml @@ -15,6 +15,7 @@ name: 27.2.17. [TC-CC-7.3] Enhanced Step functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml index 0c1fe78f30b37d..a0808c95681987 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml @@ -17,6 +17,7 @@ name: server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -24,6 +25,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml index 34e4a4f528f194..1831c74fa0840a 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml @@ -15,6 +15,7 @@ name: 27.2.19. [TC-CC-8.1] StopMoveStep functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml index 09a12ef591e6be..5d9b069f083b5f 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml @@ -15,6 +15,7 @@ name: 27.2.20. [TC-CC-9.1] ColorLoopSet Validation config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Precondition : Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml index e2d4bad38c223a..3fb80d1b146c4d 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml @@ -16,6 +16,7 @@ name: 27.2.21. [TC-CC-9.2] ColorLoopSet Validation - change direction without stop config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -23,6 +24,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Precondition: Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml index b92cd8d9f7c046..b1cf7fb0d24d0d 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml @@ -15,6 +15,7 @@ name: 27.2.22. [TC-CC-9.3] ColorLoopSet Validation - change time without stop config: + nodeId: 0x12344321 cluster: "Color Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Precondition: Turn on light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml index a903383b9577a1..716dacdbac9657 100644 --- a/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml @@ -17,6 +17,7 @@ name: Commissioner] config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml index e29a76c13bdf87..2d1c835c22d405 100644 --- a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml @@ -15,6 +15,7 @@ name: 7.1.5. [TC-DD-1.5] NFC Rules of advertisement and Onboarding config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml index 3787682fcd885b..94569d1942f86d 100644 --- a/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml @@ -15,6 +15,7 @@ name: 7.1.6. [TC-DD-1.6] QR Code Format and Label config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml index 6e27e1c6184356..361e175151cce4 100644 --- a/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml @@ -15,6 +15,7 @@ name: 7.1.7. [TC-DD-1.7] Setup Code Format and Label config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml index eceabeb11df140..bc9a41918d891e 100644 --- a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml +++ b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml @@ -17,6 +17,7 @@ name: Commissioner] config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml index 5389207336ece5..cf173ddc1dad8c 100644 --- a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml @@ -17,6 +17,7 @@ name: Commissioner] config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_DIAG_TH_NW_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DIAG_TH_NW_1_1.yaml index fdf4354c475947..dc21b3abe346df 100644 --- a/src/app/tests/suites/certification/Test_TC_DIAG_TH_NW_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DIAG_TH_NW_1_1.yaml @@ -15,6 +15,7 @@ name: 51.1. TC-DIAG-TH_NW-1.1 ResetCounts Command[DUT Server] config: + nodeId: 0x12344321 cluster: "Thread Network Diagnostics" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Sends ResetCounts command" command: "ResetCounts" diff --git a/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml index 356b4f6c3c3a71..e4bdb2755f332b 100644 --- a/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DM_1_1.yaml @@ -15,6 +15,7 @@ name: 10.1.1. [TC-DM-1.1] Basic Cluster Server Attributes config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Query Data Model Revision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_DM_1_3_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_DM_1_3_Simulated.yaml index a11b08690781d4..af1a7ae9078826 100644 --- a/src/app/tests/suites/certification/Test_TC_DM_1_3_Simulated.yaml +++ b/src/app/tests/suites/certification/Test_TC_DM_1_3_Simulated.yaml @@ -15,6 +15,7 @@ name: 10.1.3. [TC-DM-1.3] Basic Cluster Server Attributes [DUT - Controller] config: + nodeId: 0x12344321 cluster: "Basic" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_DM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DM_2_2.yaml index d870ba20bccea9..794a06f06f8890 100644 --- a/src/app/tests/suites/certification/Test_TC_DM_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_DM_2_2.yaml @@ -15,6 +15,7 @@ name: 3.2.2. [TC-DM-2.2] Operational Credential Attributes config: + nodeId: 0x12344321 cluster: "Operational Credentials" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Query NOCs" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_DM_2_3_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_DM_2_3_Simulated.yaml index 100f790ca7c388..e31f0ff97c9d7e 100644 --- a/src/app/tests/suites/certification/Test_TC_DM_2_3_Simulated.yaml +++ b/src/app/tests/suites/certification/Test_TC_DM_2_3_Simulated.yaml @@ -15,6 +15,7 @@ name: 10.2.3. [TC-DM-2.3] Operational Credential Commands [DUT - Commissioner] config: + nodeId: 0x12344321 cluster: "Operational Credentials" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_DM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DM_3_1.yaml index e9c66ddf0bbb92..eb83e45c5553b6 100644 --- a/src/app/tests/suites/certification/Test_TC_DM_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DM_3_1.yaml @@ -15,6 +15,7 @@ name: 10.3.1. [TC-DM-3.1] Network Commissioning Attributes config: + nodeId: 0x12344321 cluster: "Network Commissioning" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Query MaxNetworks" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_DM_3_3_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_DM_3_3_Simulated.yaml index 6eb3d5e4f4b553..bfd75ff3487fb8 100644 --- a/src/app/tests/suites/certification/Test_TC_DM_3_3_Simulated.yaml +++ b/src/app/tests/suites/certification/Test_TC_DM_3_3_Simulated.yaml @@ -1,6 +1,7 @@ name: 10.3.3. [TC-DM-3.3] Network Commissioning Commands [DUT - Commissioner] config: + nodeId: 0x12344321 cluster: "Network Commissioning" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_EMR_1_1.yaml b/src/app/tests/suites/certification/Test_TC_EMR_1_1.yaml index 7fa5ead38cf937..e5ea84ac1240c6 100644 --- a/src/app/tests/suites/certification/Test_TC_EMR_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_EMR_1_1.yaml @@ -15,6 +15,7 @@ name: 13.1.1. [TC-EMR-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Electrical Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_1.yaml index c919838d9881fe..020d0cc8d3eaf7 100644 --- a/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ETHDIAG_1_1.yaml @@ -15,6 +15,7 @@ name: 48.1.1. [TC-ETHDIAG-1.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Ethernet Network Diagnostics" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Disabled due to issue #11670 and #13648 - label: "Read PHYRate attribute" diff --git a/src/app/tests/suites/certification/Test_TC_ETHDIAG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ETHDIAG_2_1.yaml index a488632be2eeff..383c5327405177 100644 --- a/src/app/tests/suites/certification/Test_TC_ETHDIAG_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ETHDIAG_2_1.yaml @@ -15,6 +15,7 @@ name: 48.1.3. [TC-ETHDIAG-2.1] Command received functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Ethernet Network Diagnostics" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Below steps disabled due to issue #13648 - label: "Sends ResetCounts command" diff --git a/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml index 753532879ea0f6..a9e8246b105d10 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml @@ -15,6 +15,7 @@ name: 33.1.1. [TC-FLW-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Flow Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12190 as per spec default value is 3 but expecting 1 - label: "read the global attribute: ClusterRevision" diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml index cca3e02f509e45..8381ef57050b17 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml @@ -15,6 +15,7 @@ name: 33.2.1. [TC-FLW-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Flow Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the mandatory attribute: MeasuredValue" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml index 201f88edf60725..069ae11b303dac 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml @@ -15,6 +15,7 @@ name: 33.2.2. [TC-FLW-2.2] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Flow Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the mandatory attribute: MeasuredValue" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml index 907e9e66b27809..1835021b71f76f 100644 --- a/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml @@ -15,6 +15,7 @@ name: 71.1.1. [TC-ILL-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Illuminance Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml index 9fc767ffdaf886..b23ec5bf13f9c9 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml @@ -15,6 +15,7 @@ name: 18.1.1. [TC-LVL-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Level Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml index 31a3f9ccfb2d2c..64b060fbdb0d7c 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml @@ -15,6 +15,7 @@ name: 24.2.1. [TC-LVL-2.1] Read cluster attributes (DUT as Server) config: + nodeId: 0x12344321 cluster: "Level Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # Temporary - see #13551 - label: "Reset level to 254" diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml index 3a7f0d99c1531c..2f6947a0ceeec0 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml @@ -15,6 +15,7 @@ name: 24.2.2. [TC-LVL-2.2] Write cluster attributes (DUT as Server) config: + nodeId: 0x12344321 cluster: "Level Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads the OnOffTransitionTime attribute from the DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml index 7c0784916b6009..608e9376446732 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml @@ -15,6 +15,7 @@ name: 24.3.1. [TC-LVL-3.1] MoveToLevel Verification (DUT as Server) config: + nodeId: 0x12344321 cluster: "Level Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "reads CurrentLevel attribute from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml index 584862a1c14369..212efdde6f2e4f 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml @@ -15,6 +15,7 @@ name: 24.4.1. [TC-LVL-4.1] Move Verification (DUT as Server) config: + nodeId: 0x12344321 cluster: "Level Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "reads CurrentLevel attribute from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml index ed1370813cefd8..66099613d60683 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml @@ -15,6 +15,7 @@ name: 24.5.1. [TC-LVL-5.1] Step Verification (DUT as Server) config: + nodeId: 0x12344321 cluster: "Level Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Sending on command" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml index 6f098444592b34..bc9644b72ec7e0 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml @@ -15,6 +15,7 @@ name: 24.6.1. [TC-LVL-6.1] Stop Verification (DUT as Server) config: + nodeId: 0x12344321 cluster: "Level Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Sending on command" cluster: "On/Off" diff --git a/src/app/tests/suites/certification/Test_TC_MC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_1_1.yaml index 4e824c399f9ae7..0d79abc8b97a4c 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_1_1.yaml @@ -15,6 +15,7 @@ name: 15.1.1. [TC-MC-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Media Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_MC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_2_1.yaml index 05fc231f891603..46d524d1aa1e06 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_2_1.yaml @@ -15,6 +15,7 @@ name: 21.2.1. [TC-MC-2.1] Low Power Mode Verification (DUT as Server) config: + nodeId: 0x12344321 cluster: "Low Power" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Put the device into low power mode" command: "Sleep" diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_1.yaml index 1cd7732ae6746e..7e5f34452607dc 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_1.yaml @@ -15,6 +15,7 @@ name: 21.3.1. [TC-MC-3.1] Navigation Keycode Verification config: + nodeId: 0x12344321 cluster: "Keypad Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Select" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_10.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_10.yaml index d737f095915d7c..d0c059bdded6ba 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_10.yaml @@ -15,6 +15,7 @@ name: 21.5.3. [TC-MC-3.10] Show and Hide Input Status Verification config: + nodeId: 0x12344321 cluster: "Media Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # TDOD: Enable when SDK supports command - label: "Hide Input Status Command" diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_11.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_11.yaml index 728ebc9d86bc50..fbffce466ca182 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_11.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_11.yaml @@ -15,6 +15,7 @@ name: 21.5.4. [TC-MC-3.11] Rename Input Verification config: + nodeId: 0x12344321 cluster: "Media Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # Remove disable flag when SDK supports command. - label: "Rename Input Command" diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_2.yaml index dd17d1de5eb3b3..aa1e731b714aac 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_2.yaml @@ -15,6 +15,7 @@ name: 21.3.2. [TC-MC-3.2] Location Keys Verification config: + nodeId: 0x12344321 cluster: "Keypad Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send RootMenu" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_3.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_3.yaml index 8855a3952b12d5..38e43cf12ddb6b 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_3.yaml @@ -15,6 +15,7 @@ name: 21.3.3. [TC-MC-3.3] Number Keys Verification config: + nodeId: 0x12344321 cluster: "Keypad Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Numbers1" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_4.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_4.yaml index 60ea913fee5d95..d1fd3025320c6d 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_4.yaml @@ -15,6 +15,7 @@ name: 21.3.4. [TC-MC-3.4] Press And Hold Key Press Verification config: + nodeId: 0x12344321 cluster: "Keypad Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send RootMenu" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_5.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_5.yaml index 4f1553697b0ab9..343f9e63b31d15 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_5.yaml @@ -15,6 +15,7 @@ name: 21.4.1. [TC-MC-3.5] Catalog List Verification config: + nodeId: 0x12344321 cluster: "Application Launcher" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # TODO: Need to enable when we can properly verify vendor id and uint16 - label: "Read launch list attribute." diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_6.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_6.yaml index 613d1c1f1bc930..7357f793ab22d8 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_6.yaml @@ -15,6 +15,7 @@ name: 21.4.2. [TC-MC-3.6] Current App Verification config: + nodeId: 0x12344321 cluster: "Application Launcher" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # TODO: Update the corresponding values when feature is supported - label: "Launch an app with the provided a application ID" diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_7.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_7.yaml index 25912fda474d82..50ef401b0c033f 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_7.yaml @@ -15,6 +15,7 @@ name: 21.4.2. [TC-MC-3.6] Current App Verification config: + nodeId: 0x12344321 cluster: "Application Launcher" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # TODO: Update the corresponding values when feature is supported - label: "Launch an app with the provided a application ID" diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_8.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_8.yaml index d49fb51e50fe72..609720eb59fd1d 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_8.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_8.yaml @@ -15,6 +15,7 @@ name: 21.5.1. [TC-MC-3.8] Input List Verification config: + nodeId: 0x12344321 cluster: "Media Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # TODO: Enable test and update response value when SDK supports. - label: "Read attribute media input list" diff --git a/src/app/tests/suites/certification/Test_TC_MC_3_9.yaml b/src/app/tests/suites/certification/Test_TC_MC_3_9.yaml index c7d80c44c96142..5d37c5a88fea65 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_3_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_3_9.yaml @@ -15,6 +15,7 @@ name: 21.5.2. [TC-MC-3.9] Select Input Verification config: + nodeId: 0x12344321 cluster: "Media Input" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId # Remove disable flag when SDK supports command. - label: "Select Input Command" diff --git a/src/app/tests/suites/certification/Test_TC_MC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_5_1.yaml index b7c00c3d554c7b..11a2504ec7673d 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_5_1.yaml @@ -15,6 +15,7 @@ name: 21.7.1. [TC-MC-5.1] List TV Channels Verification config: + nodeId: 0x12344321 cluster: "Channel" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue 13412 TODO: Enable test and update response value when SDK supports. - label: "Read attribute Channel list" diff --git a/src/app/tests/suites/certification/Test_TC_MC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_5_2.yaml index 24b01610fb63dc..3573399d157d99 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_5_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_5_2.yaml @@ -15,6 +15,7 @@ name: 21.7.2. [TC-MC-5.2] Change Channel by Number Verification config: + nodeId: 0x12344321 cluster: "Channel" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Disabled due to issue- #13029 - label: "Reads the ChannelList attribute" diff --git a/src/app/tests/suites/certification/Test_TC_MC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_MC_5_3.yaml index 77939dbdb99da9..34c95fb8581002 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_5_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_5_3.yaml @@ -15,6 +15,7 @@ name: 21.7.3. [TC-MC-5.3] Skip Channel Verification config: + nodeId: 0x12344321 cluster: "Channel" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Disabled due to issue- #13029 - label: "Reads the ChannelList attribute from the DUT" diff --git a/src/app/tests/suites/certification/Test_TC_MC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_6_1.yaml index b5c339a844a805..c73a9ca98f268e 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_6_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_6_1.yaml @@ -15,6 +15,7 @@ name: 21.8.1. [TC-MC-6.1] Mandatory Media Playback Verification config: + nodeId: 0x12344321 cluster: "Media Playback" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12884 Media cluster commands and precondition not supported - labe: "Precondition: Connect media content available for playback" diff --git a/src/app/tests/suites/certification/Test_TC_MC_6_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_6_2.yaml index 11ddbc6e0e9733..d312f218c28240 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_6_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_6_2.yaml @@ -15,6 +15,7 @@ name: 21.8.2. [TC-MC-6.2] Optional Media Playback Verification config: + nodeId: 0x12344321 cluster: "Media Playback" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12884 Media cluster commands and precondition not supported - labe: "Precondition: Connect media content available for playback" diff --git a/src/app/tests/suites/certification/Test_TC_MC_6_3.yaml b/src/app/tests/suites/certification/Test_TC_MC_6_3.yaml index 865086c176f875..e0c2ccf563f6a3 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_6_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_6_3.yaml @@ -15,6 +15,7 @@ name: 21.8.3. [TC-MC-6.3] Advanced Seek Media Playback Verification config: + nodeId: 0x12344321 cluster: "Media Playback" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12884 Media cluster commands and precondition not supported - labe: "Precondition: Connect media content available for playback" diff --git a/src/app/tests/suites/certification/Test_TC_MC_6_4.yaml b/src/app/tests/suites/certification/Test_TC_MC_6_4.yaml index 829cdbc429f709..4c1902c9561824 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_6_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_6_4.yaml @@ -15,6 +15,7 @@ name: 21.8.4. [TC-MC-6.4] Variable Speed Media Playback Verification config: + nodeId: 0x12344321 cluster: "Media Playback" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12884 Media cluster commands and precondition not supported - labe: "Precondition: Connect media content available for playback" diff --git a/src/app/tests/suites/certification/Test_TC_MC_7_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_7_1.yaml index b9030e69adaa29..99969324d8bc37 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_7_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_7_1.yaml @@ -15,6 +15,7 @@ name: 21.9.1. [TC-MC-7.1] Select Output Verification config: + nodeId: 0x12344321 cluster: "Audio Output" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Disabled due to issue- #13029 - label: "Reads the OutputList attribute" diff --git a/src/app/tests/suites/certification/Test_TC_MC_7_2.yaml b/src/app/tests/suites/certification/Test_TC_MC_7_2.yaml index 35c4f11b1c92c8..9194706bfa96de 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_7_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_7_2.yaml @@ -15,6 +15,7 @@ name: 21.9.2. [TC-MC-7.2] Rename Output Verification config: + nodeId: 0x12344321 cluster: "Audio Output" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Disabled due to issue- #13029 - label: "Reads the OutputList attribute from the DUT" diff --git a/src/app/tests/suites/certification/Test_TC_MC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_8_1.yaml index 6a7588ce68da4a..632a35608b92dd 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_8_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_8_1.yaml @@ -15,6 +15,7 @@ name: 21.10.1. [TC-MC-8.1] Navigate Target Verification (DUT as Server) config: + nodeId: 0x12344321 cluster: "Target Navigator" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Precondition: one or more navigation targets available" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_MC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_9_1.yaml index 86aa868c6db96a..802ce0428175ca 100644 --- a/src/app/tests/suites/certification/Test_TC_MC_9_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MC_9_1.yaml @@ -17,6 +17,7 @@ name: Server) config: + nodeId: 0x12344321 cluster: "Application Basic" endpoint: 1 @@ -24,6 +25,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Precondition" cluster: "LogCommands" diff --git a/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml index 312a1e1e8511e5..a3170f4d8d753b 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml @@ -15,6 +15,7 @@ name: 24.1.1. [TC-OCC-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Occupancy Sensing" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12190 as per spec default value is 3 but expecting 2 - label: "read the global attribute: ClusterRevision" diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml index fdb07cbe73655c..01f38f84cad857 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml @@ -15,6 +15,7 @@ name: 30.2.1. [TC-OCC-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Occupancy Sensing" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads mandatory attribute: Occupancy" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml index e7ecd37d820d35..5a86edb7c3af87 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml @@ -15,6 +15,7 @@ name: 30.2.2. [TC-OCC-2.2] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Occupancy Sensing" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Issue #10816 Disabled as values needs to be stored for comparison - label: "Reads Occupancy attribute from DUT" diff --git a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml index 6a675e5b6f7cfb..96fcc0bbeb8f7e 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml @@ -15,6 +15,7 @@ name: 3.1.1. [TC-OO-1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "On/Off" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml index 16591c7c76937d..39da698e47b9fd 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml @@ -15,6 +15,7 @@ name: 3.2.1. [TC-OO-2] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "On/Off" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the mandatory attribute: OnOff" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml index 5827f47894abdf..df74425ef9d417 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml @@ -15,6 +15,7 @@ name: 3.2.2. [TC-OO-3] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "On/Off" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send Off Command" command: "Off" diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml index 6aceab6a05aef4..2ab757c3e20712 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml @@ -15,6 +15,7 @@ name: 3.2.3. [TC-OO-2.3] Secondary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "On/Off" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Send On Command" command: "On" diff --git a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml index f07d2d318266ef..706a763d426115 100644 --- a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml @@ -15,6 +15,7 @@ name: 15.1.1. [TC-PCC-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Pump Configuration and Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12190 as per spec default value is 3 but expecting 1 - label: "read the global attribute: ClusterRevision" diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml index d91a0f0cb347af..850e789712fbec 100644 --- a/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml @@ -15,6 +15,7 @@ name: 15.2.1. [TC-PCC-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Pump Configuration and Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the mandatory attribute: MaxPressure" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml index bfda9c0d323ba6..53d8b1a6e0fbc7 100644 --- a/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml @@ -15,6 +15,7 @@ name: 15.2.2. [TC-PCC-2.2] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Pump Configuration and Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Write 1 to the OperationMode attribute to DUT: OperationMode" command: "writeAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml index de2e95de1f9afe..55319761407622 100644 --- a/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml @@ -15,6 +15,7 @@ name: 15.2.3. [TC-PCC-2.3] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Pump Configuration and Control" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Write 0 to the OperationMode attribute to DUT" command: "writeAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml index 155cf8cf660902..e217a61669c2ab 100644 --- a/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml @@ -15,6 +15,7 @@ name: 36.1.1. [TC-PRS-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Pressure Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12190 as per spec default value is 3 but expecting 2 - label: "Read the global attribute: ClusterRevision" diff --git a/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml index 1be6831d3dda17..546331e7d361a6 100644 --- a/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml @@ -15,6 +15,7 @@ name: 36.2.1. [TC-PRS-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Pressure Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read the mandatory attribute constraints: MeasuredValue" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml index 061aba72bef687..e484e43c2e22f8 100644 --- a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml @@ -15,6 +15,7 @@ name: 62.1.1. [TC-PS-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Power Source" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the global attribute: ClusterRevision" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml index 45cc491dbe9522..513e2985c968e6 100644 --- a/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml @@ -15,6 +15,7 @@ name: 9.1.1. [TC-RH-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Relative Humidity Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12190 as per spec default value is 3 but expecting 2 #referring default value of Water Content Measurement diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml index 63b676924a2bd2..9c610309583d93 100644 --- a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml @@ -15,6 +15,7 @@ name: 9.2.1. [TC-RH-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Relative Humidity Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads the mandatory attribute: MeasuredValue" disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml index 26ba28de6ad5ff..977acd69776aa0 100644 --- a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml @@ -15,6 +15,7 @@ name: 9.2.2. [TC-RH-2.2] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Relative Humidity Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Disabled as values needs to be stored for comparison - label: "Reads MeasuredValue attribute from DUT" diff --git a/src/app/tests/suites/certification/Test_TC_SWDIAG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_SWDIAG_1_1.yaml index ae45e8cea85052..5e2af32844fd32 100644 --- a/src/app/tests/suites/certification/Test_TC_SWDIAG_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWDIAG_1_1.yaml @@ -15,6 +15,7 @@ name: 45.1.1. [TC-SWDIAG-1.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Software Diagnostics" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads a list of ThreadMetrics struct non-global attribute from DUT." diff --git a/src/app/tests/suites/certification/Test_TC_SWDIAG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SWDIAG_2_1.yaml index 70c0fa0ba2ce9a..3e6af7155dd29b 100644 --- a/src/app/tests/suites/certification/Test_TC_SWDIAG_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWDIAG_2_1.yaml @@ -15,6 +15,7 @@ name: 45.1.3. [TC-SWDIAG-2.1] Event functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Software Diagnostics" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_SWDIAG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_SWDIAG_3_1.yaml index a7149d134902a7..426229bfabeee1 100644 --- a/src/app/tests/suites/certification/Test_TC_SWDIAG_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWDIAG_3_1.yaml @@ -15,6 +15,7 @@ name: 45.1.4. [TC-SWDIAG-3.1] Command received functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Software Diagnostics" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Sends ResetWatermarks to DUT" command: "ResetWatermarks" diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml index e112b0da7cfbce..0c509a450c8ee6 100644 --- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml @@ -15,6 +15,7 @@ name: 74.2.1. [TC-SWTCH-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Switch" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Read NumberOfPositions attribute" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml index 71f7849f2d39d8..d5a9772e47fd58 100644 --- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml @@ -15,6 +15,7 @@ name: 74.2.2. [TC-SWTCH-2.2] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Switch" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #### 2: tests for Latching Switch - label: "User interaction needed" diff --git a/src/app/tests/suites/certification/Test_TC_TM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TM_1_1.yaml index c9fa04bf2dcb61..bc54b0c43cc615 100644 --- a/src/app/tests/suites/certification/Test_TC_TM_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TM_1_1.yaml @@ -15,6 +15,7 @@ name: 6.1.1. [TC-TM-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Temperature Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12190 as per spec default value is 4 but expecting 3 - label: "read the global attribute: ClusterRevision" diff --git a/src/app/tests/suites/certification/Test_TC_TM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TM_2_1.yaml index 46a9e8fa7d0bdb..77dad07826ef45 100644 --- a/src/app/tests/suites/certification/Test_TC_TM_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TM_2_1.yaml @@ -15,6 +15,7 @@ name: 6.2.1. [TC-TM-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Temperature Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the mandatory attribute: MeasuredValue" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml index b0f13d593c8d7a..56f45e811f1c8e 100644 --- a/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml @@ -15,6 +15,7 @@ name: 6.2.2. [TC-TM-2.2] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Temperature Measurement" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Disabled as values needs to be stored for comparison - label: "Reads MeasuredValue attribute from DUT" diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml index 1befc8bacc83e3..c12f4bb254ee2a 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml @@ -15,6 +15,7 @@ name: 42.1.1. [TC-TSTAT-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Thermostat" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12190 as per spec default value is 5 but expecting 3 - label: "read the global attribute: ClusterRevision" diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml index 92dc0d3506c9f7..6b6dee6c8cc57a 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml @@ -15,6 +15,7 @@ name: 42.2.1. [TC-TSTAT-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Thermostat" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #11524 disabled steps are for attributes not supported in YAML framework - label: "Reads mandatory attributes from DUT: LocalTemperature" diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml index 8846dfd793dd7e..24ddb1676891b2 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml @@ -15,6 +15,7 @@ name: 42.2.2. [TC-TSTAT-2.2] Setpoint Test Cases with server as DUT config: + nodeId: 0x12344321 cluster: "Thermostat" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml index d2d1faf3ffe699..ffc081f860c957 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml @@ -15,6 +15,7 @@ name: 12.1.1. [TC-TSUIC-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Thermostat User Interface Configuration" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #issue #12190 as per spec default value is 2 but expecting 1 - label: "read the global attribute: ClusterRevision" diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml index 7905fd64ee805e..ae682b0400e4f2 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml @@ -15,6 +15,7 @@ name: 12.2.1. [TC-TSUIC-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Thermostat User Interface Configuration" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "read the mandatory attribute: TemperatureDisplayMode" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml index 55ec48e64eb9ed..ba5652d7f841ae 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml @@ -15,6 +15,7 @@ name: 12.2.2. [TC-TSUIC-2.2] Primary functionality with server as DUT config: + nodeId: 0x12344321 cluster: "Thermostat User Interface Configuration" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Writes a value of 0 to TemperatureDisplayMode attribute of DUT" command: "writeAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_1.yaml index e2c0f53419a22b..282e7f63a22d03 100644 --- a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WIFIDIAG_1_1.yaml @@ -15,6 +15,7 @@ name: 54.1.1. [TC-WIFIDIAG-1.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "WiFi Network Diagnostics" endpoint: 0 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads NetworkInterface structure attribute from DUT" cluster: "General Diagnostics" diff --git a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_WIFIDIAG_3_1.yaml index 337c939846ecf5..46ae0c98e9b88d 100644 --- a/src/app/tests/suites/certification/Test_TC_WIFIDIAG_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WIFIDIAG_3_1.yaml @@ -16,6 +16,7 @@ name: 54.2.3. [TC-WIFIDIAG-3.1] Command received functionality with server as DUT config: + nodeId: 0x12344321 cluster: "WiFi Network Diagnostics" endpoint: 0 @@ -23,6 +24,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Below steps disabled due to issue #13645 # Also, ResetCounts may not work on some platforms yet? diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml index a6a5f5de652701..a9bea576ab9101 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml @@ -15,6 +15,7 @@ name: Window Covering [TC-WNCV-1.1] Global attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Window Covering" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId ### MANDATORY GLOBAL Attributes ### Attribute[0xFFFD]: ClusterRevision ======================================= diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml index cf87152b1ab274..79c536df640f74 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml @@ -17,6 +17,7 @@ name: Window Covering [TC-WNCV-2.1] Attributes with server as DUT config: + nodeId: 0x12344321 cluster: "Window Covering" endpoint: 1 @@ -24,6 +25,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId ### MANDATORY Attributes ### Attribute[ 0]: Type ======================================= diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_2.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_2.yaml index c894b7a53197ce..6806b021f91b9a 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_2.yaml @@ -15,6 +15,7 @@ name: 39.2.2. [TC-WNCV-2.2] ConfigStatus Attribute with server as DUT config: + nodeId: 0x12344321 cluster: "Window Covering" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Issue #10811 if condition is required, need YAML support for this - label: "Reads ConfigStatus attribute from DUT" diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml index 1445d9af8e2ac5..39c45bfb57f111 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml @@ -15,6 +15,7 @@ name: 39.2.4. [TC-WNCV-2.4] Type Attribute with server as DUT config: + nodeId: 0x12344321 cluster: "Window Covering" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId #Issue #10811 if condition is required, need YAML support for this - label: "Reads Type attribute from DUT" diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml index bf22f9b80bb428..909a85c9551532 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml @@ -15,6 +15,7 @@ name: 39.2.5. [TC-WNCV-2.5] EndProductType Attribute with server as DUT config: + nodeId: 0x12344321 cluster: "Window Covering" endpoint: 1 @@ -22,6 +23,10 @@ tests: - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId - label: "Reads EndProductType attribute from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml index 705c811aad68c0..26e8aa7ab7bfbe 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml @@ -19,6 +19,7 @@ name: # TC-WNCV tests featuremap conditional dependencies -> use PICS config: + nodeId: 0x12344321 cluster: "Window Covering" endpoint: 1 @@ -26,6 +27,10 @@ tests: - label: "0: Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId ################ Position Init Phase ############# ### Step 1x -> Initialize the Covering position before any testing diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml index b63b14f3acd489..99c5caccad7cca 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml @@ -19,6 +19,7 @@ name: # TC-WNCV tests featuremap conditional dependencies -> use PICS config: + nodeId: 0x12344321 cluster: "Window Covering" endpoint: 1 @@ -26,6 +27,10 @@ tests: - label: "0: Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId ################ Position Init Phase ############# ### Step 1x -> Initialize the Covering position before any testing diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_3.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_3.yaml index 651420e8e5126e..6f10aa0275c1e8 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_3.yaml @@ -17,6 +17,7 @@ name: Window Covering [TC-WNCV-3.3] StopMotion Verification with server as DUT # TC-WNCV tests featuremap conditional dependencies -> use PICS config: + nodeId: 0x12344321 cluster: "Window Covering" endpoint: 1 @@ -24,6 +25,10 @@ tests: - label: "0: Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" + arguments: + values: + - name: "nodeId" + value: nodeId ################ Position Init Phase ############# ### Step 1x -> Initialize the Covering position before any testing diff --git a/src/app/tests/suites/commands/delay/DelayCommands.h b/src/app/tests/suites/commands/delay/DelayCommands.h index 324ed483497a48..22e7fd783c8acb 100644 --- a/src/app/tests/suites/commands/delay/DelayCommands.h +++ b/src/app/tests/suites/commands/delay/DelayCommands.h @@ -31,7 +31,7 @@ class DelayCommands virtual CHIP_ERROR ContinueOnChipMainThread() = 0; virtual void OnWaitForMs() = 0; - virtual CHIP_ERROR WaitForCommissionee() { return CHIP_ERROR_NOT_IMPLEMENTED; }; + virtual CHIP_ERROR WaitForCommissionee(chip::NodeId nodeId) { return CHIP_ERROR_NOT_IMPLEMENTED; }; virtual CHIP_ERROR WaitForCommissioning() { return CHIP_ERROR_NOT_IMPLEMENTED; }; CHIP_ERROR WaitForMs(uint16_t ms); CHIP_ERROR WaitForCommissionableAdvertisement(); diff --git a/src/app/zap-templates/common/simulated-clusters/clusters/DelayCommands.js b/src/app/zap-templates/common/simulated-clusters/clusters/DelayCommands.js index 7c064e38395eb8..d2f9229cab8a65 100644 --- a/src/app/zap-templates/common/simulated-clusters/clusters/DelayCommands.js +++ b/src/app/zap-templates/common/simulated-clusters/clusters/DelayCommands.js @@ -38,7 +38,7 @@ const WaitForCommissioning = { const WaitForCommissionee = { name : 'WaitForCommissionee', - arguments : [], + arguments : [ { type : 'NODE_ID', name : 'nodeId' } ], response : { arguments : [] } }; diff --git a/src/app/zap-templates/common/variables/Variables.js b/src/app/zap-templates/common/variables/Variables.js index 5c2e77dcac53a7..5fe1148b2b9b1b 100644 --- a/src/app/zap-templates/common/variables/Variables.js +++ b/src/app/zap-templates/common/variables/Variables.js @@ -27,6 +27,7 @@ const templateUtil = require(zapPath + 'generator/template-util.js') const { getCommands, getAttributes } = require('../simulated-clusters/SimulatedClusters.js'); const knownVariables = { + 'nodeId' : { type : 'NODE_ID', defaultValue : 0x12345 }, 'endpoint' : { type : 'ENDPOINT_NO', defaultValue : '' }, 'cluster' : { type : 'CHAR_STRING', defaultValue : '' }, 'timeout' : { type : 'INT16U', defaultValue : 30 }, diff --git a/src/darwin/Framework/CHIP/templates/clusters-tests.zapt b/src/darwin/Framework/CHIP/templates/clusters-tests.zapt index 1b3f3c95daff7f..c5c64e0cec6957 100644 --- a/src/darwin/Framework/CHIP/templates/clusters-tests.zapt +++ b/src/darwin/Framework/CHIP/templates/clusters-tests.zapt @@ -20,7 +20,7 @@ const uint16_t kPairingTimeoutInSeconds = 10; const uint16_t kAddressResolveTimeoutInSeconds = 10; const uint16_t kCASESetupTimeoutInSeconds = 30; const uint16_t kTimeoutInSeconds = 5; -const uint64_t kDeviceId = 1; +const uint64_t nodeId = 0x12344321; const uint16_t kDiscriminator = 3840; const uint32_t kSetupPINCode = 20202021; const uint16_t kRemotePort = 5540; @@ -49,12 +49,12 @@ void UserPrompt(XCTestExpectation * expectation, dispatch_queue_t queue, NSStrin [expectation fulfill]; } -void WaitForCommissionee(XCTestExpectation * expectation, dispatch_queue_t queue) +void WaitForCommissionee(XCTestExpectation * expectation, dispatch_queue_t queue, uint64_t deviceId) { CHIPDeviceController * controller = [CHIPDeviceController sharedController]; XCTAssertNotNil(controller); - [controller getConnectedDevice:kDeviceId + [controller getConnectedDevice:deviceId queue:dispatch_get_main_queue() completionHandler:^(CHIPDevice * _Nullable device, NSError * _Nullable error) { XCTAssertEqual(error.code, 0); @@ -132,7 +132,7 @@ CHIPDevice * GetConnectedDevice(void) XCTAssertTrue(started); NSError * error; - [controller pairDevice:kDeviceId + [controller pairDevice:nodeId address:kAddress port:kRemotePort discriminator:kDiscriminator @@ -143,7 +143,7 @@ CHIPDevice * GetConnectedDevice(void) [self waitForExpectationsWithTimeout:kPairingTimeoutInSeconds handler:nil]; __block XCTestExpectation * connectionExpectation = [self expectationWithDescription:@"CASE established"]; - [controller getConnectedDevice:kDeviceId + [controller getConnectedDevice:nodeId queue:dispatch_get_main_queue() completionHandler:^(CHIPDevice * _Nullable device, NSError * _Nullable error) { XCTAssertEqual(error.code, 0); @@ -159,7 +159,7 @@ CHIPDevice * GetConnectedDevice(void) XCTAssertNotNil(controller); NSError * error; - [controller unpairDevice:kDeviceId error:&error]; + [controller unpairDevice:nodeId error:&error]; XCTAssertEqual(error.code, 0); BOOL stopped = [controller shutdown]; @@ -173,7 +173,7 @@ CHIPDevice * GetConnectedDevice(void) __block CHIPDevice * device; __block XCTestExpectation * connectionExpectation = [self expectationWithDescription:@"CASE established"]; - [controller getConnectedDevice:kDeviceId + [controller getConnectedDevice:nodeId queue:dispatch_get_main_queue() completionHandler:^(CHIPDevice * _Nullable retrievedDevice, NSError * _Nullable error) { XCTAssertEqual(error.code, 0); diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index 65921ef1b1c2c6..a2168493d9b8aa 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -37,7 +37,7 @@ const uint16_t kAddressResolveTimeoutInSeconds = 10; const uint16_t kCASESetupTimeoutInSeconds = 30; const uint16_t kTimeoutInSeconds = 5; -const uint64_t kDeviceId = 1; +const uint64_t nodeId = 0x12344321; const uint16_t kDiscriminator = 3840; const uint32_t kSetupPINCode = 20202021; const uint16_t kRemotePort = 5540; @@ -65,12 +65,12 @@ void Log(XCTestExpectation * expectation, dispatch_queue_t queue, NSString * mes // Stub for User Prompts for XCTests to run. void UserPrompt(XCTestExpectation * expectation, dispatch_queue_t queue, NSString * message) { [expectation fulfill]; } -void WaitForCommissionee(XCTestExpectation * expectation, dispatch_queue_t queue) +void WaitForCommissionee(XCTestExpectation * expectation, dispatch_queue_t queue, uint64_t deviceId) { CHIPDeviceController * controller = [CHIPDeviceController sharedController]; XCTAssertNotNil(controller); - [controller getConnectedDevice:kDeviceId + [controller getConnectedDevice:deviceId queue:dispatch_get_main_queue() completionHandler:^(CHIPDevice * _Nullable device, NSError * _Nullable error) { XCTAssertEqual(error.code, 0); @@ -149,7 +149,7 @@ - (void)testInitStack XCTAssertTrue(started); NSError * error; - [controller pairDevice:kDeviceId + [controller pairDevice:nodeId address:kAddress port:kRemotePort discriminator:kDiscriminator @@ -160,7 +160,7 @@ - (void)testInitStack [self waitForExpectationsWithTimeout:kPairingTimeoutInSeconds handler:nil]; __block XCTestExpectation * connectionExpectation = [self expectationWithDescription:@"CASE established"]; - [controller getConnectedDevice:kDeviceId + [controller getConnectedDevice:nodeId queue:dispatch_get_main_queue() completionHandler:^(CHIPDevice * _Nullable device, NSError * _Nullable error) { XCTAssertEqual(error.code, 0); @@ -176,7 +176,7 @@ - (void)testShutdownStack XCTAssertNotNil(controller); NSError * error; - [controller unpairDevice:kDeviceId error:&error]; + [controller unpairDevice:nodeId error:&error]; XCTAssertEqual(error.code, 0); BOOL stopped = [controller shutdown]; @@ -190,7 +190,7 @@ - (void)testReuseChipClusterObject __block CHIPDevice * device; __block XCTestExpectation * connectionExpectation = [self expectationWithDescription:@"CASE established"]; - [controller getConnectedDevice:kDeviceId + [controller getConnectedDevice:nodeId queue:dispatch_get_main_queue() completionHandler:^(CHIPDevice * _Nullable retrievedDevice, NSError * _Nullable error) { XCTAssertEqual(error.code, 0); @@ -232,7 +232,7 @@ - (void)testSendClusterTest_TC_BI_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_BI_1_1_000001_ReadAttribute @@ -350,7 +350,7 @@ - (void)testSendClusterTest_TC_BI_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_BI_2_1_000001_ReadAttribute @@ -625,7 +625,7 @@ - (void)testSendClusterTest_TC_BI_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_BI_2_2_000001_ReadAttribute @@ -826,7 +826,7 @@ - (void)testSendClusterTest_TC_BOOL_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_BOOL_1_1_000001_ReadAttribute @@ -944,7 +944,7 @@ - (void)testSendClusterTest_TC_BOOL_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_BOOL_2_1_000001_ReadAttribute @@ -1044,7 +1044,7 @@ - (void)testSendClusterTest_TC_BRAC_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_BRAC_1_1_000001_ReadAttribute @@ -1096,7 +1096,7 @@ - (void)testSendClusterTest_TC_CC_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_1_1_000001_ReadAttribute @@ -1166,7 +1166,7 @@ - (void)testSendClusterTest_TC_CC_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_2_1_000001_ReadAttribute @@ -5234,7 +5234,7 @@ - (void)testSendClusterTest_TC_CC_3_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_3_1_000001_On @@ -5465,7 +5465,7 @@ - (void)testSendClusterTest_TC_CC_3_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_3_2_000001_On @@ -5660,7 +5660,7 @@ - (void)testSendClusterTest_TC_CC_3_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_3_3_000001_On @@ -5807,7 +5807,7 @@ - (void)testSendClusterTest_TC_CC_4_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_4_1_000001_On @@ -5927,7 +5927,7 @@ - (void)testSendClusterTest_TC_CC_4_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_4_2_000001_On @@ -6172,7 +6172,7 @@ - (void)testSendClusterTest_TC_CC_4_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_4_3_000001_On @@ -6319,7 +6319,7 @@ - (void)testSendClusterTest_TC_CC_4_4_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_4_4_000001_On @@ -6440,7 +6440,7 @@ - (void)testSendClusterTest_TC_CC_5_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_5_1_000001_On @@ -6561,7 +6561,7 @@ - (void)testSendClusterTest_TC_CC_5_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_5_2_000001_On @@ -6704,7 +6704,7 @@ - (void)testSendClusterTest_TC_CC_5_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_5_3_000001_On @@ -6825,7 +6825,7 @@ - (void)testSendClusterTest_TC_CC_6_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_6_1_000001_On @@ -6945,7 +6945,7 @@ - (void)testSendClusterTest_TC_CC_6_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_6_2_000001_On @@ -7234,7 +7234,7 @@ - (void)testSendClusterTest_TC_CC_6_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_6_3_000001_On @@ -7385,7 +7385,7 @@ - (void)testSendClusterTest_TC_CC_7_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_7_1_000001_On @@ -7610,7 +7610,7 @@ - (void)testSendClusterTest_TC_CC_7_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_7_2_000001_On @@ -7837,7 +7837,7 @@ - (void)testSendClusterTest_TC_CC_7_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_7_3_000001_On @@ -7984,7 +7984,7 @@ - (void)testSendClusterTest_TC_CC_7_4_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_7_4_000001_On @@ -8105,7 +8105,7 @@ - (void)testSendClusterTest_TC_CC_8_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_8_1_000001_On @@ -8505,7 +8505,7 @@ - (void)testSendClusterTest_TC_CC_9_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_9_1_000001_On @@ -9830,7 +9830,7 @@ - (void)testSendClusterTest_TC_CC_9_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_9_2_000001_On @@ -10304,7 +10304,7 @@ - (void)testSendClusterTest_TC_CC_9_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_CC_9_3_000001_On @@ -10880,7 +10880,7 @@ - (void)testSendClusterTest_TC_DM_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DM_1_1_000001_ReadAttribute @@ -11362,7 +11362,7 @@ - (void)testSendClusterTest_TC_DM_3_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DM_3_1_000001_ReadAttribute @@ -11419,7 +11419,7 @@ - (void)testSendClusterTest_TC_EMR_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_EMR_1_1_000001_ReadAttribute @@ -11537,7 +11537,7 @@ - (void)testSendClusterTest_TC_ETHDIAG_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -11546,7 +11546,7 @@ - (void)testSendClusterTest_TC_ETHDIAG_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -11555,7 +11555,7 @@ - (void)testSendClusterTest_TC_FLW_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_FLW_1_1_000001_ReadAttribute @@ -11625,7 +11625,7 @@ - (void)testSendClusterTest_TC_FLW_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_FLW_2_1_000001_ReadAttribute @@ -11939,7 +11939,7 @@ - (void)testSendClusterTest_TC_FLW_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_FLW_2_2_000001_ReadAttribute @@ -11986,7 +11986,7 @@ - (void)testSendClusterTest_TC_ILL_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_ILL_1_1_000001_ReadAttribute @@ -12114,7 +12114,7 @@ - (void)testSendClusterTest_TC_LVL_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_LVL_1_1_000001_ReadAttribute @@ -12273,7 +12273,7 @@ - (void)testSendClusterTest_TC_LVL_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_LVL_2_1_000001_MoveToLevel @@ -12602,7 +12602,7 @@ - (void)testSendClusterTest_TC_LVL_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_LVL_2_2_000001_ReadAttribute @@ -12963,7 +12963,7 @@ - (void)testSendClusterTest_TC_LVL_3_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_LVL_3_1_000001_ReadAttribute @@ -13272,7 +13272,7 @@ - (void)testSendClusterTest_TC_LVL_4_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_LVL_4_1_000001_ReadAttribute @@ -13614,7 +13614,7 @@ - (void)testSendClusterTest_TC_LVL_5_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_LVL_5_1_000001_On @@ -13868,7 +13868,7 @@ - (void)testSendClusterTest_TC_LVL_6_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_LVL_6_1_000001_On @@ -14101,7 +14101,7 @@ - (void)testSendClusterTest_TC_MC_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_1_1_000001_ReadAttribute @@ -14219,7 +14219,7 @@ - (void)testSendClusterTest_TC_MC_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_2_1_000001_Sleep @@ -14247,7 +14247,7 @@ - (void)testSendClusterTest_TC_MC_3_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14256,7 +14256,7 @@ - (void)testSendClusterTest_TC_MC_3_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14265,7 +14265,7 @@ - (void)testSendClusterTest_TC_MC_3_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14274,7 +14274,7 @@ - (void)testSendClusterTest_TC_MC_3_4_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14283,7 +14283,7 @@ - (void)testSendClusterTest_TC_MC_3_5_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14292,7 +14292,7 @@ - (void)testSendClusterTest_TC_MC_3_6_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14301,7 +14301,7 @@ - (void)testSendClusterTest_TC_MC_3_7_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14310,7 +14310,7 @@ - (void)testSendClusterTest_TC_MC_3_8_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14319,7 +14319,7 @@ - (void)testSendClusterTest_TC_MC_3_9_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14328,7 +14328,7 @@ - (void)testSendClusterTest_TC_MC_3_10_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14337,7 +14337,7 @@ - (void)testSendClusterTest_TC_MC_3_11_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14346,7 +14346,7 @@ - (void)testSendClusterTest_TC_MC_5_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_5_1_000001_ReadAttribute @@ -14374,7 +14374,7 @@ - (void)testSendClusterTest_TC_MC_5_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_5_2_000001_UserPrompt @@ -14391,7 +14391,7 @@ - (void)testSendClusterTest_TC_MC_5_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_5_3_000001_UserPrompt @@ -14408,7 +14408,7 @@ - (void)testSendClusterTest_TC_MC_6_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_6_1_000001_UserPrompt @@ -14473,7 +14473,7 @@ - (void)testSendClusterTest_TC_MC_6_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_6_2_000001_UserPrompt @@ -14562,7 +14562,7 @@ - (void)testSendClusterTest_TC_MC_6_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_6_3_000001_UserPrompt @@ -14595,7 +14595,7 @@ - (void)testSendClusterTest_TC_MC_6_4_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_6_4_000001_UserPrompt @@ -14724,7 +14724,7 @@ - (void)testSendClusterTest_TC_MC_7_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14733,7 +14733,7 @@ - (void)testSendClusterTest_TC_MC_7_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -14742,7 +14742,7 @@ - (void)testSendClusterTest_TC_MC_8_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } NSNumber * _Nonnull currentTarget; @@ -14795,7 +14795,7 @@ - (void)testSendClusterTest_TC_MC_9_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_MC_9_1_000001_Log @@ -14946,7 +14946,7 @@ - (void)testSendClusterTest_TC_OCC_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_OCC_1_1_000001_ReadAttribute @@ -15016,7 +15016,7 @@ - (void)testSendClusterTest_TC_OCC_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_OCC_2_1_000001_ReadAttribute @@ -15268,7 +15268,7 @@ - (void)testSendClusterTest_TC_OCC_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_OCC_2_2_000001_ReadAttribute @@ -15315,7 +15315,7 @@ - (void)testSendClusterTest_TC_OO_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_OO_1_1_000001_ReadAttribute @@ -15522,7 +15522,7 @@ - (void)testSendClusterTest_TC_OO_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_OO_2_1_000001_ReadAttribute @@ -15881,7 +15881,7 @@ - (void)testSendClusterTest_TC_OO_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_OO_2_2_000001_Off @@ -16193,7 +16193,7 @@ - (void)testSendClusterTest_TC_OO_2_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_OO_2_3_000001_On @@ -17208,7 +17208,7 @@ - (void)testSendClusterTest_TC_PS_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_PS_1_1_000001_ReadAttribute @@ -17326,7 +17326,7 @@ - (void)testSendClusterTest_TC_PRS_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_PRS_1_1_000001_ReadAttribute @@ -17396,7 +17396,7 @@ - (void)testSendClusterTest_TC_PRS_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_PRS_2_1_000001_ReadAttribute @@ -17605,7 +17605,7 @@ - (void)testSendClusterTest_TC_PCC_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_PCC_1_1_000001_ReadAttribute @@ -17702,7 +17702,7 @@ - (void)testSendClusterTest_TC_PCC_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_PCC_2_1_000001_ReadAttribute @@ -18986,7 +18986,7 @@ - (void)testSendClusterTest_TC_PCC_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_PCC_2_2_000001_WriteAttribute @@ -19070,7 +19070,7 @@ - (void)testSendClusterTest_TC_PCC_2_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_PCC_2_3_000001_WriteAttribute @@ -19299,7 +19299,7 @@ - (void)testSendClusterTest_TC_RH_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_RH_1_1_000001_ReadAttribute @@ -19375,7 +19375,7 @@ - (void)testSendClusterTest_TC_RH_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_RH_2_1_000001_ReadAttribute @@ -19509,7 +19509,7 @@ - (void)testSendClusterTest_TC_RH_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_RH_2_2_000001_ReadAttribute @@ -19560,7 +19560,7 @@ - (void)testSendClusterTest_TC_SWTCH_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_SWTCH_2_1_000001_ReadAttribute @@ -19719,7 +19719,7 @@ - (void)testSendClusterTest_TC_SWTCH_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_SWTCH_2_2_000001_UserPrompt @@ -20057,7 +20057,7 @@ - (void)testSendClusterTest_TC_TM_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TM_1_1_000001_ReadAttribute @@ -20133,7 +20133,7 @@ - (void)testSendClusterTest_TC_TM_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TM_2_1_000001_ReadAttribute @@ -20202,7 +20202,7 @@ - (void)testSendClusterTest_TC_TM_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TM_2_2_000001_ReadAttribute @@ -20253,7 +20253,7 @@ - (void)testSendClusterTest_TC_TSTAT_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TSTAT_1_1_000001_ReadAttribute @@ -20343,7 +20343,7 @@ - (void)testSendClusterTest_TC_TSTAT_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TSTAT_2_1_000001_ReadAttribute @@ -22002,7 +22002,7 @@ - (void)testSendClusterTest_TC_TSTAT_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TSTAT_2_2_000001_ReadAttribute @@ -23303,7 +23303,7 @@ - (void)testSendClusterTest_TC_TSUIC_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TSUIC_1_1_000001_ReadAttribute @@ -23376,7 +23376,7 @@ - (void)testSendClusterTest_TC_TSUIC_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TSUIC_2_1_000001_ReadAttribute @@ -23735,7 +23735,7 @@ - (void)testSendClusterTest_TC_TSUIC_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_TSUIC_2_2_000001_WriteAttribute @@ -23984,7 +23984,7 @@ - (void)testSendClusterTest_TC_DIAG_TH_NW_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_DIAG_TH_NW_1_1_000001_ResetCounts @@ -24040,7 +24040,7 @@ - (void)testSendClusterTest_TC_WIFIDIAG_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WIFIDIAG_1_1_000001_ReadAttribute @@ -24068,7 +24068,7 @@ - (void)testSendClusterTest_TC_WIFIDIAG_3_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -24077,7 +24077,7 @@ - (void)testSendClusterTest_TC_WNCV_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WNCV_1_1_000001_ReadAttribute @@ -24266,7 +24266,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WNCV_2_1_000001_ReadAttribute @@ -25824,7 +25824,7 @@ - (void)testSendClusterTest_TC_WNCV_2_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } @@ -25833,7 +25833,7 @@ - (void)testSendClusterTest_TC_WNCV_2_4_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WNCV_2_4_000001_ReadAttribute @@ -25898,7 +25898,7 @@ - (void)testSendClusterTest_TC_WNCV_2_5_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WNCV_2_5_000001_ReadAttribute @@ -25963,7 +25963,7 @@ - (void)testSendClusterTest_TC_WNCV_3_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"0: Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WNCV_3_1_000001_DownOrClose @@ -26554,7 +26554,7 @@ - (void)testSendClusterTest_TC_WNCV_3_2_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"0: Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WNCV_3_2_000001_UpOrOpen @@ -27145,7 +27145,7 @@ - (void)testSendClusterTest_TC_WNCV_3_3_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"0: Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WNCV_3_3_000001_DownOrClose @@ -27491,7 +27491,7 @@ - (void)testSendClusterTestCluster_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestCluster_000001_Test @@ -39884,7 +39884,7 @@ - (void)testSendClusterTestSaveAs_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } NSNumber * _Nonnull TestAddArgumentDefaultValue; @@ -42579,7 +42579,7 @@ - (void)testSendClusterTestConstraints_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestConstraints_000001_WriteAttribute @@ -43105,7 +43105,7 @@ - (void)testSendClusterTestDelayCommands_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestDelayCommands_000001_WaitForMs @@ -43122,7 +43122,7 @@ - (void)testSendClusterTestDescriptorCluster_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestDescriptorCluster_000001_ReadAttribute @@ -43257,7 +43257,7 @@ - (void)testSendClusterTestBasicInformation_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestBasicInformation_000001_ReadAttribute @@ -43403,7 +43403,7 @@ - (void)testSendClusterTestGroupsCluster_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestGroupsCluster_000001_ViewGroup @@ -43994,7 +43994,7 @@ - (void)testSendClusterTestGroupKeyManagementCluster_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestGroupKeyManagementCluster_000001_ReadAttribute @@ -44493,7 +44493,7 @@ - (void)testSendClusterTestIdentifyCluster_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestIdentifyCluster_000001_Identify @@ -44524,7 +44524,7 @@ - (void)testSendClusterTestLogCommands_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestLogCommands_000001_Log @@ -44549,7 +44549,7 @@ - (void)testSendClusterTestOperationalCredentialsCluster_000000_WaitForCommissio XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestOperationalCredentialsCluster_000001_ReadAttribute @@ -44672,7 +44672,7 @@ - (void)testSendClusterTestModeSelectCluster_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestModeSelectCluster_000001_ReadAttribute @@ -44877,7 +44877,7 @@ - (void)testSendClusterTest_TC_SWDIAG_1_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_SWDIAG_1_1_000001_ReadAttribute @@ -44981,7 +44981,7 @@ - (void)testSendClusterTest_TC_SWDIAG_3_1_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_SWDIAG_3_1_000001_ResetWatermarks @@ -45067,7 +45067,7 @@ - (void)testSendClusterTestSubscribe_OnOff_000000_WaitForCommissionee XCTestExpectation * expectation = [self expectationWithDescription:@"Wait for the commissioned device to be retrieved"]; dispatch_queue_t queue = dispatch_get_main_queue(); - WaitForCommissionee(expectation, queue); + WaitForCommissionee(expectation, queue, nodeId); [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTestSubscribe_OnOff_000001_Off diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 612302bdd36e89..81d3729e6e4948 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -210,6 +210,7 @@ class Test_TC_BI_1_1 : public TestCommand public: Test_TC_BI_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BI_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -279,6 +280,7 @@ class Test_TC_BI_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -344,7 +346,7 @@ class Test_TC_BI_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -470,6 +472,7 @@ class Test_TC_BI_2_1 : public TestCommand public: Test_TC_BI_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BI_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -565,6 +568,7 @@ class Test_TC_BI_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 12; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -684,7 +688,7 @@ class Test_TC_BI_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadMandatoryNonGlobalAttributeOutOfService_1() @@ -951,6 +955,7 @@ class Test_TC_BI_2_2 : public TestCommand public: Test_TC_BI_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BI_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -1071,6 +1076,7 @@ class Test_TC_BI_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 9; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -1169,7 +1175,7 @@ class Test_TC_BI_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsPresentValueAttributeFromDut_1() @@ -1371,6 +1377,7 @@ class Test_TC_BOOL_1_1 : public TestCommand Test_TC_BOOL_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BOOL_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -1440,6 +1447,7 @@ class Test_TC_BOOL_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -1505,7 +1513,7 @@ class Test_TC_BOOL_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -1632,6 +1640,7 @@ class Test_TC_BOOL_2_1 : public TestCommand Test_TC_BOOL_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BOOL_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -1697,6 +1706,7 @@ class Test_TC_BOOL_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -1752,7 +1762,7 @@ class Test_TC_BOOL_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadMandatoryNonGlobalAttributeStateValue_1() @@ -1856,6 +1866,7 @@ class Test_TC_BRAC_1_1 : public TestCommand Test_TC_BRAC_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BRAC_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -1912,6 +1923,7 @@ class Test_TC_BRAC_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -1950,7 +1962,7 @@ class Test_TC_BRAC_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -2006,6 +2018,7 @@ class Test_TC_CC_1_1 : public TestCommand public: Test_TC_CC_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -2067,6 +2080,7 @@ class Test_TC_CC_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -2112,7 +2126,7 @@ class Test_TC_CC_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -2190,6 +2204,7 @@ class Test_TC_CC_2_1 : public TestCommand public: Test_TC_CC_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -2859,6 +2874,7 @@ class Test_TC_CC_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 154; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -4278,7 +4294,7 @@ class Test_TC_CC_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsMandatoryAttributeCurrentHue_1() @@ -7932,6 +7948,7 @@ class Test_TC_CC_3_1 : public TestCommand public: Test_TC_CC_3_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_3_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -8016,6 +8033,7 @@ class Test_TC_CC_3_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -8064,7 +8082,7 @@ class Test_TC_CC_3_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -8328,6 +8346,7 @@ class Test_TC_CC_3_2 : public TestCommand public: Test_TC_CC_3_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_3_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -8408,6 +8427,7 @@ class Test_TC_CC_3_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 9; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -8446,7 +8466,7 @@ class Test_TC_CC_3_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -8681,6 +8701,7 @@ class Test_TC_CC_3_3 : public TestCommand public: Test_TC_CC_3_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_3_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -8753,6 +8774,7 @@ class Test_TC_CC_3_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 7; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -8791,7 +8813,7 @@ class Test_TC_CC_3_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -8966,6 +8988,7 @@ class Test_TC_CC_4_1 : public TestCommand public: Test_TC_CC_4_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_4_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -9034,6 +9057,7 @@ class Test_TC_CC_4_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -9072,7 +9096,7 @@ class Test_TC_CC_4_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -9214,6 +9238,7 @@ class Test_TC_CC_4_2 : public TestCommand public: Test_TC_CC_4_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_4_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -9302,6 +9327,7 @@ class Test_TC_CC_4_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 11; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -9340,7 +9366,7 @@ class Test_TC_CC_4_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -9637,6 +9663,7 @@ class Test_TC_CC_4_3 : public TestCommand public: Test_TC_CC_4_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_4_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -9709,6 +9736,7 @@ class Test_TC_CC_4_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 7; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -9747,7 +9775,7 @@ class Test_TC_CC_4_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -9922,6 +9950,7 @@ class Test_TC_CC_4_4 : public TestCommand public: Test_TC_CC_4_4(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_4_4", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -9990,6 +10019,7 @@ class Test_TC_CC_4_4 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -10028,7 +10058,7 @@ class Test_TC_CC_4_4 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -10171,6 +10201,7 @@ class Test_TC_CC_5_1 : public TestCommand public: Test_TC_CC_5_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_5_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -10239,6 +10270,7 @@ class Test_TC_CC_5_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -10277,7 +10309,7 @@ class Test_TC_CC_5_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -10420,6 +10452,7 @@ class Test_TC_CC_5_2 : public TestCommand public: Test_TC_CC_5_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_5_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -10492,6 +10525,7 @@ class Test_TC_CC_5_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 7; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -10530,7 +10564,7 @@ class Test_TC_CC_5_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -10701,6 +10735,7 @@ class Test_TC_CC_5_3 : public TestCommand public: Test_TC_CC_5_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_5_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -10769,6 +10804,7 @@ class Test_TC_CC_5_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -10807,7 +10843,7 @@ class Test_TC_CC_5_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -10950,6 +10986,7 @@ class Test_TC_CC_6_1 : public TestCommand public: Test_TC_CC_6_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_6_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -11018,6 +11055,7 @@ class Test_TC_CC_6_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -11056,7 +11094,7 @@ class Test_TC_CC_6_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -11198,6 +11236,7 @@ class Test_TC_CC_6_2 : public TestCommand public: Test_TC_CC_6_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_6_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -11290,6 +11329,7 @@ class Test_TC_CC_6_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 12; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -11338,7 +11378,7 @@ class Test_TC_CC_6_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -11672,6 +11712,7 @@ class Test_TC_CC_6_3 : public TestCommand public: Test_TC_CC_6_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_6_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -11744,6 +11785,7 @@ class Test_TC_CC_6_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 7; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -11782,7 +11824,7 @@ class Test_TC_CC_6_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -11961,6 +12003,7 @@ class Test_TC_CC_7_1 : public TestCommand public: Test_TC_CC_7_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_7_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -12045,6 +12088,7 @@ class Test_TC_CC_7_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -12083,7 +12127,7 @@ class Test_TC_CC_7_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -12354,6 +12398,7 @@ class Test_TC_CC_7_2 : public TestCommand public: Test_TC_CC_7_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_7_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -12438,6 +12483,7 @@ class Test_TC_CC_7_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -12486,7 +12532,7 @@ class Test_TC_CC_7_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -12746,6 +12792,7 @@ class Test_TC_CC_7_3 : public TestCommand public: Test_TC_CC_7_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_7_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -12818,6 +12865,7 @@ class Test_TC_CC_7_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 7; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -12856,7 +12904,7 @@ class Test_TC_CC_7_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -13031,6 +13079,7 @@ class Test_TC_CC_7_4 : public TestCommand public: Test_TC_CC_7_4(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_7_4", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -13099,6 +13148,7 @@ class Test_TC_CC_7_4 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -13137,7 +13187,7 @@ class Test_TC_CC_7_4 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -13280,6 +13330,7 @@ class Test_TC_CC_8_1 : public TestCommand public: Test_TC_CC_8_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_8_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -13392,6 +13443,7 @@ class Test_TC_CC_8_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 17; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -13510,7 +13562,7 @@ class Test_TC_CC_8_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnLightForColorControlTests_1() @@ -13950,6 +14002,7 @@ class Test_TC_CC_9_1 : public TestCommand public: Test_TC_CC_9_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_9_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -14450,6 +14503,7 @@ class Test_TC_CC_9_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 54; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -14817,7 +14871,7 @@ class Test_TC_CC_9_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestPreconditionTurnOnLightForColorControlTests_1() @@ -16253,6 +16307,7 @@ class Test_TC_CC_9_2 : public TestCommand public: Test_TC_CC_9_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_9_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -16452,6 +16507,7 @@ class Test_TC_CC_9_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 20; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -16603,7 +16659,7 @@ class Test_TC_CC_9_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestPreconditionTurnOnLightForColorControlTests_1() @@ -17117,6 +17173,7 @@ class Test_TC_CC_9_3 : public TestCommand public: Test_TC_CC_9_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_9_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -17316,6 +17373,7 @@ class Test_TC_CC_9_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 20; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -17467,7 +17525,7 @@ class Test_TC_CC_9_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestPreconditionTurnOnLightForColorControlTests_1() @@ -17981,6 +18039,7 @@ class Test_TC_DM_1_1 : public TestCommand public: Test_TC_DM_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -18115,6 +18174,7 @@ class Test_TC_DM_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 20; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -18323,7 +18383,7 @@ class Test_TC_DM_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestQueryDataModelRevision_1() @@ -18788,6 +18848,7 @@ class Test_TC_DM_3_1 : public TestCommand public: Test_TC_DM_3_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_3_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -18844,6 +18905,7 @@ class Test_TC_DM_3_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -18885,7 +18947,7 @@ class Test_TC_DM_3_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestQueryMaxNetworks_1() @@ -18942,6 +19004,7 @@ class Test_TC_DM_2_2 : public TestCommand public: Test_TC_DM_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DM_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -19006,6 +19069,7 @@ class Test_TC_DM_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -19068,7 +19132,7 @@ class Test_TC_DM_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestQueryFabricsList_1() @@ -19181,6 +19245,7 @@ class Test_TC_EMR_1_1 : public TestCommand public: Test_TC_EMR_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_EMR_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -19250,6 +19315,7 @@ class Test_TC_EMR_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -19315,7 +19381,7 @@ class Test_TC_EMR_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -19446,6 +19512,7 @@ class Test_TC_ETHDIAG_1_1 : public TestCommand Test_TC_ETHDIAG_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ETHDIAG_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -19494,6 +19561,7 @@ class Test_TC_ETHDIAG_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -19512,7 +19580,7 @@ class Test_TC_ETHDIAG_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -19522,6 +19590,7 @@ class Test_TC_ETHDIAG_2_1 : public TestCommand Test_TC_ETHDIAG_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ETHDIAG_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -19570,6 +19639,7 @@ class Test_TC_ETHDIAG_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -19588,7 +19658,7 @@ class Test_TC_ETHDIAG_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -19597,6 +19667,7 @@ class Test_TC_FLW_1_1 : public TestCommand public: Test_TC_FLW_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLW_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -19658,6 +19729,7 @@ class Test_TC_FLW_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -19703,7 +19775,7 @@ class Test_TC_FLW_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -19781,6 +19853,7 @@ class Test_TC_FLW_2_1 : public TestCommand public: Test_TC_FLW_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLW_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -19881,6 +19954,7 @@ class Test_TC_FLW_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 14; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -20017,7 +20091,7 @@ class Test_TC_FLW_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_1() @@ -20329,6 +20403,7 @@ class Test_TC_FLW_2_2 : public TestCommand public: Test_TC_FLW_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_FLW_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -20385,6 +20460,7 @@ class Test_TC_FLW_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -20423,7 +20499,7 @@ class Test_TC_FLW_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_1() @@ -20478,6 +20554,7 @@ class Test_TC_ILL_1_1 : public TestCommand public: Test_TC_ILL_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ILL_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -20547,6 +20624,7 @@ class Test_TC_ILL_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -20612,7 +20690,7 @@ class Test_TC_ILL_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -20743,6 +20821,7 @@ class Test_TC_LVL_1_1 : public TestCommand public: Test_TC_LVL_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -20820,6 +20899,7 @@ class Test_TC_LVL_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 8; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -20902,7 +20982,7 @@ class Test_TC_LVL_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -21074,6 +21154,7 @@ class Test_TC_LVL_2_1 : public TestCommand public: Test_TC_LVL_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -21182,6 +21263,7 @@ class Test_TC_LVL_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 16; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -21330,7 +21412,7 @@ class Test_TC_LVL_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestResetLevelTo254_1() @@ -21683,6 +21765,7 @@ class Test_TC_LVL_2_2 : public TestCommand public: Test_TC_LVL_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -21791,6 +21874,7 @@ class Test_TC_LVL_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 16; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -21938,7 +22022,7 @@ class Test_TC_LVL_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsTheOnOffTransitionTimeAttributeFromTheDut_1() @@ -22304,6 +22388,7 @@ class Test_TC_LVL_3_1 : public TestCommand public: Test_TC_LVL_3_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_3_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -22412,6 +22497,7 @@ class Test_TC_LVL_3_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 16; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -22500,7 +22586,7 @@ class Test_TC_LVL_3_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsCurrentLevelAttributeFromDut_1() @@ -22825,6 +22911,7 @@ class Test_TC_LVL_4_1 : public TestCommand public: Test_TC_LVL_4_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_4_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -22937,6 +23024,7 @@ class Test_TC_LVL_4_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 17; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -23032,7 +23120,7 @@ class Test_TC_LVL_4_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsCurrentLevelAttributeFromDut_1() @@ -23381,6 +23469,7 @@ class Test_TC_LVL_5_1 : public TestCommand public: Test_TC_LVL_5_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_5_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -23481,6 +23570,7 @@ class Test_TC_LVL_5_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 14; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -23529,7 +23619,7 @@ class Test_TC_LVL_5_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendingOnCommand_1() @@ -23815,6 +23905,7 @@ class Test_TC_LVL_6_1 : public TestCommand public: Test_TC_LVL_6_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_LVL_6_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -23907,6 +23998,7 @@ class Test_TC_LVL_6_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 12; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -23945,7 +24037,7 @@ class Test_TC_LVL_6_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendingOnCommand_1() @@ -24196,6 +24288,7 @@ class Test_TC_MC_1_1 : public TestCommand public: Test_TC_MC_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -24265,6 +24358,7 @@ class Test_TC_MC_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -24330,7 +24424,7 @@ class Test_TC_MC_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -24456,6 +24550,7 @@ class Test_TC_MC_2_1 : public TestCommand public: Test_TC_MC_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -24508,6 +24603,7 @@ class Test_TC_MC_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -24526,7 +24622,7 @@ class Test_TC_MC_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestPutTheDeviceIntoLowPowerMode_1() @@ -24562,6 +24658,7 @@ class Test_TC_MC_3_1 : public TestCommand public: Test_TC_MC_3_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -24610,6 +24707,7 @@ class Test_TC_MC_3_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -24628,7 +24726,7 @@ class Test_TC_MC_3_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24637,6 +24735,7 @@ class Test_TC_MC_3_2 : public TestCommand public: Test_TC_MC_3_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -24685,6 +24784,7 @@ class Test_TC_MC_3_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -24703,7 +24803,7 @@ class Test_TC_MC_3_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24712,6 +24812,7 @@ class Test_TC_MC_3_3 : public TestCommand public: Test_TC_MC_3_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -24760,6 +24861,7 @@ class Test_TC_MC_3_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -24778,7 +24880,7 @@ class Test_TC_MC_3_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24787,6 +24889,7 @@ class Test_TC_MC_3_4 : public TestCommand public: Test_TC_MC_3_4(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_4", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -24835,6 +24938,7 @@ class Test_TC_MC_3_4 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -24853,7 +24957,7 @@ class Test_TC_MC_3_4 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24862,6 +24966,7 @@ class Test_TC_MC_3_5 : public TestCommand public: Test_TC_MC_3_5(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_5", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -24910,6 +25015,7 @@ class Test_TC_MC_3_5 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -24928,7 +25034,7 @@ class Test_TC_MC_3_5 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24937,6 +25043,7 @@ class Test_TC_MC_3_6 : public TestCommand public: Test_TC_MC_3_6(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_6", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -24985,6 +25092,7 @@ class Test_TC_MC_3_6 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25003,7 +25111,7 @@ class Test_TC_MC_3_6 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25012,6 +25120,7 @@ class Test_TC_MC_3_7 : public TestCommand public: Test_TC_MC_3_7(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_7", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25060,6 +25169,7 @@ class Test_TC_MC_3_7 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25078,7 +25188,7 @@ class Test_TC_MC_3_7 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25087,6 +25197,7 @@ class Test_TC_MC_3_8 : public TestCommand public: Test_TC_MC_3_8(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_8", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25135,6 +25246,7 @@ class Test_TC_MC_3_8 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25153,7 +25265,7 @@ class Test_TC_MC_3_8 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25162,6 +25274,7 @@ class Test_TC_MC_3_9 : public TestCommand public: Test_TC_MC_3_9(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_9", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25210,6 +25323,7 @@ class Test_TC_MC_3_9 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25228,7 +25342,7 @@ class Test_TC_MC_3_9 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25237,6 +25351,7 @@ class Test_TC_MC_3_10 : public TestCommand public: Test_TC_MC_3_10(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_10", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25285,6 +25400,7 @@ class Test_TC_MC_3_10 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25303,7 +25419,7 @@ class Test_TC_MC_3_10 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25312,6 +25428,7 @@ class Test_TC_MC_3_11 : public TestCommand public: Test_TC_MC_3_11(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_3_11", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25360,6 +25477,7 @@ class Test_TC_MC_3_11 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25378,7 +25496,7 @@ class Test_TC_MC_3_11 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25387,6 +25505,7 @@ class Test_TC_MC_5_1 : public TestCommand public: Test_TC_MC_5_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_5_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25439,6 +25558,7 @@ class Test_TC_MC_5_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25469,7 +25589,7 @@ class Test_TC_MC_5_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsTheChannelListAttributeFromTheDut_1() @@ -25502,6 +25622,7 @@ class Test_TC_MC_5_2 : public TestCommand public: Test_TC_MC_5_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_5_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25554,6 +25675,7 @@ class Test_TC_MC_5_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25572,7 +25694,7 @@ class Test_TC_MC_5_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestLogACommand_1() @@ -25587,6 +25709,7 @@ class Test_TC_MC_5_3 : public TestCommand public: Test_TC_MC_5_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_5_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25639,6 +25762,7 @@ class Test_TC_MC_5_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25657,7 +25781,7 @@ class Test_TC_MC_5_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestLogACommand_1() @@ -25672,6 +25796,7 @@ class Test_TC_MC_6_1 : public TestCommand public: Test_TC_MC_6_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_6_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25740,6 +25865,7 @@ class Test_TC_MC_6_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25768,7 +25894,7 @@ class Test_TC_MC_6_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestLogACommand_1() @@ -25825,6 +25951,7 @@ class Test_TC_MC_6_2 : public TestCommand public: Test_TC_MC_6_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_6_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -25905,6 +26032,7 @@ class Test_TC_MC_6_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 9; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -25933,7 +26061,7 @@ class Test_TC_MC_6_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestLogACommand_1() @@ -26008,6 +26136,7 @@ class Test_TC_MC_6_3 : public TestCommand public: Test_TC_MC_6_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_6_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -26068,6 +26197,7 @@ class Test_TC_MC_6_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -26086,7 +26216,7 @@ class Test_TC_MC_6_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestLogACommand_1() @@ -26113,6 +26243,7 @@ class Test_TC_MC_6_4 : public TestCommand public: Test_TC_MC_6_4(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_6_4", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -26197,6 +26328,7 @@ class Test_TC_MC_6_4 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -26245,7 +26377,7 @@ class Test_TC_MC_6_4 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestLogACommand_1() @@ -26362,6 +26494,7 @@ class Test_TC_MC_7_1 : public TestCommand public: Test_TC_MC_7_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_7_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -26410,6 +26543,7 @@ class Test_TC_MC_7_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -26428,7 +26562,7 @@ class Test_TC_MC_7_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -26437,6 +26571,7 @@ class Test_TC_MC_7_2 : public TestCommand public: Test_TC_MC_7_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_7_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -26485,6 +26620,7 @@ class Test_TC_MC_7_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -26503,7 +26639,7 @@ class Test_TC_MC_7_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -26512,6 +26648,7 @@ class Test_TC_MC_8_1 : public TestCommand public: Test_TC_MC_8_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_8_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -26568,6 +26705,7 @@ class Test_TC_MC_8_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -26611,7 +26749,7 @@ class Test_TC_MC_8_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsTheCurrentTargetAttribute_1() @@ -26670,6 +26808,7 @@ class Test_TC_MC_9_1 : public TestCommand public: Test_TC_MC_9_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_MC_9_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -26746,6 +26885,7 @@ class Test_TC_MC_9_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 8; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -26824,7 +26964,7 @@ class Test_TC_MC_9_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestPrecondition_1() @@ -26981,6 +27121,7 @@ class Test_TC_OCC_1_1 : public TestCommand public: Test_TC_OCC_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OCC_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -27042,6 +27183,7 @@ class Test_TC_OCC_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -27087,7 +27229,7 @@ class Test_TC_OCC_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -27165,6 +27307,7 @@ class Test_TC_OCC_2_1 : public TestCommand public: Test_TC_OCC_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OCC_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -27253,6 +27396,7 @@ class Test_TC_OCC_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -27352,7 +27496,7 @@ class Test_TC_OCC_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsMandatoryAttributeConstrainsOccupancy_1() @@ -27583,6 +27727,7 @@ class Test_TC_OCC_2_2 : public TestCommand public: Test_TC_OCC_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OCC_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -27649,6 +27794,7 @@ class Test_TC_OCC_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -27687,7 +27833,7 @@ class Test_TC_OCC_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsOccupancyAttributeFromDut_1() @@ -27742,6 +27888,7 @@ class Test_TC_OO_1_1 : public TestCommand public: Test_TC_OO_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OO_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -27827,6 +27974,7 @@ class Test_TC_OO_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -27929,7 +28077,7 @@ class Test_TC_OO_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -28149,6 +28297,7 @@ class Test_TC_OO_2_1 : public TestCommand public: Test_TC_OO_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OO_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -28257,6 +28406,7 @@ class Test_TC_OO_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 16; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -28410,7 +28560,7 @@ class Test_TC_OO_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheMandatoryAttributeOnOff_1() @@ -28771,6 +28921,7 @@ class Test_TC_OO_2_2 : public TestCommand public: Test_TC_OO_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OO_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -28875,6 +29026,7 @@ class Test_TC_OO_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 15; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -28963,7 +29115,7 @@ class Test_TC_OO_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendOffCommand_1() @@ -29329,6 +29481,7 @@ class Test_TC_OO_2_3 : public TestCommand public: Test_TC_OO_2_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_OO_2_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -29776,6 +29929,7 @@ class Test_TC_OO_2_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 47; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -30124,7 +30278,7 @@ class Test_TC_OO_2_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendOnCommand_1() @@ -31213,6 +31367,7 @@ class Test_TC_PS_1_1 : public TestCommand public: Test_TC_PS_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PS_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -31282,6 +31437,7 @@ class Test_TC_PS_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -31347,7 +31503,7 @@ class Test_TC_PS_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1() @@ -31473,6 +31629,7 @@ class Test_TC_PRS_1_1 : public TestCommand public: Test_TC_PRS_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PRS_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -31534,6 +31691,7 @@ class Test_TC_PRS_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -31579,7 +31737,7 @@ class Test_TC_PRS_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -31658,6 +31816,7 @@ class Test_TC_PRS_2_1 : public TestCommand public: Test_TC_PRS_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PRS_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -31742,6 +31901,7 @@ class Test_TC_PRS_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -31841,7 +32001,7 @@ class Test_TC_PRS_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheMandatoryAttributeConstraintsMeasuredValue_1() @@ -32066,6 +32226,7 @@ class Test_TC_PCC_1_1 : public TestCommand public: Test_TC_PCC_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PCC_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -32131,6 +32292,7 @@ class Test_TC_PCC_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -32186,7 +32348,7 @@ class Test_TC_PCC_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -32291,6 +32453,7 @@ class Test_TC_PCC_2_1 : public TestCommand public: Test_TC_PCC_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PCC_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -32535,6 +32698,7 @@ class Test_TC_PCC_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 50; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -33040,7 +33204,7 @@ class Test_TC_PCC_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheMandatoryAttributeMaxPressure_1() @@ -34233,6 +34397,7 @@ class Test_TC_PCC_2_2 : public TestCommand public: Test_TC_PCC_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PCC_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -34308,6 +34473,7 @@ class Test_TC_PCC_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -34347,7 +34513,7 @@ class Test_TC_PCC_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestWrite1ToTheOperationModeAttributeToDutOperationMode_1() @@ -34425,6 +34591,7 @@ class Test_TC_PCC_2_3 : public TestCommand public: Test_TC_PCC_2_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PCC_2_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -34554,6 +34721,7 @@ class Test_TC_PCC_2_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -34641,7 +34809,7 @@ class Test_TC_PCC_2_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestWrite0ToTheOperationModeAttributeToDut_1() @@ -34861,6 +35029,7 @@ class Test_TC_RH_1_1 : public TestCommand public: Test_TC_RH_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_RH_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -34922,6 +35091,7 @@ class Test_TC_RH_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -34967,7 +35137,7 @@ class Test_TC_RH_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -35048,6 +35218,7 @@ class Test_TC_RH_2_1 : public TestCommand public: Test_TC_RH_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_RH_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -35112,6 +35283,7 @@ class Test_TC_RH_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -35170,7 +35342,7 @@ class Test_TC_RH_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsConstraintsOfAttributeMeasuredValue_1() @@ -35280,6 +35452,7 @@ class Test_TC_RH_2_2 : public TestCommand public: Test_TC_RH_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_RH_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -35346,6 +35519,7 @@ class Test_TC_RH_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -35384,7 +35558,7 @@ class Test_TC_RH_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsMeasuredValueAttributeFromDut_1() @@ -35442,6 +35616,7 @@ class Test_TC_SWTCH_2_1 : public TestCommand Test_TC_SWTCH_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -35514,6 +35689,7 @@ class Test_TC_SWTCH_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 7; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -35592,7 +35768,7 @@ class Test_TC_SWTCH_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadNumberOfPositionsAttribute_1() @@ -35746,6 +35922,7 @@ class Test_TC_SWTCH_2_2 : public TestCommand Test_TC_SWTCH_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWTCH_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -35942,6 +36119,7 @@ class Test_TC_SWTCH_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 38; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -35980,7 +36158,7 @@ class Test_TC_SWTCH_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestUserInteractionNeeded_1() @@ -36248,6 +36426,7 @@ class Test_TC_TM_1_1 : public TestCommand public: Test_TC_TM_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -36309,6 +36488,7 @@ class Test_TC_TM_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -36354,7 +36534,7 @@ class Test_TC_TM_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -36435,6 +36615,7 @@ class Test_TC_TM_2_1 : public TestCommand public: Test_TC_TM_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -36491,6 +36672,7 @@ class Test_TC_TM_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -36529,7 +36711,7 @@ class Test_TC_TM_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheMandatoryAttributeMeasuredValue_1() @@ -36587,6 +36769,7 @@ class Test_TC_TM_2_2 : public TestCommand public: Test_TC_TM_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TM_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -36653,6 +36836,7 @@ class Test_TC_TM_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -36691,7 +36875,7 @@ class Test_TC_TM_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsMeasuredValueAttributeFromDut_1() @@ -36749,6 +36933,7 @@ class Test_TC_TSTAT_1_1 : public TestCommand Test_TC_TSTAT_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -36814,6 +36999,7 @@ class Test_TC_TSTAT_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -36869,7 +37055,7 @@ class Test_TC_TSTAT_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -36971,6 +37157,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand Test_TC_TSTAT_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -37305,6 +37492,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 61; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -37875,7 +38063,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsConstraintsOfMandatoryAttributesFromDutLocalTemperature_1() @@ -39318,6 +39506,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand Test_TC_TSTAT_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -39874,6 +40063,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 50; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -40277,7 +40467,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsOccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_1() @@ -41410,6 +41600,7 @@ class Test_TC_TSUIC_1_1 : public TestCommand Test_TC_TSUIC_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSUIC_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -41471,6 +41662,7 @@ class Test_TC_TSUIC_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -41516,7 +41708,7 @@ class Test_TC_TSUIC_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheGlobalAttributeConstraintsClusterRevision_1() @@ -41599,6 +41791,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand Test_TC_TSUIC_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSUIC_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -41707,6 +41900,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 16; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -41866,7 +42060,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadTheMandatoryAttributeTemperatureDisplayMode_1() @@ -42249,6 +42443,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand Test_TC_TSUIC_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSUIC_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -42389,6 +42584,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 11; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -42477,7 +42673,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestWritesAValueOf0ToTemperatureDisplayModeAttributeOfDut_1() @@ -42721,6 +42917,7 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommand Test_TC_DIAG_TH_NW_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DIAG_TH_NW_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -42777,6 +42974,7 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -42805,7 +43003,7 @@ class Test_TC_DIAG_TH_NW_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendsResetCountsCommand_1() @@ -42867,6 +43065,7 @@ class Test_TC_WIFIDIAG_1_1 : public TestCommand Test_TC_WIFIDIAG_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WIFIDIAG_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -42919,6 +43118,7 @@ class Test_TC_WIFIDIAG_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -42950,7 +43150,7 @@ class Test_TC_WIFIDIAG_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsNetworkInterfaceStructureAttributeFromDut_1() @@ -42986,6 +43186,7 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommand Test_TC_WIFIDIAG_3_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WIFIDIAG_3_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -43034,6 +43235,7 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -43052,7 +43254,7 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -43062,6 +43264,7 @@ class Test_TC_WNCV_1_1 : public TestCommand Test_TC_WNCV_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -43140,6 +43343,7 @@ class Test_TC_WNCV_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 8; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -43222,7 +43426,7 @@ class Test_TC_WNCV_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR Test2ReadTheGlobalAttributeClusterRevision_1() @@ -43401,6 +43605,7 @@ class Test_TC_WNCV_2_1 : public TestCommand Test_TC_WNCV_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -43698,6 +43903,7 @@ class Test_TC_WNCV_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 55; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -44214,7 +44420,7 @@ class Test_TC_WNCV_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultType_1() @@ -45582,6 +45788,7 @@ class Test_TC_WNCV_2_2 : public TestCommand Test_TC_WNCV_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -45630,6 +45837,7 @@ class Test_TC_WNCV_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -45648,7 +45856,7 @@ class Test_TC_WNCV_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -45658,6 +45866,7 @@ class Test_TC_WNCV_2_4 : public TestCommand Test_TC_WNCV_2_4(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_4", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -45724,6 +45933,7 @@ class Test_TC_WNCV_2_4 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -45762,7 +45972,7 @@ class Test_TC_WNCV_2_4 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsTypeAttributeFromDut_1() @@ -45821,6 +46031,7 @@ class Test_TC_WNCV_2_5 : public TestCommand Test_TC_WNCV_2_5(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_2_5", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -45887,6 +46098,7 @@ class Test_TC_WNCV_2_5 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -45925,7 +46137,7 @@ class Test_TC_WNCV_2_5 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsEndProductTypeAttributeFromDut_1() @@ -45984,6 +46196,7 @@ class Test_TC_WNCV_3_1 : public TestCommand Test_TC_WNCV_3_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_3_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -46203,6 +46416,7 @@ class Test_TC_WNCV_3_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 25; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -46394,7 +46608,7 @@ class Test_TC_WNCV_3_1 : public TestCommand CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1() @@ -46932,6 +47146,7 @@ class Test_TC_WNCV_3_2 : public TestCommand Test_TC_WNCV_3_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_3_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -47150,6 +47365,7 @@ class Test_TC_WNCV_3_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 25; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -47341,7 +47557,7 @@ class Test_TC_WNCV_3_2 : public TestCommand CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR Test1aThSendsUpOrOpenCommandToPrepositionTheDutInTheOppositeDirection_1() @@ -47879,6 +48095,7 @@ class Test_TC_WNCV_3_3 : public TestCommand Test_TC_WNCV_3_3(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_WNCV_3_3", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -48020,6 +48237,7 @@ class Test_TC_WNCV_3_3 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 16; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -48137,7 +48355,7 @@ class Test_TC_WNCV_3_3 : public TestCommand CHIP_ERROR Test0WaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR Test1aThSendsDownOrCloseCommandToPrepositionTheDutInTheOppositeDirection_1() @@ -48490,6 +48708,7 @@ class TV_TargetNavigatorCluster : public TestCommand TV_TargetNavigatorCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_TargetNavigatorCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -48550,6 +48769,7 @@ class TV_TargetNavigatorCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -48591,7 +48811,7 @@ class TV_TargetNavigatorCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeTargetNavigatorList_1() @@ -48701,6 +48921,7 @@ class TV_AudioOutputCluster : public TestCommand TV_AudioOutputCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_AudioOutputCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -48765,6 +48986,7 @@ class TV_AudioOutputCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -48806,7 +49028,7 @@ class TV_AudioOutputCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeAudioOutputList_1() @@ -48941,6 +49163,7 @@ class TV_ApplicationLauncherCluster : public TestCommand TV_ApplicationLauncherCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ApplicationLauncherCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -49005,6 +49228,7 @@ class TV_ApplicationLauncherCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -49033,7 +49257,7 @@ class TV_ApplicationLauncherCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeApplicationLauncherList_1() @@ -49189,6 +49413,7 @@ class TV_KeypadInputCluster : public TestCommand TV_KeypadInputCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_KeypadInputCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -49241,6 +49466,7 @@ class TV_KeypadInputCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -49259,7 +49485,7 @@ class TV_KeypadInputCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendKeyCommand_1() @@ -49302,6 +49528,7 @@ class TV_AccountLoginCluster : public TestCommand TV_AccountLoginCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_AccountLoginCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -49362,6 +49589,7 @@ class TV_AccountLoginCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -49380,7 +49608,7 @@ class TV_AccountLoginCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestGetSetupPinCommand_1() @@ -49482,6 +49710,7 @@ class TV_WakeOnLanCluster : public TestCommand TV_WakeOnLanCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_WakeOnLanCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -49534,6 +49763,7 @@ class TV_WakeOnLanCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -49562,7 +49792,7 @@ class TV_WakeOnLanCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadMacAddress_1() @@ -49596,6 +49826,7 @@ class TV_ApplicationBasicCluster : public TestCommand TV_ApplicationBasicCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ApplicationBasicCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -49668,6 +49899,7 @@ class TV_ApplicationBasicCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 7; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -49746,7 +49978,7 @@ class TV_ApplicationBasicCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeVendorName_1() @@ -49900,6 +50132,7 @@ class TV_MediaPlaybackCluster : public TestCommand TV_MediaPlaybackCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_MediaPlaybackCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -50016,6 +50249,7 @@ class TV_MediaPlaybackCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 18; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -50094,7 +50328,7 @@ class TV_MediaPlaybackCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributePlaybackState_1() @@ -50607,6 +50841,7 @@ class TV_ChannelCluster : public TestCommand TV_ChannelCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ChannelCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -50671,6 +50906,7 @@ class TV_ChannelCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -50701,7 +50937,7 @@ class TV_ChannelCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeChannelList_1() @@ -50865,6 +51101,7 @@ class TV_LowPowerCluster : public TestCommand TV_LowPowerCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_LowPowerCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -50917,6 +51154,7 @@ class TV_LowPowerCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -50935,7 +51173,7 @@ class TV_LowPowerCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSleepInputStatusCommand_1() @@ -50972,6 +51210,7 @@ class TV_ContentLauncherCluster : public TestCommand TV_ContentLauncherCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_ContentLauncherCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -51036,6 +51275,7 @@ class TV_ContentLauncherCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -51074,7 +51314,7 @@ class TV_ContentLauncherCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeAcceptHeaderList_1() @@ -51310,6 +51550,7 @@ class TV_MediaInputCluster : public TestCommand TV_MediaInputCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TV_MediaInputCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -51382,6 +51623,7 @@ class TV_MediaInputCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 7; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -51423,7 +51665,7 @@ class TV_MediaInputCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeMediaInputList_1() @@ -51608,6 +51850,7 @@ class TestCluster : public TestCommand public: TestCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -53696,6 +53939,7 @@ class TestCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 482; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -57671,7 +57915,7 @@ class TestCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendTestCommand_1() @@ -70077,6 +70321,7 @@ class TestClusterComplexTypes : public TestCommand TestClusterComplexTypes(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestClusterComplexTypes", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -70210,6 +70455,7 @@ class TestClusterComplexTypes : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 21; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -70347,7 +70593,7 @@ class TestClusterComplexTypes : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendTestCommandWithOptionalArgSetToNull_1() @@ -70898,6 +71144,7 @@ class TestConstraints : public TestCommand public: TestConstraints(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestConstraints", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -71033,6 +71280,7 @@ class TestConstraints : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 22; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -71234,7 +71482,7 @@ class TestConstraints : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestWriteAttributeInt32uValue_1() @@ -71722,6 +71970,7 @@ class TestDelayCommands : public TestCommand TestDelayCommands(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestDelayCommands", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -71774,6 +72023,7 @@ class TestDelayCommands : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -71792,7 +72042,7 @@ class TestDelayCommands : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestWait100ms_1() @@ -71807,6 +72057,7 @@ class TestDiscovery : public TestCommand public: TestDiscovery(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestDiscovery", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator); AddArgument("vendorId", 0, UINT16_MAX, &mVendorId); @@ -72006,6 +72257,7 @@ class TestDiscovery : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 25; + chip::Optional mNodeId; chip::Optional mEndpoint; chip::Optional mDiscriminator; chip::Optional mVendorId; @@ -72150,7 +72402,7 @@ class TestDiscovery : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_1() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestOpenCommissioningWindow_2() @@ -72294,7 +72546,7 @@ class TestDiscovery : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_21() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestOpenCommissioningWindow_22() @@ -72344,6 +72596,7 @@ class TestLogCommands : public TestCommand public: TestLogCommands(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestLogCommands", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -72400,6 +72653,7 @@ class TestLogCommands : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -72418,7 +72672,7 @@ class TestLogCommands : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestLogASimpleMessage_1() @@ -72439,6 +72693,7 @@ class TestSaveAs : public TestCommand public: TestSaveAs(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestSaveAs", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -72951,6 +73206,7 @@ class TestSaveAs : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 110; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -73931,7 +74187,7 @@ class TestSaveAs : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendTestAddArgumentsCommand_1() @@ -76550,6 +76806,7 @@ class TestConfigVariables : public TestCommand TestConfigVariables(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestConfigVariables", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); AddArgument("arg1", 0, UINT8_MAX, &mArg1); @@ -76608,6 +76865,7 @@ class TestConfigVariables : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; chip::Optional mArg1; @@ -76630,7 +76888,7 @@ class TestConfigVariables : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendTestAddArgumentsCommand_1() @@ -76709,6 +76967,7 @@ class TestDescriptorCluster : public TestCommand TestDescriptorCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestDescriptorCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -76773,6 +77032,7 @@ class TestDescriptorCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -76833,7 +77093,7 @@ class TestDescriptorCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeDeviceList_1() @@ -77011,6 +77271,7 @@ class TestBasicInformation : public TestCommand TestBasicInformation(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestBasicInformation", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -77079,6 +77340,7 @@ class TestBasicInformation : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -77141,7 +77403,7 @@ class TestBasicInformation : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadLocation_1() @@ -77312,6 +77574,7 @@ class TestIdentifyCluster : public TestCommand TestIdentifyCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestIdentifyCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -77364,6 +77627,7 @@ class TestIdentifyCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -77382,7 +77646,7 @@ class TestIdentifyCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendIdentifyCommandAndExpectSuccessResponse_1() @@ -77420,6 +77684,7 @@ class TestOperationalCredentialsCluster : public TestCommand TestOperationalCredentialsCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestOperationalCredentialsCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -77484,6 +77749,7 @@ class TestOperationalCredentialsCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -77532,7 +77798,7 @@ class TestOperationalCredentialsCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadNumberOfSupportedFabrics_1() @@ -77653,6 +77919,7 @@ class TestModeSelectCluster : public TestCommand TestModeSelectCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestModeSelectCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -77733,6 +78000,7 @@ class TestModeSelectCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 9; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -77814,7 +78082,7 @@ class TestModeSelectCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadCurrentMode_1() @@ -78043,6 +78311,7 @@ class TestSystemCommands : public TestCommand TestSystemCommands(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestSystemCommands", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -78107,6 +78376,7 @@ class TestSystemCommands : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -78125,7 +78395,7 @@ class TestSystemCommands : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestStopTheAccessory_1() @@ -78159,6 +78429,7 @@ class Test_TC_SWDIAG_1_1 : public TestCommand Test_TC_SWDIAG_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWDIAG_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -78238,6 +78509,7 @@ class Test_TC_SWDIAG_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -78299,7 +78571,7 @@ class Test_TC_SWDIAG_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadsAListOfThreadMetricsStructNonGlobalAttributeFromDut_1() @@ -78404,6 +78676,7 @@ class Test_TC_SWDIAG_2_1 : public TestCommand Test_TC_SWDIAG_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWDIAG_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -78448,6 +78721,7 @@ class Test_TC_SWDIAG_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -78470,6 +78744,7 @@ class Test_TC_SWDIAG_3_1 : public TestCommand Test_TC_SWDIAG_3_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SWDIAG_3_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -78545,6 +78820,7 @@ class Test_TC_SWDIAG_3_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -78583,7 +78859,7 @@ class Test_TC_SWDIAG_3_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendsResetWatermarksToDut_1() @@ -78669,6 +78945,7 @@ class TestSubscribe_OnOff : public TestCommand TestSubscribe_OnOff(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestSubscribe_OnOff", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -78745,6 +79022,7 @@ class TestSubscribe_OnOff : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 8; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -78817,7 +79095,7 @@ class TestSubscribe_OnOff : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSetOnOffAttributeToFalse_1() @@ -79019,6 +79297,7 @@ class DL_UsersAndCredentials : public TestCommand DL_UsersAndCredentials(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("DL_UsersAndCredentials", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -79479,6 +79758,7 @@ class DL_UsersAndCredentials : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 102; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -79531,7 +79811,7 @@ class DL_UsersAndCredentials : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAvailableUserSlotAndVerifyResponseFields_1() @@ -84406,6 +84686,7 @@ class DL_LockUnlock : public TestCommand public: DL_LockUnlock(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("DL_LockUnlock", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -84494,6 +84775,7 @@ class DL_LockUnlock : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 11; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -84556,7 +84838,7 @@ class DL_LockUnlock : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestCreateNewPinCredentialAndLockUnlockUser_1() @@ -84869,6 +85151,7 @@ class DL_Schedules : public TestCommand public: DL_Schedules(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("DL_Schedules", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -85254,6 +85537,7 @@ class DL_Schedules : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 84; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -85306,7 +85590,7 @@ class DL_Schedules : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestCreateNewPinCredentialAndScheduleUser_1() @@ -88419,6 +88703,7 @@ class TestGroupMessaging : public TestCommand TestGroupMessaging(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupMessaging", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -88512,6 +88797,7 @@ class TestGroupMessaging : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 12; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -88585,7 +88871,7 @@ class TestGroupMessaging : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestAddGroup1Endpoint1_1() @@ -88957,6 +89243,7 @@ class TestGroupsCluster : public TestCommand TestGroupsCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupsCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -89077,6 +89364,7 @@ class TestGroupsCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 19; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -89095,7 +89383,7 @@ class TestGroupsCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestViewGroup0Invalid_1() @@ -89761,6 +90049,7 @@ class TestGroupKeyManagementCluster : public TestCommand TestGroupKeyManagementCluster(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupKeyManagementCluster", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -89873,6 +90162,7 @@ class TestGroupKeyManagementCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 17; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -89947,7 +90237,7 @@ class TestGroupKeyManagementCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadMaxGroupsPerFabric_1() @@ -90527,6 +90817,7 @@ class Test_TC_DD_1_5 : public TestCommand public: Test_TC_DD_1_5(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_5", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -90575,6 +90866,7 @@ class Test_TC_DD_1_5 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 1; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -90603,6 +90895,7 @@ class Test_TC_DD_1_6 : public TestCommand public: Test_TC_DD_1_6(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_6", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -90659,6 +90952,7 @@ class Test_TC_DD_1_6 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -90700,6 +90994,7 @@ class Test_TC_DD_1_7 : public TestCommand public: Test_TC_DD_1_7(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_7", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -90752,6 +91047,7 @@ class Test_TC_DD_1_7 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -90786,6 +91082,7 @@ class Test_TC_DD_1_8 : public TestCommand public: Test_TC_DD_1_8(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_8", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -90838,6 +91135,7 @@ class Test_TC_DD_1_8 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -90872,6 +91170,7 @@ class Test_TC_DD_1_9 : public TestCommand public: Test_TC_DD_1_9(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_9", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -90928,6 +91227,7 @@ class Test_TC_DD_1_9 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -90969,6 +91269,7 @@ class Test_TC_DD_1_10 : public TestCommand public: Test_TC_DD_1_10(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DD_1_10", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -91013,6 +91314,7 @@ class Test_TC_DD_1_10 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -91035,6 +91337,7 @@ class TestGroupDemoCommand : public TestCommand TestGroupDemoCommand(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupDemoCommand", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -91163,6 +91466,7 @@ class TestGroupDemoCommand : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 21; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -91181,7 +91485,7 @@ class TestGroupDemoCommand : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnTheLightToSeeAttributeChange_1() @@ -91571,6 +91875,7 @@ class TestGroupDemoConfig : public TestCommand TestGroupDemoConfig(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestGroupDemoConfig", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -91631,6 +91936,7 @@ class TestGroupDemoConfig : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -91656,7 +91962,7 @@ class TestGroupDemoConfig : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestAddGroup1Endpoint1_1() @@ -91783,6 +92089,7 @@ class Test_TC_BDX_1_1 : public TestCommand public: Test_TC_BDX_1_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -91827,6 +92134,7 @@ class Test_TC_BDX_1_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -91848,6 +92156,7 @@ class Test_TC_BDX_1_2 : public TestCommand public: Test_TC_BDX_1_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_1_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -91892,6 +92201,7 @@ class Test_TC_BDX_1_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -91913,6 +92223,7 @@ class Test_TC_BDX_2_1 : public TestCommand public: Test_TC_BDX_2_1(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_1", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -91957,6 +92268,7 @@ class Test_TC_BDX_2_1 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -91978,6 +92290,7 @@ class Test_TC_BDX_2_2 : public TestCommand public: Test_TC_BDX_2_2(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BDX_2_2", credsIssuerConfig), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -92022,6 +92335,7 @@ class Test_TC_BDX_2_2 : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h index 19cfcd6a95726e..778d6b193b3acd 100644 --- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h @@ -26,6 +26,7 @@ class Test_TC_DM_1_3_Simulated : public TestCommand public: Test_TC_DM_1_3_Simulated() : TestCommand("Test_TC_DM_1_3_Simulated"), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -154,6 +155,7 @@ class Test_TC_DM_1_3_Simulated : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 21; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -400,6 +402,7 @@ class Test_TC_DM_3_3_Simulated : public TestCommand public: Test_TC_DM_3_3_Simulated() : TestCommand("Test_TC_DM_3_3_Simulated"), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -483,6 +486,7 @@ class Test_TC_DM_3_3_Simulated : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -579,6 +583,7 @@ class Test_TC_DM_2_3_Simulated : public TestCommand public: Test_TC_DM_2_3_Simulated() : TestCommand("Test_TC_DM_2_3_Simulated"), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -663,6 +668,7 @@ class Test_TC_DM_2_3_Simulated : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h index 19cfcd6a95726e..778d6b193b3acd 100644 --- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h @@ -26,6 +26,7 @@ class Test_TC_DM_1_3_Simulated : public TestCommand public: Test_TC_DM_1_3_Simulated() : TestCommand("Test_TC_DM_1_3_Simulated"), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -154,6 +155,7 @@ class Test_TC_DM_1_3_Simulated : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 21; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -400,6 +402,7 @@ class Test_TC_DM_3_3_Simulated : public TestCommand public: Test_TC_DM_3_3_Simulated() : TestCommand("Test_TC_DM_3_3_Simulated"), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -483,6 +486,7 @@ class Test_TC_DM_3_3_Simulated : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -579,6 +583,7 @@ class Test_TC_DM_2_3_Simulated : public TestCommand public: Test_TC_DM_2_3_Simulated() : TestCommand("Test_TC_DM_2_3_Simulated"), mTestIndex(0) { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); } @@ -663,6 +668,7 @@ class Test_TC_DM_2_3_Simulated : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 10; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint;