From f52e38744b12c92fdc676feb76df3009e3f707b7 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Fri, 11 Feb 2022 10:28:04 +0100 Subject: [PATCH] Update generated code --- .../Framework/CHIPTests/CHIPClustersTests.m | 260 ++++---- .../chip-tool/zap-generated/test/Commands.h | 602 +++++++++++++----- 2 files changed, 587 insertions(+), 275 deletions(-) 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 9080bb54a768c9..73ac3fe5812d87 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -209,6 +209,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); } @@ -278,6 +279,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; @@ -343,7 +345,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() @@ -469,6 +471,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); } @@ -564,6 +567,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; @@ -683,7 +687,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() @@ -950,6 +954,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); } @@ -1070,6 +1075,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; @@ -1168,7 +1174,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() @@ -1370,6 +1376,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); } @@ -1439,6 +1446,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; @@ -1504,7 +1512,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() @@ -1631,6 +1639,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); } @@ -1696,6 +1705,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; @@ -1751,7 +1761,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() @@ -1855,6 +1865,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); } @@ -1911,6 +1922,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; @@ -1949,7 +1961,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() @@ -2005,6 +2017,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); } @@ -2066,6 +2079,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; @@ -2111,7 +2125,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() @@ -2189,6 +2203,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); } @@ -2858,6 +2873,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; @@ -4277,7 +4293,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() @@ -7931,6 +7947,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); } @@ -8015,6 +8032,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; @@ -8063,7 +8081,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() @@ -8327,6 +8345,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); } @@ -8407,6 +8426,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; @@ -8445,7 +8465,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() @@ -8680,6 +8700,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); } @@ -8752,6 +8773,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; @@ -8790,7 +8812,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() @@ -8965,6 +8987,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); } @@ -9033,6 +9056,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; @@ -9071,7 +9095,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() @@ -9213,6 +9237,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); } @@ -9301,6 +9326,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; @@ -9339,7 +9365,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() @@ -9636,6 +9662,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); } @@ -9708,6 +9735,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; @@ -9746,7 +9774,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() @@ -9921,6 +9949,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); } @@ -9989,6 +10018,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; @@ -10027,7 +10057,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() @@ -10170,6 +10200,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); } @@ -10238,6 +10269,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; @@ -10276,7 +10308,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() @@ -10419,6 +10451,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); } @@ -10491,6 +10524,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; @@ -10529,7 +10563,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() @@ -10700,6 +10734,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); } @@ -10768,6 +10803,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; @@ -10806,7 +10842,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() @@ -10949,6 +10985,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); } @@ -11017,6 +11054,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; @@ -11055,7 +11093,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() @@ -11197,6 +11235,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); } @@ -11289,6 +11328,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; @@ -11337,7 +11377,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() @@ -11671,6 +11711,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); } @@ -11743,6 +11784,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; @@ -11781,7 +11823,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() @@ -11960,6 +12002,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); } @@ -12044,6 +12087,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; @@ -12082,7 +12126,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() @@ -12353,6 +12397,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); } @@ -12437,6 +12482,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; @@ -12485,7 +12531,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() @@ -12745,6 +12791,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); } @@ -12817,6 +12864,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; @@ -12855,7 +12903,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() @@ -13030,6 +13078,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); } @@ -13098,6 +13147,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; @@ -13136,7 +13186,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() @@ -13279,6 +13329,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); } @@ -13391,6 +13442,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; @@ -13509,7 +13561,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() @@ -13949,6 +14001,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); } @@ -14449,6 +14502,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; @@ -14816,7 +14870,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() @@ -16252,6 +16306,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); } @@ -16451,6 +16506,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; @@ -16602,7 +16658,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() @@ -17116,6 +17172,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); } @@ -17315,6 +17372,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; @@ -17466,7 +17524,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() @@ -17980,6 +18038,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); } @@ -18114,6 +18173,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; @@ -18322,7 +18382,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() @@ -18787,6 +18847,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); } @@ -18843,6 +18904,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; @@ -18884,7 +18946,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() @@ -18941,6 +19003,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); } @@ -19005,6 +19068,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; @@ -19067,7 +19131,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() @@ -19180,6 +19244,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); } @@ -19249,6 +19314,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; @@ -19314,7 +19380,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() @@ -19445,6 +19511,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); } @@ -19493,6 +19560,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; @@ -19511,7 +19579,7 @@ class Test_TC_ETHDIAG_1_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -19521,6 +19589,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); } @@ -19569,6 +19638,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; @@ -19587,7 +19657,7 @@ class Test_TC_ETHDIAG_2_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -19596,6 +19666,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); } @@ -19657,6 +19728,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; @@ -19702,7 +19774,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() @@ -19780,6 +19852,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); } @@ -19880,6 +19953,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; @@ -20016,7 +20090,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() @@ -20328,6 +20402,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); } @@ -20384,6 +20459,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; @@ -20422,7 +20498,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() @@ -20477,6 +20553,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); } @@ -20546,6 +20623,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; @@ -20611,7 +20689,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() @@ -20742,6 +20820,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); } @@ -20819,6 +20898,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; @@ -20901,7 +20981,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() @@ -21073,6 +21153,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); } @@ -21181,6 +21262,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; @@ -21329,7 +21411,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() @@ -21682,6 +21764,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); } @@ -21790,6 +21873,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; @@ -21937,7 +22021,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() @@ -22303,6 +22387,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); } @@ -22411,6 +22496,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; @@ -22499,7 +22585,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() @@ -22824,6 +22910,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); } @@ -22936,6 +23023,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; @@ -23031,7 +23119,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() @@ -23380,6 +23468,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); } @@ -23480,6 +23569,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; @@ -23528,7 +23618,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() @@ -23814,6 +23904,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); } @@ -23906,6 +23997,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; @@ -23944,7 +24036,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() @@ -24195,6 +24287,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); } @@ -24264,6 +24357,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; @@ -24329,7 +24423,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() @@ -24455,6 +24549,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); } @@ -24507,6 +24602,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; @@ -24525,7 +24621,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() @@ -24561,6 +24657,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); } @@ -24609,6 +24706,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; @@ -24627,7 +24725,7 @@ class Test_TC_MC_3_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24636,6 +24734,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); } @@ -24684,6 +24783,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; @@ -24702,7 +24802,7 @@ class Test_TC_MC_3_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24711,6 +24811,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); } @@ -24759,6 +24860,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; @@ -24777,7 +24879,7 @@ class Test_TC_MC_3_3 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24786,6 +24888,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); } @@ -24834,6 +24937,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; @@ -24852,7 +24956,7 @@ class Test_TC_MC_3_4 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24861,6 +24965,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); } @@ -24909,6 +25014,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; @@ -24927,7 +25033,7 @@ class Test_TC_MC_3_5 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -24936,6 +25042,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); } @@ -24984,6 +25091,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; @@ -25002,7 +25110,7 @@ class Test_TC_MC_3_6 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25011,6 +25119,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); } @@ -25059,6 +25168,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; @@ -25077,7 +25187,7 @@ class Test_TC_MC_3_7 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25086,6 +25196,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); } @@ -25134,6 +25245,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; @@ -25152,7 +25264,7 @@ class Test_TC_MC_3_8 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25161,6 +25273,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); } @@ -25209,6 +25322,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; @@ -25227,7 +25341,7 @@ class Test_TC_MC_3_9 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25236,6 +25350,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); } @@ -25284,6 +25399,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; @@ -25302,7 +25418,7 @@ class Test_TC_MC_3_10 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25311,6 +25427,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); } @@ -25359,6 +25476,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; @@ -25377,7 +25495,7 @@ class Test_TC_MC_3_11 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -25386,6 +25504,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); } @@ -25438,6 +25557,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; @@ -25468,7 +25588,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() @@ -25501,6 +25621,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); } @@ -25553,6 +25674,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; @@ -25571,7 +25693,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() @@ -25586,6 +25708,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); } @@ -25638,6 +25761,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; @@ -25656,7 +25780,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() @@ -25671,6 +25795,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); } @@ -25739,6 +25864,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; @@ -25767,7 +25893,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() @@ -25824,6 +25950,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); } @@ -25904,6 +26031,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; @@ -25932,7 +26060,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() @@ -26007,6 +26135,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); } @@ -26067,6 +26196,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; @@ -26085,7 +26215,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() @@ -26112,6 +26242,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); } @@ -26196,6 +26327,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; @@ -26244,7 +26376,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() @@ -26361,6 +26493,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); } @@ -26409,6 +26542,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; @@ -26427,7 +26561,7 @@ class Test_TC_MC_7_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -26436,6 +26570,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); } @@ -26484,6 +26619,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; @@ -26502,7 +26638,7 @@ class Test_TC_MC_7_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -26511,6 +26647,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); } @@ -26567,6 +26704,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; @@ -26610,7 +26748,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() @@ -26669,6 +26807,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); } @@ -26745,6 +26884,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; @@ -26823,7 +26963,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() @@ -26980,6 +27120,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); } @@ -27041,6 +27182,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; @@ -27086,7 +27228,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() @@ -27164,6 +27306,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); } @@ -27252,6 +27395,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; @@ -27351,7 +27495,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() @@ -27582,6 +27726,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); } @@ -27648,6 +27793,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; @@ -27686,7 +27832,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() @@ -27741,6 +27887,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); } @@ -27826,6 +27973,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; @@ -27928,7 +28076,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() @@ -28148,6 +28296,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); } @@ -28256,6 +28405,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; @@ -28409,7 +28559,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() @@ -28770,6 +28920,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); } @@ -28874,6 +29025,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; @@ -28962,7 +29114,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() @@ -29328,6 +29480,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); } @@ -29775,6 +29928,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; @@ -30123,7 +30277,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() @@ -31212,6 +31366,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); } @@ -31281,6 +31436,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; @@ -31346,7 +31502,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() @@ -31472,6 +31628,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); } @@ -31533,6 +31690,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; @@ -31578,7 +31736,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() @@ -31657,6 +31815,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); } @@ -31741,6 +31900,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; @@ -31840,7 +32000,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() @@ -32065,6 +32225,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); } @@ -32130,6 +32291,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; @@ -32185,7 +32347,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() @@ -32290,6 +32452,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); } @@ -32534,6 +32697,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; @@ -33039,7 +33203,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() @@ -34232,6 +34396,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); } @@ -34307,6 +34472,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; @@ -34346,7 +34512,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() @@ -34424,6 +34590,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); } @@ -34553,6 +34720,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; @@ -34640,7 +34808,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() @@ -34860,6 +35028,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); } @@ -34921,6 +35090,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; @@ -34966,7 +35136,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() @@ -35047,6 +35217,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); } @@ -35111,6 +35282,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; @@ -35169,7 +35341,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() @@ -35279,6 +35451,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); } @@ -35345,6 +35518,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; @@ -35383,7 +35557,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() @@ -35441,6 +35615,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); } @@ -35513,6 +35688,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; @@ -35591,7 +35767,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() @@ -35745,6 +35921,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); } @@ -35941,6 +36118,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; @@ -35979,7 +36157,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() @@ -36247,6 +36425,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); } @@ -36308,6 +36487,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; @@ -36353,7 +36533,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() @@ -36434,6 +36614,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); } @@ -36490,6 +36671,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; @@ -36528,7 +36710,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() @@ -36586,6 +36768,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); } @@ -36652,6 +36835,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; @@ -36690,7 +36874,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() @@ -36748,6 +36932,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); } @@ -36813,6 +36998,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; @@ -36868,7 +37054,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() @@ -36970,6 +37156,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); } @@ -37304,6 +37491,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; @@ -37874,7 +38062,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() @@ -39317,6 +39505,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); } @@ -39873,6 +40062,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; @@ -40276,7 +40466,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() @@ -41409,6 +41599,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); } @@ -41470,6 +41661,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; @@ -41515,7 +41707,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() @@ -41598,6 +41790,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); } @@ -41706,6 +41899,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; @@ -41865,7 +42059,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() @@ -42248,6 +42442,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); } @@ -42388,6 +42583,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; @@ -42476,7 +42672,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() @@ -42720,6 +42916,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); } @@ -42776,6 +42973,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; @@ -42804,7 +43002,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() @@ -42866,6 +43064,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); } @@ -42918,6 +43117,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; @@ -42949,7 +43149,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() @@ -42985,6 +43185,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); } @@ -43033,6 +43234,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; @@ -43051,7 +43253,7 @@ class Test_TC_WIFIDIAG_3_1 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -43061,6 +43263,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); } @@ -43139,6 +43342,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; @@ -43221,7 +43425,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() @@ -43400,6 +43604,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); } @@ -43697,6 +43902,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; @@ -44213,7 +44419,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() @@ -45581,6 +45787,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); } @@ -45629,6 +45836,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; @@ -45647,7 +45855,7 @@ class Test_TC_WNCV_2_2 : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } }; @@ -45657,6 +45865,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); } @@ -45723,6 +45932,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; @@ -45761,7 +45971,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() @@ -45820,6 +46030,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); } @@ -45886,6 +46097,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; @@ -45924,7 +46136,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() @@ -45983,6 +46195,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); } @@ -46202,6 +46415,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; @@ -46393,7 +46607,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() @@ -46931,6 +47145,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); } @@ -47149,6 +47364,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; @@ -47340,7 +47556,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() @@ -47878,6 +48094,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); } @@ -48019,6 +48236,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; @@ -48136,7 +48354,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() @@ -48489,6 +48707,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); } @@ -48549,6 +48768,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; @@ -48590,7 +48810,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() @@ -48700,6 +48920,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); } @@ -48764,6 +48985,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; @@ -48805,7 +49027,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() @@ -48940,6 +49162,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); } @@ -49004,6 +49227,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; @@ -49032,7 +49256,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() @@ -49188,6 +49412,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); } @@ -49240,6 +49465,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; @@ -49258,7 +49484,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() @@ -49301,6 +49527,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); } @@ -49361,6 +49588,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; @@ -49379,7 +49607,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() @@ -49481,6 +49709,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); } @@ -49533,6 +49762,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; @@ -49561,7 +49791,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() @@ -49595,6 +49825,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); } @@ -49667,6 +49898,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; @@ -49745,7 +49977,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() @@ -49899,6 +50131,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); } @@ -50015,6 +50248,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; @@ -50093,7 +50327,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() @@ -50606,6 +50840,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); } @@ -50670,6 +50905,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; @@ -50700,7 +50936,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() @@ -50864,6 +51100,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); } @@ -50916,6 +51153,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; @@ -50934,7 +51172,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() @@ -50971,6 +51209,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); } @@ -51035,6 +51274,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; @@ -51073,7 +51313,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() @@ -51309,6 +51549,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); } @@ -51381,6 +51622,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; @@ -51422,7 +51664,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() @@ -51607,6 +51849,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); } @@ -53695,6 +53938,7 @@ class TestCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 482; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -57670,7 +57914,7 @@ class TestCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendTestCommand_1() @@ -70076,6 +70320,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); } @@ -70209,6 +70454,7 @@ class TestClusterComplexTypes : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 21; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -70346,7 +70592,7 @@ class TestClusterComplexTypes : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendTestCommandWithOptionalArgSetToNull_1() @@ -70897,6 +71143,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); } @@ -71032,6 +71279,7 @@ class TestConstraints : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 22; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -71233,7 +71481,7 @@ class TestConstraints : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestWriteAttributeInt32uValue_1() @@ -71721,6 +71969,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); } @@ -71773,6 +72022,7 @@ class TestDelayCommands : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -71791,7 +72041,7 @@ class TestDelayCommands : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestWait100ms_1() @@ -71806,6 +72056,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); } @@ -71862,6 +72113,7 @@ class TestLogCommands : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 3; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -71880,7 +72132,7 @@ class TestLogCommands : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestLogASimpleMessage_1() @@ -71901,6 +72153,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); } @@ -72413,6 +72666,7 @@ class TestSaveAs : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 110; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -73393,7 +73647,7 @@ class TestSaveAs : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendTestAddArgumentsCommand_1() @@ -76012,6 +76266,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); @@ -76070,6 +76325,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; @@ -76092,7 +76348,7 @@ class TestConfigVariables : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendTestAddArgumentsCommand_1() @@ -76171,6 +76427,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); } @@ -76235,6 +76492,7 @@ class TestDescriptorCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -76295,7 +76553,7 @@ class TestDescriptorCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadAttributeDeviceList_1() @@ -76473,6 +76731,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); } @@ -76541,6 +76800,7 @@ class TestBasicInformation : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 6; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -76603,7 +76863,7 @@ class TestBasicInformation : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadLocation_1() @@ -76774,6 +77034,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); } @@ -76826,6 +77087,7 @@ class TestIdentifyCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 2; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -76844,7 +77106,7 @@ class TestIdentifyCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestSendIdentifyCommandAndExpectSuccessResponse_1() @@ -76882,6 +77144,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); } @@ -76946,6 +77209,7 @@ class TestOperationalCredentialsCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -76994,7 +77258,7 @@ class TestOperationalCredentialsCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadNumberOfSupportedFabrics_1() @@ -77115,6 +77379,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); } @@ -77195,6 +77460,7 @@ class TestModeSelectCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 9; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -77276,7 +77542,7 @@ class TestModeSelectCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadCurrentMode_1() @@ -77505,6 +77771,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); } @@ -77569,6 +77836,7 @@ class TestSystemCommands : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -77587,7 +77855,7 @@ class TestSystemCommands : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestStopTheAccessory_1() @@ -77621,6 +77889,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); } @@ -77700,6 +77969,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; @@ -77761,7 +78031,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() @@ -77866,6 +78136,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); } @@ -77910,6 +78181,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; @@ -77932,6 +78204,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); } @@ -78007,6 +78280,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; @@ -78045,7 +78319,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() @@ -78131,6 +78405,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); } @@ -78207,6 +78482,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; @@ -78279,7 +78555,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() @@ -78481,6 +78757,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); } @@ -78941,6 +79218,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; @@ -78993,7 +79271,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() @@ -83868,6 +84146,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); } @@ -83956,6 +84235,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; @@ -84018,7 +84298,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() @@ -84331,6 +84611,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); } @@ -84716,6 +84997,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; @@ -84768,7 +85050,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() @@ -87881,6 +88163,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); } @@ -87974,6 +88257,7 @@ class TestGroupMessaging : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 12; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -88047,7 +88331,7 @@ class TestGroupMessaging : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestAddGroup1Endpoint1_1() @@ -88419,6 +88703,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); } @@ -88539,6 +88824,7 @@ class TestGroupsCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 19; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -88557,7 +88843,7 @@ class TestGroupsCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestViewGroup0Invalid_1() @@ -89223,6 +89509,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); } @@ -89335,6 +89622,7 @@ class TestGroupKeyManagementCluster : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 17; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -89409,7 +89697,7 @@ class TestGroupKeyManagementCluster : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestReadMaxGroupsPerFabric_1() @@ -89989,6 +90277,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); } @@ -90037,6 +90326,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; @@ -90065,6 +90355,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); } @@ -90121,6 +90412,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; @@ -90162,6 +90454,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); } @@ -90214,6 +90507,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; @@ -90248,6 +90542,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); } @@ -90300,6 +90595,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; @@ -90334,6 +90630,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); } @@ -90390,6 +90687,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; @@ -90431,6 +90729,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); } @@ -90475,6 +90774,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; @@ -90497,6 +90797,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); } @@ -90625,6 +90926,7 @@ class TestGroupDemoCommand : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 21; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -90643,7 +90945,7 @@ class TestGroupDemoCommand : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestTurnOnTheLightToSeeAttributeChange_1() @@ -91033,6 +91335,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); } @@ -91093,6 +91396,7 @@ class TestGroupDemoConfig : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 4; + chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; @@ -91118,7 +91422,7 @@ class TestGroupDemoConfig : public TestCommand CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0() { SetIdentity(kIdentityAlpha); - return WaitForCommissionee(); + return WaitForCommissionee(mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL); } CHIP_ERROR TestAddGroup1Endpoint1_1() @@ -91245,6 +91549,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); } @@ -91289,6 +91594,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; @@ -91310,6 +91616,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); } @@ -91354,6 +91661,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; @@ -91375,6 +91683,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); } @@ -91419,6 +91728,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; @@ -91440,6 +91750,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); } @@ -91484,6 +91795,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;