[YAML] Get nodeId to be an optional parameter for tests

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)

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<std::string, ChipDevice *> 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<uint64_t> mDelayInMs;
     chip::Optional<char *> mPICSFilePath;
-    chip::Optional<chip::EndpointId> mEndpointId;
     chip::Optional<uint16_t> mTimeout;
 };

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 !!!!!!!!!!!!!!!!!!!!!!")

src/app/tests/suites/DL_LockUnlock.yaml

@@ -15,13 +15,18 @@
 name: Door Lock Cluster Lock/Unlock tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Door Lock"
     endpoint: 1
 
 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"

src/app/tests/suites/DL_Schedules.yaml

@@ -15,13 +15,18 @@
 name: Door Lock Cluster Schedules tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Door Lock"
     endpoint: 1
 
 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"

src/app/tests/suites/DL_UsersAndCredentials.yaml

@@ -15,13 +15,18 @@
 name: Door Lock Cluster Users and Credentials tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Door Lock"
     endpoint: 1
 
 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"

src/app/tests/suites/TV_AccountLoginCluster.yaml

@@ -15,13 +15,18 @@
 name: Account Login Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Account Login"
     endpoint: 3
 
 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"

src/app/tests/suites/TV_ApplicationBasicCluster.yaml

@@ -15,13 +15,18 @@
 name: Application Basic Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Application Basic"
     endpoint: 3
 
 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"

src/app/tests/suites/TV_ApplicationLauncherCluster.yaml

@@ -15,13 +15,18 @@
 name: Application Launcher Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Application Launcher"
     endpoint: 1
 
 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"

src/app/tests/suites/TV_AudioOutputCluster.yaml

@@ -15,13 +15,18 @@
 name: Audio Output Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Audio Output"
     endpoint: 2
 
 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"

src/app/tests/suites/TV_ChannelCluster.yaml

@@ -15,13 +15,18 @@
 name: Channel Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Channel"
     endpoint: 1
 
 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"

src/app/tests/suites/TV_ContentLauncherCluster.yaml

@@ -15,13 +15,18 @@
 name: Content Launcher Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Content Launcher"
     endpoint: 1
 
 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"

src/app/tests/suites/TV_KeypadInputCluster.yaml

@@ -15,13 +15,18 @@
 name: Keypad Input Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Keypad Input"
     endpoint: 1
 
 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"

src/app/tests/suites/TV_LowPowerCluster.yaml

@@ -15,13 +15,18 @@
 name: Low Power Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Low Power"
     endpoint: 1
 
 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"

src/app/tests/suites/TV_MediaInputCluster.yaml

@@ -15,13 +15,18 @@
 name: Media Input Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Media Input"
     endpoint: 1
 
 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"

src/app/tests/suites/TV_MediaPlaybackCluster.yaml

@@ -15,13 +15,18 @@
 name: Media Playback Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Media Playback"
     endpoint: 3
 
 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"

src/app/tests/suites/TV_TargetNavigatorCluster.yaml

@@ -15,13 +15,18 @@
 name: Target Navigator Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Target Navigator"
     endpoint: 1
 
 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"

src/app/tests/suites/TV_WakeOnLanCluster.yaml

@@ -15,13 +15,18 @@
 name: Wake on LAN Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Wake on LAN"
     endpoint: 1
 
 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"

src/app/tests/suites/TestBasicInformation.yaml

@@ -15,13 +15,18 @@
 name: Basic Information Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Basic"
     endpoint: 0
 
 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"

src/app/tests/suites/TestCluster.yaml

@@ -15,13 +15,18 @@
 name: Test Cluster Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Test Cluster"
     endpoint: 1
 
 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"

src/app/tests/suites/TestClusterComplexTypes.yaml

@@ -15,13 +15,18 @@
 name: Test Cluster Complex Types Tests
 
 config:
+    nodeId: 0x12344321
     cluster: "Test Cluster"
     endpoint: 1
 
 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