diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml index a0fc677dfc06d4..b7d93bc49279ce 100644 --- a/.github/workflows/docker_img.yaml +++ b/.github/workflows/docker_img.yaml @@ -54,6 +54,7 @@ jobs: - "-telink" - "-ti" - "-tizen" + - "-tizen-qemu" - "-openiotsdk" # NOTE: vscode image consumes ~52 GB disk space but GitHub-hosted runners provide ~10 GB free disk space(https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) #- "-vscode" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dc6ceed574b3a4..1e0ae2f0e508c3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -183,9 +183,8 @@ jobs: git grep -n '0x%[0-9-]*" *PRI[^xX]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0 # git grep exits with 0 if it finds a match, but we want - # to fail (exit nonzero) on match. And we want to exclude this file, - # to avoid our grep regexp matching itself. - - name: Check for use of legacy non-namespaced attribute ids. + # to fail (exit nonzero) on match. + - name: Check for use of NSLog instead of Matter logging in Matter framework if: always() run: | - git grep -n '_ATTRIBUTE_ID' -- src ':(exclude)src/app/zap-templates/templates/app/attribute-id.zapt' && exit 1 || exit 0 + git grep -n 'NSLog(' -- src/darwin/Framework/CHIP && exit 1 || exit 0 diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index 0ca4a816f5f1d2..c48d18c13bee02 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -212,6 +212,7 @@ chip_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT) chip_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_NET_IPV4) chip_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING) chip_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR) +chip_gn_arg_bool ("chip_persist_subscriptions" CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS) chip_gn_arg_bool ("chip_build_tests" CONFIG_CHIP_BUILD_TESTS) chip_gn_arg_bool ("chip_monolithic_tests" CONFIG_CHIP_BUILD_TESTS) chip_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" CONFIG_CHIP_BUILD_TESTS) diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig index 59b87a77b551ef..54717d7e3b80ca 100644 --- a/config/zephyr/Kconfig +++ b/config/zephyr/Kconfig @@ -254,6 +254,16 @@ config CHIP_CRYPTO_PSA based on the PSA crypto API (instead of the default implementation, which is based on the legacy mbedTLS APIs). +config CHIP_PERSISTENT_SUBSCRIPTIONS + bool "Persistent subscriptions" + help + Persists Matter subscriptions on the publisher node. This feature allows + a Matter node to faster get back to the previous operation after it went + offline, for example, due to a power outage. That is, the node can use the + persisted subscription information to quickly re-establish the previous + subscriptions instead of waiting for the subscriber node to realize that + the publisher is alive again. + config CHIP_LIB_SHELL bool "Matter shell commands" default n diff --git a/docs/guides/darwin.md b/docs/guides/darwin.md index 361eeebc18825c..131feaf7f3971d 100644 --- a/docs/guides/darwin.md +++ b/docs/guides/darwin.md @@ -15,7 +15,7 @@ Listed are the Current SHAs: - iOS/iPadOS/tvOS 16.1: [`33f6a910cd9a8a0cfdd7088e2f43efd2f7f566a7`](https://github.com/project-chip/connectedhomeip/commits/33f6a910cd9a8a0cfdd7088e2f43efd2f7f566a7) -- iOS/iPadOS/tvOS 16.2 Developer Preview: +- iOS/iPadOS/tvOS 16.2 and 16.3: [`c279578c5bc37f117335aa96cec6c5552f070cc0`](https://github.com/project-chip/connectedhomeip/commits/c279578c5bc37f117335aa96cec6c5552f070cc0) ## Supported Platforms for Matter Device Testing diff --git a/docs/guides/matter-repl.md b/docs/guides/matter-repl.md index bf05be63ddb9a5..5577881bca8f00 100644 --- a/docs/guides/matter-repl.md +++ b/docs/guides/matter-repl.md @@ -31,6 +31,35 @@ Please follow the instructions [here](./python_chip_controller_building.md#building-and-installing) to build the Python virtual environment. +### Building for `arm64` e.g. for Raspberry Pi + +Matter code relies on code generation for cluster-specific data types and +callbacks. A subset of code generation is done at compile time by `zap-cli`. ZAP +is generally installed as a third-party tool via CIPD during the build +environment bootstrap. However, zap packages are currently NOT available for +`arm64` (like when compiling on Raspberry PI.). In this case, you have 2 +choices. + +1. You could check out zap from source as described in + [Code Generation - Installing zap and environment variables](https://github.com/project-chip/connectedhomeip/blob/master/docs/code_generation.md#Installing-zap-and-environment-variables) + and proceed with the + [instructions](./python_chip_controller_building.md#building-and-installing) + to build the Python virtual environment. + +2. When compile-time code generation is not desirable, then pre-generated output + code can be used. To understand about code generation and pre-generating + matter code see. + [Code generation - Pre-generation](https://github.com/project-chip/connectedhomeip/blob/master/docs/code_generation.md#Pre-generation). + To build and install the Python CHIP controller with pre-generated files use + the -z argument that points to the directory of pre-generated code: + + ``` + scripts/build_python.sh -m platform -i separate -z "/some/pregen/dir" + ``` + + > Note: To get more details about available build configurations, run the + > following command: `scripts/build_python.sh --help` + ## Launching the REPL 1. Activate the Python virtual environment: @@ -154,13 +183,13 @@ launched into the playground: ## Guides -[REPL Basics](https://deepnote.com/viewer/github/project-chip/connectedhomeip/blob/master/docs/guides/repl/Matter%20-%20REPL%20Intro.ipynb) +[REPL Basics](https://deepnote.com/viewer/github/project-chip/connectedhomeip/blob/master/docs/guides/repl/Matter_REPL_Intro.ipynb) -[Using the IM](https://deepnote.com/viewer/github/project-chip/connectedhomeip/blob/master/docs/guides/repl/Matter%20-%20Basic%20Interactions.ipynb) +[Using the IM](https://deepnote.com/viewer/github/project-chip/connectedhomeip/blob/master/docs/guides/repl/Matter_Basic_Interactions.ipynb) -[Multi Fabric Commissioning](https://deepnote.com/viewer/github/project-chip/connectedhomeip/blob/master/docs/guides/repl/Matter%20-%20Multi%20Fabric%20Commissioning.ipynb) +[Multi Fabric Commissioning](https://deepnote.com/viewer/github/project-chip/connectedhomeip/blob/master/docs/guides/repl/Matter_Multi_Fabric_Commissioning.ipynb) -[Access Control](https://deepnote.com/viewer/github/project-chip/connectedhomeip/blob/master/docs/guides/repl/Matter%20-%20Access%20Control.ipynb) +[Access Control](https://deepnote.com/viewer/github/project-chip/connectedhomeip/blob/master/docs/guides/repl/Matter_Access_Control.ipynb) ## Testing diff --git a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp index 4817cfb5f99e03..fab4ba499df2ce 100644 --- a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp +++ b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp @@ -25,7 +25,7 @@ #include "DeviceCallbacks.h" #include "CHIPDeviceManager.h" -#include +#include #include #include #include @@ -143,7 +143,7 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::OnOff::Attributes::OnOff::Id, ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -165,7 +165,7 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState, CHIP_ERROR error void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id, ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId)); VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId)); diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp index 1a07e18c72c3de..17922c679e2135 100644 --- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp +++ b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ClusterManager.cpp @@ -18,9 +18,8 @@ */ #include "ClusterManager.h" #include "Globals.h" -#include -#include #include +#include #include #include #include @@ -83,7 +82,9 @@ Identify gIdentify1 = { void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId)); + using namespace app::Clusters::OnOff::Attributes; + + VerifyOrExit(attributeId == OnOff::Id, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -97,11 +98,13 @@ void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, A void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { + using namespace app::Clusters::LevelControl::Attributes; + bool onOffState = mEndpointOnOffState[endpointId - 1]; uint8_t brightness = onOffState ? *value : 0; VerifyOrExit(brightness > 0, PLAT_LOG("Brightness set to 0, ignoring")); - VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId)); + VerifyOrExit(attributeId == CurrentLevel::Id, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -118,8 +121,9 @@ void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID || - attributeId == ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, + using namespace app::Clusters::ColorControl::Attributes; + + VerifyOrExit(attributeId == CurrentHue::Id || attributeId == CurrentSaturation::Id, PLAT_LOG("Unhandled AttributeId ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -127,17 +131,17 @@ void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId if (endpointId == ENDPOINT_ID_1) { uint8_t hue, saturation; - if (attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID) + if (attributeId == CurrentHue::Id) { hue = *value; /* Read Current Saturation value when Attribute change callback for HUE Attribute */ - app::Clusters::ColorControl::Attributes::CurrentSaturation::Get(endpointId, &saturation); + CurrentSaturation::Get(endpointId, &saturation); } else { saturation = *value; /* Read Current Hue value when Attribute change callback for SATURATION Attribute */ - app::Clusters::ColorControl::Attributes::CurrentHue::Get(endpointId, &hue); + CurrentHue::Get(endpointId, &hue); } PLAT_LOG("Color Control triggered: Hue: %d Saturation: %d", hue, saturation); } diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index 4d14d56f8f0d6f..5a78ce84982c40 100644 --- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -27,7 +27,6 @@ #include "ClusterManager.h" -#include #include #include #include diff --git a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp index 82917c28ef26b5..61983e84953c0f 100644 --- a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp @@ -27,8 +27,8 @@ #include "Globals.h" #include "LEDWidget.h" #include "WiFiWidget.h" -#include -#include +#include +#include #include #include #include @@ -124,7 +124,9 @@ void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, Clus void AppDeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); + using namespace app::Clusters::OnOff::Attributes; + + VerifyOrExit(attributeId == OnOff::Id, ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); // At this point we can assume that value points to a bool value. @@ -137,10 +139,12 @@ void AppDeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointI void AppDeviceCallbacks::OnLevelControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { + using namespace app::Clusters::LevelControl::Attributes; + bool onOffState = mEndpointOnOffState[endpointId - 1]; uint8_t brightness = onOffState ? *value : 0; - VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); + VerifyOrExit(attributeId == CurrentLevel::Id, ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); // At this point we can assume that value points to a bool value. @@ -155,24 +159,23 @@ void AppDeviceCallbacks::OnLevelControlAttributeChangeCallback(EndpointId endpoi #if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM void AppDeviceCallbacks::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID || - attributeId == ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, + using namespace app::Clusters::ColorControl::Attributes; + + VerifyOrExit(attributeId == CurrentHue::Id || attributeId == CurrentSaturation::Id, ESP_LOGI(TAG, "Unhandled AttributeId ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); if (endpointId == 1) { uint8_t hue, saturation; - if (attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID) + if (attributeId == CurrentHue::Id) { hue = *value; - emberAfReadServerAttribute(endpointId, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, - &saturation, sizeof(uint8_t)); + CurrentSaturation::Get(endpointId, &saturation); } else { saturation = *value; - emberAfReadServerAttribute(endpointId, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, &hue, - sizeof(uint8_t)); + CurrentHue::Get(endpointId, &hue); } statusLED1.SetColor(hue, saturation); } diff --git a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp index 967431efa8fc5f..a9fce33410c7b7 100644 --- a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp +++ b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp @@ -17,6 +17,7 @@ */ #include "DeviceWithDisplay.h" +#include #include #include #include @@ -321,16 +322,15 @@ class EditAttributeListModel : public TouchesMatterStackModel if (name == "OnOff" && cluster == "OnOff") { - value = (value == "On") ? "Off" : "On"; - uint8_t attributeValue = (value == "On") ? 1 : 0; - emberAfWriteServerAttribute(endpointIndex + 1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, - (uint8_t *) &attributeValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + value = (value == "On") ? "Off" : "On"; + bool attributeValue = (value == "On"); + app::Clusters::OnOff::Attributes::OnOff::Set(endpointIndex + 1, attributeValue); } if (name == "Occupancy" && cluster == "Occupancy Sensor") { - value = (value == "Yes") ? "No" : "Yes"; - uint8_t attributeValue = (value == "Yes") ? 1 : 0; + value = (value == "Yes") ? "No" : "Yes"; + bool attributeValue = (value == "Yes"); ESP_LOGI(TAG, "Occupancy changed to : %s", value.c_str()); // update the current occupancy here for hardcoded endpoint 1 app::Clusters::OccupancySensing::Attributes::Occupancy::Set(1, attributeValue); diff --git a/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h b/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h index 7a283fe7546ef5..3dc7b57f2af3fb 100644 --- a/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h +++ b/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h @@ -34,8 +34,6 @@ #include #include -#include -#include #include #include #include diff --git a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp index 4c871b546bacd5..49a95ec1d15821 100644 --- a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp @@ -23,8 +23,6 @@ #include "AppEvent.h" #include "ButtonHandler.h" #include "LEDWidget.h" -#include -#include #include #include #include @@ -408,8 +406,7 @@ void AppTask::OnOffUpdateClusterState(intptr_t context) uint8_t onoff = sLightLED.Get(); // write the new on/off value - EmberAfStatus status = - emberAfWriteServerAttribute(2, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, &onoff, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = app::Clusters::OnOff::Attributes::OnOff::Set(2, onoff); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/all-clusters-app/infineon/psoc6/src/ClusterManager.cpp b/examples/all-clusters-app/infineon/psoc6/src/ClusterManager.cpp index a3ae6a44190c75..6659131ea8b9ab 100644 --- a/examples/all-clusters-app/infineon/psoc6/src/ClusterManager.cpp +++ b/examples/all-clusters-app/infineon/psoc6/src/ClusterManager.cpp @@ -24,8 +24,8 @@ #include "ClusterManager.h" #include "AppConfig.h" #include "LEDWidget.h" -#include #include +#include #include #include #include @@ -49,7 +49,7 @@ ClusterManager ClusterManager::sCluster; void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, + VerifyOrExit(attributeId == OnOff::Attributes::OnOff::Id, P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId))); VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX || endpointId == ENDPOINT_SECOND_IDX, P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -69,7 +69,7 @@ void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId bool onOffState = mEndpointOnOffState[endpointId - 1]; uint8_t brightness = onOffState ? *value : 0; - VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, + VerifyOrExit(attributeId == LevelControl::Attributes::CurrentLevel::Id, P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId))); VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX || endpointId == ENDPOINT_SECOND_IDX, P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -90,7 +90,7 @@ void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId if (endpointId == 1) { uint8_t hue, saturation; - /* If the Current Attribute is ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, read the saturation value and + /* If the Current Attribute is CurrentHue, read the saturation value and * set the color on Cluster LED using both Saturation and Hue. */ if (attributeId == ColorControl::Attributes::CurrentHue::Id) @@ -101,7 +101,7 @@ void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId } else { - /* If the Current Attribute is ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, read the Hue value and + /* If the Current Attribute is CurrentSaturation, read the Hue value and * set the color on Cluster LED using both Saturation and Hue. */ saturation = *value; diff --git a/examples/all-clusters-app/infineon/psoc6/src/ZclCallbacks.cpp b/examples/all-clusters-app/infineon/psoc6/src/ZclCallbacks.cpp index f3fd7cf6689a70..9a439771026736 100644 --- a/examples/all-clusters-app/infineon/psoc6/src/ZclCallbacks.cpp +++ b/examples/all-clusters-app/infineon/psoc6/src/ZclCallbacks.cpp @@ -26,7 +26,6 @@ #include "ClusterManager.h" -#include #include #include #include diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp index 40765c36888680..2c2f5385c57ba4 100644 --- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp +++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp @@ -19,7 +19,6 @@ #include "AllClustersCommandDelegate.h" #include -#include #include #include #include diff --git a/examples/all-clusters-app/linux/README.md b/examples/all-clusters-app/linux/README.md index 8479fd480736fa..a84fd757703681 100644 --- a/examples/all-clusters-app/linux/README.md +++ b/examples/all-clusters-app/linux/README.md @@ -2,7 +2,8 @@ ## Compiling all-clusters-app for testing on Linux and Mac -To compile all-clusters-app on Intel Mac, run: +To compile all-clusters-app on Intel Mac, using the bootstrap-provided clang, +run: ``` $ ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target darwin-x64-all-clusters-no-ble-asan-clang build" @@ -10,10 +11,16 @@ $ ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target darw at the top level of the Matter tree. -To compile on an Arm Mac, run: +To compile all-clusters-app on Intel Mac, using the system clang, run: ``` -$ ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target darwin-arm64-all-clusters-no-ble-asan-clang build" +$ ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target darwin-x64-all-clusters-no-ble-asan build" +``` + +To compile on an Arm Mac, which can only be done using the system clang, run: + +``` +$ ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target darwin-arm64-all-clusters-no-ble-asan build" ``` Similarly, to compile on Linux x86-64 run: diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp index d106ee7c77c116..059ebf0af7f6e8 100644 --- a/examples/all-clusters-app/linux/main-common.cpp +++ b/examples/all-clusters-app/linux/main-common.cpp @@ -21,7 +21,6 @@ #include "WindowCoveringManager.h" #include "include/tv-callbacks.h" #include -#include #include #include #include diff --git a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp index e09f87af3a9cd9..1d5a001dd1e9b1 100644 --- a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp +++ b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp @@ -26,8 +26,6 @@ #include #include -#include -#include #include #include #include diff --git a/examples/all-clusters-app/nxp/mw320/main.cpp b/examples/all-clusters-app/nxp/mw320/main.cpp index a7f6478b1af9f7..23675050c73052 100644 --- a/examples/all-clusters-app/nxp/mw320/main.cpp +++ b/examples/all-clusters-app/nxp/mw320/main.cpp @@ -29,7 +29,8 @@ #include //#include //==> rm from TE7.5 -#include +#include +#include #include #include #include @@ -1143,13 +1144,15 @@ void task_test_main(void * param) is_on = !is_on; value = (uint16_t) is_on; // sync-up the switch attribute: - PRINTF("--> update ZCL_CURRENT_POSITION_ATTRIBUTE_ID [%d] \r\n", value); - emAfWriteAttribute(1, Clusters::Switch::Id, ZCL_CURRENT_POSITION_ATTRIBUTE_ID, (uint8_t *) &value, sizeof(value), true, - false); + PRINTF("--> update CurrentPosition [%d] \r\n", value); + Clusters::Switch::Attributes::CurrentPosition::Set(1, value); #ifdef SUPPORT_MANUAL_CTRL +#error \ + "This code thinks it's setting the OnOff attribute, but it's actually setting the NumberOfPositions attribute! And passing the wrong size for either case. Figure out what it's trying to do." // sync-up the Light attribute (for test event, OO.M.ManuallyControlled) - PRINTF("--> update [Clusters::Switch::Id]: ZCL_ON_OFF_ATTRIBUTE_ID [%d] \r\n", value); - emAfWriteAttribute(1, Clusters::Switch::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &value, sizeof(value), true, false); + PRINTF("--> update [Clusters::Switch::Id]: OnOff::Id [%d] \r\n", value); + emAfWriteAttribute(1, Clusters::Switch::Id, Clusters::OnOff::Attributes::OnOff::Id, (uint8_t *) &value, sizeof(value), + true, false); #endif // SUPPORT_MANUAL_CTRL need2sync_sw_attr = false; @@ -1499,8 +1502,9 @@ bool lowPowerClusterSleep() static void OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, - ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId)); + using namespace Clusters::OnOff::Attributes; + + VerifyOrExit(attributeId == OnOff::Id, ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, "Unexpected EndPoint ID: `0x%02x'", endpointId)); // At this point we can assume that value points to a bool value. @@ -1512,11 +1516,12 @@ static void OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeI static void OnSwitchAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { + using namespace Clusters::Switch::Attributes; + // auto * pimEngine = chip::app::InteractionModelEngine::GetInstance(); // bool do_sendrpt = false; - VerifyOrExit(attributeId == ZCL_CURRENT_POSITION_ATTRIBUTE_ID, - ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId)); + VerifyOrExit(attributeId == CurrentPosition::Id, ChipLogError(DeviceLayer, "Unhandled Attribute ID: '0x%04lx", attributeId)); // Send the switch status report now /* for (uint32_t i = 0 ; iGetNumActiveReadHandlers() ; i++) { @@ -1549,20 +1554,23 @@ Identify_Time_t id_time[MAX_ENDPOINT_COUNT]; void IdentifyTimerHandler(System::Layer * systemLayer, void * appState) { + using namespace Clusters::Identify::Attributes; + Identify_Time_t * pidt = (Identify_Time_t *) appState; PRINTF(" -> %s(%u, %u) \r\n", __FUNCTION__, pidt->ep, pidt->identifyTimerCount); if (pidt->identifyTimerCount) { pidt->identifyTimerCount--; - emAfWriteAttribute(pidt->ep, Clusters::Identify::Id, ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, (uint8_t *) &pidt->identifyTimerCount, - sizeof(identifyTimerCount), true, false); + IdentifyTime::Set(pidt->ep, pidt->identifyTimerCount); DeviceLayer::SystemLayer().StartTimer(System::Clock::Seconds16(1), IdentifyTimerHandler, pidt); } } static void OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, + using namespace Clusters::Identify::Attributes; + + VerifyOrExit(attributeId == IdentifyTime::Id, ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04lx", TAG, attributeId)); VerifyOrExit((endpointId < MAX_ENDPOINT_COUNT), ChipLogError(DeviceLayer, "[%s] EndPoint > max: [%u, %u]", TAG, endpointId, MAX_ENDPOINT_COUNT)); diff --git a/examples/all-clusters-app/telink/src/AppTask.cpp b/examples/all-clusters-app/telink/src/AppTask.cpp index 376b0d80b6bc40..41abf953c3300b 100644 --- a/examples/all-clusters-app/telink/src/AppTask.cpp +++ b/examples/all-clusters-app/telink/src/AppTask.cpp @@ -29,8 +29,6 @@ #include "ThreadUtil.h" -#include -#include #include #include diff --git a/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp index f4a7ab2d076c2f..e53adc0c793f25 100644 --- a/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp +++ b/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp @@ -25,7 +25,7 @@ #include "DeviceCallbacks.h" #include "CHIPDeviceManager.h" -#include +#include #include #include #include @@ -116,7 +116,7 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::OnOff::Attributes::OnOff::Id, ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -138,7 +138,7 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState, CHIP_ERROR error void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id, ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId)); VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId)); diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ClusterManager.cpp b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ClusterManager.cpp index 1a07e18c72c3de..b55ffa374e9788 100644 --- a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ClusterManager.cpp +++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ClusterManager.cpp @@ -18,9 +18,8 @@ */ #include "ClusterManager.h" #include "Globals.h" -#include -#include #include +#include #include #include #include @@ -83,7 +82,8 @@ Identify gIdentify1 = { void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId)); + VerifyOrExit(attributeId == app::Clusters::OnOff::Attributes::OnOff::Id, + PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -101,7 +101,8 @@ void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId uint8_t brightness = onOffState ? *value : 0; VerifyOrExit(brightness > 0, PLAT_LOG("Brightness set to 0, ignoring")); - VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId)); + VerifyOrExit(attributeId == app::Clusters::LevelControl::Attributes::CurrentLevel::Id, + PLAT_LOG("Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -118,8 +119,9 @@ void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID || - attributeId == ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, + using namespace app::Clusters::ColorControl::Attributes; + + VerifyOrExit(attributeId == CurrentHue::Id || attributeId == CurrentSaturation::Id, PLAT_LOG("Unhandled AttributeId ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == ENDPOINT_ID_1 || endpointId == ENDPOINT_ID_2, PLAT_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -127,17 +129,17 @@ void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId if (endpointId == ENDPOINT_ID_1) { uint8_t hue, saturation; - if (attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID) + if (attributeId == CurrentHue::Id) { hue = *value; /* Read Current Saturation value when Attribute change callback for HUE Attribute */ - app::Clusters::ColorControl::Attributes::CurrentSaturation::Get(endpointId, &saturation); + CurrentSaturation::Get(endpointId, &saturation); } else { saturation = *value; /* Read Current Hue value when Attribute change callback for SATURATION Attribute */ - app::Clusters::ColorControl::Attributes::CurrentHue::Get(endpointId, &hue); + CurrentHue::Get(endpointId, &hue); } PLAT_LOG("Color Control triggered: Hue: %d Saturation: %d", hue, saturation); } diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index 4d14d56f8f0d6f..5a78ce84982c40 100644 --- a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -27,7 +27,6 @@ #include "ClusterManager.h" -#include #include #include #include diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp index 82917c28ef26b5..4358780cf6bc22 100644 --- a/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp @@ -27,8 +27,7 @@ #include "Globals.h" #include "LEDWidget.h" #include "WiFiWidget.h" -#include -#include +#include #include #include #include @@ -124,7 +123,8 @@ void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, Clus void AppDeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); + VerifyOrExit(attributeId == Clusters::OnOff::Attributes::OnOff::Id, + ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); // At this point we can assume that value points to a bool value. @@ -140,7 +140,8 @@ void AppDeviceCallbacks::OnLevelControlAttributeChangeCallback(EndpointId endpoi bool onOffState = mEndpointOnOffState[endpointId - 1]; uint8_t brightness = onOffState ? *value : 0; - VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); + VerifyOrExit(attributeId == Clusters::LevelControl::Attributes::CurrentLevel::Id, + ESP_LOGI(TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); // At this point we can assume that value points to a bool value. @@ -155,24 +156,23 @@ void AppDeviceCallbacks::OnLevelControlAttributeChangeCallback(EndpointId endpoi #if CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM void AppDeviceCallbacks::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID || - attributeId == ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, + using namespace Clusters::ColorControl::Attributes; + + VerifyOrExit(attributeId == CurrentHue::Id || attributeId == CurrentSaturation::Id, ESP_LOGI(TAG, "Unhandled AttributeId ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ESP_LOGE(TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); if (endpointId == 1) { uint8_t hue, saturation; - if (attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID) + if (attributeId == CurrentHue::Id) { hue = *value; - emberAfReadServerAttribute(endpointId, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, - &saturation, sizeof(uint8_t)); + CurrentSaturation::Get(endpointId, &saturation); } else { saturation = *value; - emberAfReadServerAttribute(endpointId, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, &hue, - sizeof(uint8_t)); + CurrentHue::Get(endpointId, &hue); } statusLED1.SetColor(hue, saturation); } diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp index 9146fe465e12e9..e3061455e96c8f 100644 --- a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp +++ b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp @@ -17,6 +17,7 @@ */ #include "DeviceWithDisplay.h" +#include #include #include @@ -231,16 +232,15 @@ class EditAttributeListModel : public TouchesMatterStackModel if (name == "OnOff" && cluster == "OnOff") { - value = (value == "On") ? "Off" : "On"; - uint8_t attributeValue = (value == "On") ? 1 : 0; - emberAfWriteServerAttribute(endpointIndex + 1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, - (uint8_t *) &attributeValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + value = (value == "On") ? "Off" : "On"; + bool attributeValue = (value == "On"); + app::Clusters::OnOff::Attributes::OnOff::Set(endpointIndex + 1, attributeValue); } if (name == "Occupancy" && cluster == "Occupancy Sensor") { - value = (value == "Yes") ? "No" : "Yes"; - uint8_t attributeValue = (value == "Yes") ? 1 : 0; + value = (value == "Yes") ? "No" : "Yes"; + bool attributeValue = (value == "Yes"); ESP_LOGI(TAG, "Occupancy changed to : %s", value.c_str()); // update the current occupancy here for hardcoded endpoint 1 app::Clusters::OccupancySensing::Attributes::Occupancy::Set(1, attributeValue); diff --git a/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h b/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h index 7a283fe7546ef5..3dc7b57f2af3fb 100644 --- a/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h +++ b/examples/all-clusters-minimal-app/esp32/main/include/DeviceWithDisplay.h @@ -34,8 +34,6 @@ #include #include -#include -#include #include #include #include diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp index 35af6870006185..efbbb4af9ec705 100644 --- a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp @@ -23,8 +23,6 @@ #include "AppEvent.h" #include "ButtonHandler.h" #include "LEDWidget.h" -#include -#include #include #include #include @@ -408,8 +406,7 @@ void AppTask::OnOffUpdateClusterState(intptr_t context) uint8_t onoff = sLightLED.Get(); // write the new on/off value - EmberAfStatus status = - emberAfWriteServerAttribute(2, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, &onoff, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = app::Clusters::OnOff::Attributes::OnOff::Set(2, onoff); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/src/ClusterManager.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/ClusterManager.cpp index a3ae6a44190c75..38d009a53f8fc7 100644 --- a/examples/all-clusters-minimal-app/infineon/psoc6/src/ClusterManager.cpp +++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/ClusterManager.cpp @@ -24,8 +24,8 @@ #include "ClusterManager.h" #include "AppConfig.h" #include "LEDWidget.h" -#include #include +#include #include #include #include @@ -49,7 +49,7 @@ ClusterManager ClusterManager::sCluster; void ClusterManager::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, + VerifyOrExit(attributeId == OnOff::Attributes::OnOff::Id, P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId))); VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX || endpointId == ENDPOINT_SECOND_IDX, P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -69,7 +69,7 @@ void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId bool onOffState = mEndpointOnOffState[endpointId - 1]; uint8_t brightness = onOffState ? *value : 0; - VerifyOrExit(attributeId == ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, + VerifyOrExit(attributeId == LevelControl::Attributes::CurrentLevel::Id, P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId))); VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX || endpointId == ENDPOINT_SECOND_IDX, P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -82,31 +82,32 @@ void ClusterManager::OnLevelControlAttributeChangeCallback(EndpointId endpointId void ClusterManager::OnColorControlAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ColorControl::Attributes::CurrentHue::Id || - attributeId == ColorControl::Attributes::CurrentSaturation::Id, + using namespace ColorControl::Attributes; + + VerifyOrExit(attributeId == CurrentHue::Id || attributeId == CurrentSaturation::Id, P6_LOG("Unhandled Attribute ID: '" ChipLogFormatMEI "'", ChipLogValueMEI(attributeId))); VerifyOrExit(endpointId == ENDPOINT_FIRST_IDX || endpointId == ENDPOINT_SECOND_IDX, P6_LOG("Unexpected EndPoint ID: `0x%02x'", endpointId)); if (endpointId == 1) { uint8_t hue, saturation; - /* If the Current Attribute is ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, read the saturation value and + /* If the Current Attribute is CurrentHue, read the saturation value and * set the color on Cluster LED using both Saturation and Hue. */ - if (attributeId == ColorControl::Attributes::CurrentHue::Id) + if (attributeId == CurrentHue::Id) { hue = *value; /* Read Current Saturation value when Attribute change callback for HUE Attribute */ - ColorControl::Attributes::CurrentSaturation::Get(endpointId, &saturation); + CurrentSaturation::Get(endpointId, &saturation); } else { - /* If the Current Attribute is ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, read the Hue value and + /* If the Current Attribute is CurrentSaturation, read the Hue value and * set the color on Cluster LED using both Saturation and Hue. */ saturation = *value; /* Read Current Hue value when Attribute change callback for SATURATION Attribute */ - ColorControl::Attributes::CurrentHue::Get(endpointId, &hue); + CurrentHue::Get(endpointId, &hue); } /* Set RGB Color on Cluster Indication LED */ sClusterLED.SetColor(hue, saturation); diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/src/ZclCallbacks.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/ZclCallbacks.cpp index f3fd7cf6689a70..9a439771026736 100644 --- a/examples/all-clusters-minimal-app/infineon/psoc6/src/ZclCallbacks.cpp +++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/ZclCallbacks.cpp @@ -26,7 +26,6 @@ #include "ClusterManager.h" -#include #include #include #include diff --git a/examples/all-clusters-minimal-app/linux/main-common.cpp b/examples/all-clusters-minimal-app/linux/main-common.cpp index 7829f3a6c1894a..0b431136ed0d1d 100644 --- a/examples/all-clusters-minimal-app/linux/main-common.cpp +++ b/examples/all-clusters-minimal-app/linux/main-common.cpp @@ -18,7 +18,6 @@ #include "include/tv-callbacks.h" #include -#include #include #include #include diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp index dc6a5750698248..b0e23d9c4c54e4 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp +++ b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp @@ -24,8 +24,6 @@ #include #include -#include -#include #include #include diff --git a/examples/all-clusters-minimal-app/telink/src/AppTask.cpp b/examples/all-clusters-minimal-app/telink/src/AppTask.cpp index 1a8c1e08ff2f60..1577259b94feba 100644 --- a/examples/all-clusters-minimal-app/telink/src/AppTask.cpp +++ b/examples/all-clusters-minimal-app/telink/src/AppTask.cpp @@ -27,8 +27,6 @@ #include "ThreadUtil.h" -#include -#include #include #include diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp index 880cbf5d92676c..525a717464df69 100644 --- a/examples/bridge-app/esp32/main/main.cpp +++ b/examples/bridge-app/esp32/main/main.cpp @@ -20,7 +20,7 @@ #include "esp_log.h" #include "nvs_flash.h" #include -#include +#include #include #include #include @@ -105,21 +105,21 @@ static Device gLight4("Light 4", "Den"); // Declare On/Off cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(onOffAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_ON_OFF_ATTRIBUTE_ID, BOOLEAN, 1, 0), /* on/off */ +DECLARE_DYNAMIC_ATTRIBUTE(OnOff::Attributes::OnOff::Id, BOOLEAN, 1, 0), /* on/off */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Descriptor cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(descriptorAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_SERVER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CLIENT_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ +DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::DeviceTypeList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::ServerList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::ClientList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::PartsList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Bridged Device Basic Information cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(bridgedDeviceBasicAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_NODE_LABEL_ATTRIBUTE_ID, CHAR_STRING, kNodeLabelSize, 0), /* NodeLabel */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_REACHABLE_ATTRIBUTE_ID, BOOLEAN, 1, 0), /* Reachable */ +DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::NodeLabel::Id, CHAR_STRING, kNodeLabelSize, 0), /* NodeLabel */ + DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::Reachable::Id, BOOLEAN, 1, 0), /* Reachable */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Cluster List for Bridged Light endpoint @@ -216,18 +216,20 @@ CHIP_ERROR RemoveDeviceEndpoint(Device * dev) EmberAfStatus HandleReadBridgedDeviceBasicAttribute(Device * dev, chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength) { + using namespace BridgedDeviceBasicInformation::Attributes; + ChipLogProgress(DeviceLayer, "HandleReadBridgedDeviceBasicAttribute: attrId=%d, maxReadLength=%d", attributeId, maxReadLength); - if ((attributeId == ZCL_REACHABLE_ATTRIBUTE_ID) && (maxReadLength == 1)) + if ((attributeId == Reachable::Id) && (maxReadLength == 1)) { *buffer = dev->IsReachable() ? 1 : 0; } - else if ((attributeId == ZCL_NODE_LABEL_ATTRIBUTE_ID) && (maxReadLength == 32)) + else if ((attributeId == NodeLabel::Id) && (maxReadLength == 32)) { MutableByteSpan zclNameSpan(buffer, maxReadLength); MakeZclCharString(zclNameSpan, dev->GetName()); } - else if ((attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2)) + else if ((attributeId == ClusterRevision::Id) && (maxReadLength == 2)) { *buffer = (uint16_t) ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_REVISION; } @@ -243,11 +245,11 @@ EmberAfStatus HandleReadOnOffAttribute(Device * dev, chip::AttributeId attribute { ChipLogProgress(DeviceLayer, "HandleReadOnOffAttribute: attrId=%d, maxReadLength=%d", attributeId, maxReadLength); - if ((attributeId == ZCL_ON_OFF_ATTRIBUTE_ID) && (maxReadLength == 1)) + if ((attributeId == OnOff::Attributes::OnOff::Id) && (maxReadLength == 1)) { *buffer = dev->IsOn() ? 1 : 0; } - else if ((attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2)) + else if ((attributeId == OnOff::Attributes::ClusterRevision::Id) && (maxReadLength == 2)) { *buffer = (uint16_t) ZCL_ON_OFF_CLUSTER_REVISION; } @@ -263,7 +265,7 @@ EmberAfStatus HandleWriteOnOffAttribute(Device * dev, chip::AttributeId attribut { ChipLogProgress(DeviceLayer, "HandleWriteOnOffAttribute: attrId=%d", attributeId); - ReturnErrorCodeIf((attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) || (!dev->IsReachable()), EMBER_ZCL_STATUS_FAILURE); + ReturnErrorCodeIf((attributeId != OnOff::Attributes::OnOff::Id) || (!dev->IsReachable()), EMBER_ZCL_STATUS_FAILURE); dev->SetOnOff(*buffer == 1); return EMBER_ZCL_STATUS_SUCCESS; } diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index b343f54571c9c5..622c1cac4fd709 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include @@ -153,22 +153,22 @@ const int16_t initialMeasuredValue = 100; // Declare On/Off cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(onOffAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_ON_OFF_ATTRIBUTE_ID, BOOLEAN, 1, 0), /* on/off */ +DECLARE_DYNAMIC_ATTRIBUTE(OnOff::Attributes::OnOff::Id, BOOLEAN, 1, 0), /* on/off */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Descriptor cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(descriptorAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_SERVER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CLIENT_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ +DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::DeviceTypeList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::ServerList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::ClientList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::PartsList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Bridged Device Basic Information cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(bridgedDeviceBasicAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_NODE_LABEL_ATTRIBUTE_ID, CHAR_STRING, kNodeLabelSize, 0), /* NodeLabel */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_REACHABLE_ATTRIBUTE_ID, BOOLEAN, 1, 0), /* Reachable */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* feature map */ +DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::NodeLabel::Id, CHAR_STRING, kNodeLabelSize, 0), /* NodeLabel */ + DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::Reachable::Id, BOOLEAN, 1, 0), /* Reachable */ + DECLARE_DYNAMIC_ATTRIBUTE(BridgedDeviceBasicInformation::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* feature map */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Cluster List for Bridged Light endpoint @@ -233,10 +233,10 @@ Action action3(0x1003, "Turn Off Room 1", Actions::ActionTypeEnum::kAutomation, // - Bridged Device Basic Information DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(powerSourceAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_POWER_SOURCE_BAT_CHARGE_LEVEL_ATTRIBUTE_ID, ENUM8, 1, 0), - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_POWER_SOURCE_ORDER_ATTRIBUTE_ID, INT8U, 1, 0), - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_POWER_SOURCE_STATUS_ATTRIBUTE_ID, ENUM8, 1, 0), - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_POWER_SOURCE_DESCRIPTION_ATTRIBUTE_ID, CHAR_STRING, 32, 0), DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); +DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::BatChargeLevel::Id, ENUM8, 1, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Order::Id, INT8U, 1, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Status::Id, ENUM8, 1, 0), + DECLARE_DYNAMIC_ATTRIBUTE(PowerSource::Attributes::Description::Id, CHAR_STRING, 32, 0), DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedPowerSourceClusters) DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), @@ -246,10 +246,10 @@ DECLARE_DYNAMIC_CLUSTER(Descriptor::Id, descriptorAttrs, nullptr, nullptr), DECLARE_DYNAMIC_ENDPOINT(bridgedPowerSourceEndpoint, bridgedPowerSourceClusters); DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(tempSensorAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TEMP_MEASURED_VALUE_ATTRIBUTE_ID, INT16S, 2, 0), /* Measured Value */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TEMP_MIN_MEASURED_VALUE_ATTRIBUTE_ID, INT16S, 2, 0), /* Min Measured Value */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TEMP_MAX_MEASURED_VALUE_ATTRIBUTE_ID, INT16S, 2, 0), /* Max Measured Value */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ +DECLARE_DYNAMIC_ATTRIBUTE(TemperatureMeasurement::Attributes::MeasuredValue::Id, INT16S, 2, 0), /* Measured Value */ + DECLARE_DYNAMIC_ATTRIBUTE(TemperatureMeasurement::Attributes::MinMeasuredValue::Id, INT16S, 2, 0), /* Min Measured Value */ + DECLARE_DYNAMIC_ATTRIBUTE(TemperatureMeasurement::Attributes::MaxMeasuredValue::Id, INT16S, 2, 0), /* Max Measured Value */ + DECLARE_DYNAMIC_ATTRIBUTE(TemperatureMeasurement::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // --------------------------------------------------------------------------- @@ -488,22 +488,24 @@ void HandleDeviceTempSensorStatusChanged(DeviceTempSensor * dev, DeviceTempSenso EmberAfStatus HandleReadBridgedDeviceBasicAttribute(Device * dev, chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength) { + using namespace BridgedDeviceBasicInformation::Attributes; + ChipLogProgress(DeviceLayer, "HandleReadBridgedDeviceBasicAttribute: attrId=%d, maxReadLength=%d", attributeId, maxReadLength); - if ((attributeId == ZCL_REACHABLE_ATTRIBUTE_ID) && (maxReadLength == 1)) + if ((attributeId == Reachable::Id) && (maxReadLength == 1)) { *buffer = dev->IsReachable() ? 1 : 0; } - else if ((attributeId == ZCL_NODE_LABEL_ATTRIBUTE_ID) && (maxReadLength == 32)) + else if ((attributeId == NodeLabel::Id) && (maxReadLength == 32)) { MutableByteSpan zclNameSpan(buffer, maxReadLength); MakeZclCharString(zclNameSpan, dev->GetName()); } - else if ((attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2)) + else if ((attributeId == ClusterRevision::Id) && (maxReadLength == 2)) { *buffer = (uint16_t) ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER_REVISION; } - else if ((attributeId == ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID) && (maxReadLength == 4)) + else if ((attributeId == FeatureMap::Id) && (maxReadLength == 4)) { *buffer = (uint32_t) ZCL_BRIDGED_DEVICE_BASIC_INFORMATION_FEATURE_MAP; } @@ -519,11 +521,11 @@ EmberAfStatus HandleReadOnOffAttribute(DeviceOnOff * dev, chip::AttributeId attr { ChipLogProgress(DeviceLayer, "HandleReadOnOffAttribute: attrId=%d, maxReadLength=%d", attributeId, maxReadLength); - if ((attributeId == ZCL_ON_OFF_ATTRIBUTE_ID) && (maxReadLength == 1)) + if ((attributeId == OnOff::Attributes::OnOff::Id) && (maxReadLength == 1)) { *buffer = dev->IsOn() ? 1 : 0; } - else if ((attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2)) + else if ((attributeId == OnOff::Attributes::ClusterRevision::Id) && (maxReadLength == 2)) { *buffer = (uint16_t) ZCL_ON_OFF_CLUSTER_REVISION; } @@ -539,7 +541,7 @@ EmberAfStatus HandleWriteOnOffAttribute(DeviceOnOff * dev, chip::AttributeId att { ChipLogProgress(DeviceLayer, "HandleWriteOnOffAttribute: attrId=%d", attributeId); - if ((attributeId == ZCL_ON_OFF_ATTRIBUTE_ID) && (dev->IsReachable())) + if ((attributeId == OnOff::Attributes::OnOff::Id) && (dev->IsReachable())) { if (*buffer) { @@ -600,27 +602,29 @@ EmberAfStatus HandleReadPowerSourceAttribute(DevicePowerSource * dev, chip::Attr EmberAfStatus HandleReadTempMeasurementAttribute(DeviceTempSensor * dev, chip::AttributeId attributeId, uint8_t * buffer, uint16_t maxReadLength) { - if ((attributeId == ZCL_TEMP_MEASURED_VALUE_ATTRIBUTE_ID) && (maxReadLength == 2)) + using namespace TemperatureMeasurement::Attributes; + + if ((attributeId == MeasuredValue::Id) && (maxReadLength == 2)) { int16_t measuredValue = dev->GetMeasuredValue(); memcpy(buffer, &measuredValue, sizeof(measuredValue)); } - else if ((attributeId == ZCL_TEMP_MIN_MEASURED_VALUE_ATTRIBUTE_ID) && (maxReadLength == 2)) + else if ((attributeId == MinMeasuredValue::Id) && (maxReadLength == 2)) { int16_t minValue = dev->mMin; memcpy(buffer, &minValue, sizeof(minValue)); } - else if ((attributeId == ZCL_TEMP_MAX_MEASURED_VALUE_ATTRIBUTE_ID) && (maxReadLength == 2)) + else if ((attributeId == MaxMeasuredValue::Id) && (maxReadLength == 2)) { int16_t maxValue = dev->mMax; memcpy(buffer, &maxValue, sizeof(maxValue)); } - else if ((attributeId == ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID) && (maxReadLength == 4)) + else if ((attributeId == FeatureMap::Id) && (maxReadLength == 4)) { uint32_t featureMap = ZCL_TEMPERATURE_SENSOR_FEATURE_MAP; memcpy(buffer, &featureMap, sizeof(featureMap)); } - else if ((attributeId == ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID) && (maxReadLength == 2)) + else if ((attributeId == ClusterRevision::Id) && (maxReadLength == 2)) { uint16_t clusterRevision = ZCL_TEMPERATURE_SENSOR_CLUSTER_REVISION; memcpy(buffer, &clusterRevision, sizeof(clusterRevision)); diff --git a/examples/chef/ameba/main/DeviceCallbacks.cpp b/examples/chef/ameba/main/DeviceCallbacks.cpp index 8e6b1192b96dd8..0ef956fe939e11 100644 --- a/examples/chef/ameba/main/DeviceCallbacks.cpp +++ b/examples/chef/ameba/main/DeviceCallbacks.cpp @@ -25,7 +25,7 @@ #include "DeviceCallbacks.h" #include "CHIPDeviceManager.h" -#include +#include #include #include #include @@ -139,7 +139,7 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::OnOff::Attributes::OnOff::Id, ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -161,7 +161,7 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState, CHIP_ERROR error void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id, ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId)); VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId)); diff --git a/examples/chef/common/stubs.cpp b/examples/chef/common/stubs.cpp index f0339ff76f14b1..5d7c2802d857f0 100644 --- a/examples/chef/common/stubs.cpp +++ b/examples/chef/common/stubs.cpp @@ -1,5 +1,3 @@ -#include -#include #include #include diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn index e5464094d29cf3..dd843668af0fdc 100644 --- a/examples/chef/efr32/BUILD.gn +++ b/examples/chef/efr32/BUILD.gn @@ -35,51 +35,17 @@ assert(current_os == "freertos") chef_project_dir = "${chip_root}/examples/chef" efr32_project_dir = "${chef_project_dir}/efr32" -examples_plat_dir = "${chip_root}/examples/platform/efr32" +examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" +examples_common_plat_dir = "${chip_root}/examples/platform/silabs" +app_data_model = "${efr32_project_dir}:chef-comon" +import("${examples_plat_dir}/args.gni") declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false - - # Monitor & log memory usage at runtime. - enable_heap_monitoring = false - - # Enable Sleepy end device - enable_sleepy_device = false - - # OTA timeout in seconds - OTA_periodic_query_timeout = 86400 - - # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false - sl_wfx_config_softap = false - sl_wfx_config_scan = true - - # Disable LCD on supported devices - disable_lcd = false - sample_name = "" } -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - -# Sanity check -assert(!(chip_enable_wifi && chip_enable_openthread)) -assert(!(use_rs911x && chip_enable_openthread)) -assert(!(use_wf200 && chip_enable_openthread)) -if (chip_enable_wifi) { - assert(use_rs911x || use_wf200) - enable_openthread_cli = false -} - chip_data_model("chef-common") { zap_file = "${chef_project_dir}/devices/${sample_name}.zap" @@ -87,35 +53,6 @@ chip_data_model("chef-common") { is_server = true } -# ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) -if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || - silabs_board == "BRD2703A" || silabs_board == "BRD4319A") { - show_qr_code = false - disable_lcd = true -} - -# WiFi settings -if (chip_enable_wifi) { - wifi_sdk_dir = "${chip_root}/third_party/efr32_sdk/repo/matter/wifi" - efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] - efr32_lwip_defs += [ - "LWIP_IPV4=1", - "LWIP_ARP=1", - "LWIP_ICMP=1", - "LWIP_DHCP=1", - "LWIP_IPV6_ND=1", - "LWIP_IGMP=1", - ] - - if (use_rs911x) { - wiseconnect_sdk_root = - "${chip_root}/third_party/efr32_sdk/wiseconnect-wifi-bt-sdk" - import("${wifi_sdk_dir}/rs911x/rs911x.gni") - } else { - import("${wifi_sdk_dir}/wf200/wf200.gni") - } -} - efr32_sdk("sdk") { sources = [ "${efr32_project_dir}/include/CHIPProjectConfig.h", @@ -123,141 +60,46 @@ efr32_sdk("sdk") { ] include_dirs = [ - "${chip_root}/src/platform/EFR32", + "${chip_root}/src/platform/silabs/EFR32", "${efr32_project_dir}/include", "${examples_plat_dir}", "${chip_root}/src/lib", + "${examples_common_plat_dir}", ] - defines = [ - "BOARD_ID=${silabs_board}", - "OTA_PERIODIC_TIMEOUT=${OTA_periodic_query_timeout}", - ] + if (use_wf200) { + # TODO efr32_sdk should not need a header from this location + include_dirs += [ "${examples_plat_dir}/wf200" ] + } + defines = [] if (chip_enable_pw_rpc) { defines += [ "HAL_VCOM_ENABLE=1", "PW_RPC_ENABLED", ] } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - defines += rs911x_defs - include_dirs += rs911x_plat_incs - } else if (use_wf200) { - defines += wf200_defs - include_dirs += wf200_plat_incs - } - - if (use_rs911x_sockets) { - include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ] - defines += rs911x_sock_defs - } else { - # Using LWIP instead of the native TCP/IP stack - defines += efr32_lwip_defs - } - - if (sl_wfx_config_softap) { - defines += [ "SL_WFX_CONFIG_SOFTAP" ] - } - if (sl_wfx_config_scan) { - defines += [ "SL_WFX_CONFIG_SCAN" ] - } - } } efr32_executable("chef_app") { output_name = "chip-efr32-chef-example.out" + public_configs = [ "${efr32_sdk_build_root}:silabs_config" ] include_dirs = [ "include" ] defines = [] sources = [ - "${examples_plat_dir}/BaseApplication.cpp", - "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/heap_4_silabs.c", - "${examples_plat_dir}/init_efrPlatform.cpp", - "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", "src/LightingManager.cpp", "src/ZclCallbacks.cpp", "src/main.cpp", ] - if (use_wstk_leds) { - sources += [ "${examples_plat_dir}/LEDWidget.cpp" ] - } - - if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli || - use_wf200 || use_rs911x) { - sources += [ "${examples_plat_dir}/uart.cpp" ] - } - deps = [ ":chef-common", ":sdk", - "${chip_root}/examples/providers:device_info_provider", - "${chip_root}/src/lib", - "${chip_root}/src/setup_payload", + "${examples_plat_dir}:efr32-common", ] - # OpenThread Settings - if (chip_enable_openthread) { - deps += [ - "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread-platform", - "${examples_plat_dir}:efr-matter-shell", - ] - } - - if (chip_enable_ota_requestor) { - defines += [ "EFR32_OTA_ENABLED" ] - sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] - } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - sources += rs911x_src_plat - - # All the stuff from wiseconnect - sources += rs911x_src_sapi - - # Apparently - the rsi library needs this (though we may not use use it) - sources += rs911x_src_sock - include_dirs += rs911x_inc_plat - - if (use_rs911x_sockets) { - # - # Using native sockets inside RS911x - # - include_dirs += rs911x_sock_inc - } else { - # - # We use LWIP - not built-in sockets - # - sources += rs911x_src_lwip - } - } else if (use_wf200) { - sources += wf200_plat_src - include_dirs += wf200_plat_incs - } - } - - if (!disable_lcd) { - sources += [ - "${examples_plat_dir}/display/demo-ui.c", - "${examples_plat_dir}/display/lcd.cpp", - ] - include_dirs += [ "${examples_plat_dir}/display" ] - defines += [ "DISPLAY_ENABLED" ] - if (show_qr_code) { - defines += [ "QR_CODE_ENABLED" ] - deps += [ "${chip_root}/examples/common/QRCode" ] - } - } - if (chip_enable_pw_rpc) { defines += [ "PW_RPC_ENABLED", @@ -274,8 +116,8 @@ efr32_executable("chef_app") { sources += [ "${chip_root}/examples/common/pigweed/RpcService.cpp", "${chip_root}/examples/common/pigweed/efr32/PigweedLoggerMutex.cpp", - "${examples_plat_dir}/PigweedLogger.cpp", - "${examples_plat_dir}/Rpc.cpp", + "${examples_common_plat_dir}/PigweedLogger.cpp", + "${examples_common_plat_dir}/Rpc.cpp", ] deps += [ @@ -303,11 +145,6 @@ efr32_executable("chef_app") { ] } - if (enable_heap_monitoring) { - sources += [ "${examples_plat_dir}/MemMonitoring.cpp" ] - defines += [ "HEAP_MONITORING" ] - } - ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld" inputs = [ ldscript ] @@ -329,16 +166,6 @@ efr32_executable("chef_app") { ] } - # Attestation Credentials - if (chip_build_platform_attestation_credentials_provider) { - deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ] - } - - # Factory Data Provider - if (use_efr32_factory_data_provider) { - deps += [ "${examples_plat_dir}:efr32-factory-data-provider" ] - } - output_dir = root_out_dir } diff --git a/examples/chef/efr32/src/AppTask.cpp b/examples/chef/efr32/src/AppTask.cpp index 3de9bff17a49f9..240f2116cf0ef9 100644 --- a/examples/chef/efr32/src/AppTask.cpp +++ b/examples/chef/efr32/src/AppTask.cpp @@ -33,8 +33,6 @@ #endif // QR_CODE_ENABLED #endif // DISPLAY_ENABLED -#include -#include #include #include #include diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp index bd8ec2660100f4..fc17db7d72d346 100644 --- a/examples/chef/esp32/main/main.cpp +++ b/examples/chef/esp32/main/main.cpp @@ -38,8 +38,6 @@ #include #include -#include -#include #include #include #include diff --git a/examples/chip-tool/commands/clusters/ReportCommand.h b/examples/chip-tool/commands/clusters/ReportCommand.h index 98a51cd7232e93..f7e1993e26b70b 100644 --- a/examples/chip-tool/commands/clusters/ReportCommand.h +++ b/examples/chip-tool/commands/clusters/ReportCommand.h @@ -85,6 +85,8 @@ class ReportCommand : public InteractionModelReports, public ModelCommand, publi return; } + ReturnOnFailure(RemoteDataModelLogger::LogEventAsJSON(eventHeader, data)); + CHIP_ERROR error = DataModelLogger::LogEvent(eventHeader, data); if (CHIP_NO_ERROR != error) { diff --git a/examples/chip-tool/commands/clusters/WriteAttributeCommand.h b/examples/chip-tool/commands/clusters/WriteAttributeCommand.h index 1b92da403d3dab..c3cea8783dbdd0 100644 --- a/examples/chip-tool/commands/clusters/WriteAttributeCommand.h +++ b/examples/chip-tool/commands/clusters/WriteAttributeCommand.h @@ -23,12 +23,22 @@ #include "DataModelLogger.h" #include "ModelCommand.h" +constexpr const char * kWriteCommandKey = "write"; +constexpr const char * kWriteByIdCommandKey = "write-by-id"; +constexpr const char * kForceWriteCommandKey = "force-write"; + +enum class WriteCommandType +{ + kWrite, // regular, writable attributes + kForceWrite, // forced writes, send a write command on something expected to fail +}; + template > class WriteAttribute : public InteractionModelWriter, public ModelCommand, public chip::app::WriteClient::Callback { public: WriteAttribute(CredentialIssuerCommands * credsIssuerConfig) : - InteractionModelWriter(this), ModelCommand("write-by-id", credsIssuerConfig) + InteractionModelWriter(this), ModelCommand(kWriteByIdCommandKey, credsIssuerConfig) { AddArgumentClusterIds(); AddArgumentAttributeIds(); @@ -37,7 +47,7 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi } WriteAttribute(chip::ClusterId clusterId, CredentialIssuerCommands * credsIssuerConfig) : - InteractionModelWriter(this), ModelCommand("write-by-id", credsIssuerConfig), mClusterIds(1, clusterId) + InteractionModelWriter(this), ModelCommand(kWriteByIdCommandKey, credsIssuerConfig), mClusterIds(1, clusterId) { AddArgumentAttributeIds(); AddArgumentAttributeValues(); @@ -46,8 +56,8 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi template WriteAttribute(chip::ClusterId clusterId, const char * attributeName, minType minValue, maxType maxValue, - chip::AttributeId attributeId, CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute(clusterId, attributeId, credsIssuerConfig) + chip::AttributeId attributeId, WriteCommandType commandType, CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute(clusterId, attributeId, commandType, credsIssuerConfig) { AddArgumentAttributeName(attributeName); AddArgumentAttributeValues(static_cast(minValue), static_cast(maxValue)); @@ -55,8 +65,8 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi } WriteAttribute(chip::ClusterId clusterId, const char * attributeName, float minValue, float maxValue, - chip::AttributeId attributeId, CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute(clusterId, attributeId, credsIssuerConfig) + chip::AttributeId attributeId, WriteCommandType commandType, CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute(clusterId, attributeId, commandType, credsIssuerConfig) { AddArgumentAttributeName(attributeName); AddArgumentAttributeValues(minValue, maxValue); @@ -64,8 +74,8 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi } WriteAttribute(chip::ClusterId clusterId, const char * attributeName, double minValue, double maxValue, - chip::AttributeId attributeId, CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute(clusterId, attributeId, credsIssuerConfig) + chip::AttributeId attributeId, WriteCommandType commandType, CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute(clusterId, attributeId, commandType, credsIssuerConfig) { AddArgumentAttributeName(attributeName); AddArgumentAttributeValues(minValue, maxValue); @@ -73,8 +83,8 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi } WriteAttribute(chip::ClusterId clusterId, const char * attributeName, chip::AttributeId attributeId, - CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute(clusterId, attributeId, credsIssuerConfig) + WriteCommandType commandType, CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute(clusterId, attributeId, commandType, credsIssuerConfig) { AddArgumentAttributeName(attributeName); AddArgumentAttributeValues(); @@ -82,8 +92,9 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi } WriteAttribute(chip::ClusterId clusterId, const char * attributeName, chip::AttributeId attributeId, - TypedComplexArgument & attributeParser, CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute(clusterId, attributeId, credsIssuerConfig) + TypedComplexArgument & attributeParser, WriteCommandType commandType, + CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute(clusterId, attributeId, commandType, credsIssuerConfig) { AddArgumentAttributeName(attributeName); AddArgumentAttributeValues(attributeParser); @@ -159,7 +170,7 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi protected: WriteAttribute(const char * attributeName, CredentialIssuerCommands * credsIssuerConfig) : - InteractionModelWriter(this), ModelCommand("write", credsIssuerConfig) + InteractionModelWriter(this), ModelCommand(kWriteCommandKey, credsIssuerConfig) { // Subclasses are responsible for calling AddArguments. } @@ -244,9 +255,11 @@ class WriteAttribute : public InteractionModelWriter, public ModelCommand, publi private: // This constructor is private as it is not intended to be used from outside the class. - WriteAttribute(chip::ClusterId clusterId, chip::AttributeId attributeId, CredentialIssuerCommands * credsIssuerConfig) : - InteractionModelWriter(this), ModelCommand("write", credsIssuerConfig), mClusterIds(1, clusterId), - mAttributeIds(1, attributeId) + WriteAttribute(chip::ClusterId clusterId, chip::AttributeId attributeId, WriteCommandType commandType, + CredentialIssuerCommands * credsIssuerConfig) : + InteractionModelWriter(this), + ModelCommand(commandType == WriteCommandType::kWrite ? kWriteCommandKey : kForceWriteCommandKey, credsIssuerConfig), + mClusterIds(1, clusterId), mAttributeIds(1, attributeId) {} std::vector mClusterIds; @@ -261,8 +274,8 @@ class WriteAttributeAsComplex : public WriteAttribute { public: WriteAttributeAsComplex(chip::ClusterId clusterId, const char * attributeName, chip::AttributeId attributeId, - CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute(clusterId, attributeName, attributeId, mAttributeParser, credsIssuerConfig) + WriteCommandType commandType, CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute(clusterId, attributeName, attributeId, mAttributeParser, commandType, credsIssuerConfig) {} private: diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp index 7b7e24a1e771c8..b445ab88ce434c 100644 --- a/examples/chip-tool/commands/common/CHIPCommand.cpp +++ b/examples/chip-tool/commands/common/CHIPCommand.cpp @@ -178,7 +178,7 @@ void CHIPCommand::MaybeTearDownStack() CHIP_ERROR CHIPCommand::EnsureCommissionerForIdentity(std::string identity) { chip::NodeId nodeId; - ReturnErrorOnFailure(GetCommissionerNodeId(identity, &nodeId)); + ReturnErrorOnFailure(GetIdentityNodeId(identity, &nodeId)); CommissionerIdentity lookupKey{ identity, nodeId }; if (mCommissioners.find(lookupKey) != mCommissioners.end()) { @@ -310,7 +310,7 @@ std::string CHIPCommand::GetIdentity() return name; } -CHIP_ERROR CHIPCommand::GetCommissionerNodeId(std::string identity, chip::NodeId * nodeId) +CHIP_ERROR CHIPCommand::GetIdentityNodeId(std::string identity, chip::NodeId * nodeId) { if (mCommissionerNodeId.HasValue()) { @@ -374,7 +374,7 @@ chip::Controller::DeviceCommissioner & CHIPCommand::GetCommissioner(std::string VerifyOrDie(EnsureCommissionerForIdentity(identity) == CHIP_NO_ERROR); chip::NodeId nodeId; - VerifyOrDie(GetCommissionerNodeId(identity, &nodeId) == CHIP_NO_ERROR); + VerifyOrDie(GetIdentityNodeId(identity, &nodeId) == CHIP_NO_ERROR); CommissionerIdentity lookupKey{ identity, nodeId }; auto item = mCommissioners.find(lookupKey); VerifyOrDie(item != mCommissioners.end()); diff --git a/examples/chip-tool/commands/common/CHIPCommand.h b/examples/chip-tool/commands/common/CHIPCommand.h index e062b0d85023cc..ee46ada917b944 100644 --- a/examples/chip-tool/commands/common/CHIPCommand.h +++ b/examples/chip-tool/commands/common/CHIPCommand.h @@ -144,7 +144,7 @@ class CHIPCommand : public Command CredentialIssuerCommands * mCredIssuerCmds; std::string GetIdentity(); - CHIP_ERROR GetCommissionerNodeId(std::string identity, chip::NodeId * nodeId); + CHIP_ERROR GetIdentityNodeId(std::string identity, chip::NodeId * nodeId); void SetIdentity(const char * name); // This method returns the commissioner instance to be used for running the command. diff --git a/examples/chip-tool/commands/common/Commands.cpp b/examples/chip-tool/commands/common/Commands.cpp index fb675ee96acb4d..749cbdcc739250 100644 --- a/examples/chip-tool/commands/common/Commands.cpp +++ b/examples/chip-tool/commands/common/Commands.cpp @@ -72,6 +72,35 @@ std::vector GetArgumentsFromJson(Command * command, Json::Value & v return args; }; +// Check for arguments with a starting '"' but no ending '"': those +// would indicate that people are using double-quoting, not single +// quoting, on arguments with spaces. +static void DetectAndLogMismatchedDoubleQuotes(int argc, char ** argv) +{ + for (int curArg = 0; curArg < argc; ++curArg) + { + char * arg = argv[curArg]; + if (!arg) + { + continue; + } + + auto len = strlen(arg); + if (len == 0) + { + continue; + } + + if (arg[0] == '"' && arg[len - 1] != '"') + { + ChipLogError(chipTool, + "Mismatched '\"' detected in argument: '%s'. Use single quotes to delimit arguments with spaces " + "in them: 'x y', not \"x y\".", + arg); + } + } +} + } // namespace void Commands::Register(const char * clusterName, commands_list commandsList) @@ -217,6 +246,10 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive) int argumentsPosition = isGlobalCommand ? 4 : 3; if (!command->InitArguments(argc - argumentsPosition, &argv[argumentsPosition])) { + if (interactive) + { + DetectAndLogMismatchedDoubleQuotes(argc - argumentsPosition, &argv[argumentsPosition]); + } ShowCommand(argv[0], argv[1], command); return CHIP_ERROR_INVALID_ARGUMENT; } @@ -267,7 +300,8 @@ Command * Commands::GetGlobalCommand(CommandsVector & commands, std::string comm bool Commands::IsAttributeCommand(std::string commandName) const { - return commandName.compare("read") == 0 || commandName.compare("write") == 0 || commandName.compare("subscribe") == 0; + return commandName.compare("read") == 0 || commandName.compare("write") == 0 || commandName.compare("force-write") == 0 || + commandName.compare("subscribe") == 0; } bool Commands::IsEventCommand(std::string commandName) const @@ -308,6 +342,7 @@ void Commands::ShowCluster(std::string executable, std::string clusterName, Comm fprintf(stderr, " +-------------------------------------------------------------------------------------+\n"); bool readCommand = false; bool writeCommand = false; + bool writeOverrideCommand = false; bool subscribeCommand = false; bool readEventCommand = false; bool subscribeEventCommand = false; @@ -325,6 +360,10 @@ void Commands::ShowCluster(std::string executable, std::string clusterName, Comm { writeCommand = true; } + else if (strcmp(command->GetName(), "force-write") == 0 && !writeOverrideCommand) + { + writeOverrideCommand = true; + } else if (strcmp(command->GetName(), "subscribe") == 0 && !subscribeCommand) { subscribeCommand = true; diff --git a/examples/chip-tool/commands/common/CredentialIssuerCommands.h b/examples/chip-tool/commands/common/CredentialIssuerCommands.h index 1ea712ffa9593f..afb36773529e1e 100644 --- a/examples/chip-tool/commands/common/CredentialIssuerCommands.h +++ b/examples/chip-tool/commands/common/CredentialIssuerCommands.h @@ -73,6 +73,8 @@ class CredentialIssuerCommands virtual chip::Controller::OperationalCredentialsDelegate * GetCredentialIssuer() = 0; + virtual void SetCredentialIssuerCATValues(chip::CATValues cats) = 0; + /** * @brief * This function is used to Generate NOC Chain for the Controller/Commissioner. Parameters follow the example implementation, diff --git a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp index 512a28e5ae80c9..1b397dfe8989d0 100644 --- a/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp +++ b/examples/chip-tool/commands/common/RemoteDataModelLogger.cpp @@ -27,6 +27,8 @@ constexpr const char * kEventIdKey = "eventId"; constexpr const char * kCommandIdKey = "commandId"; constexpr const char * kErrorIdKey = "error"; constexpr const char * kClusterErrorIdKey = "clusterError"; +constexpr const char * kValueKey = "value"; +constexpr const char * kNodeIdKey = "nodeId"; namespace { RemoteDataModelLoggerDelegate * gDelegate; @@ -142,12 +144,26 @@ CHIP_ERROR LogErrorAsJSON(const chip::app::EventHeader & header, const chip::app CHIP_ERROR LogErrorAsJSON(const CHIP_ERROR & error) { + VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); + Json::Value value; chip::app::StatusIB status; status.InitFromChipError(error); return LogError(value, status); } +CHIP_ERROR LogGetCommissionerNodeId(chip::NodeId value) +{ + VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); + + Json::Value rootValue; + rootValue[kValueKey] = Json::Value(); + rootValue[kValueKey][kNodeIdKey] = value; + + auto valueStr = chip::JsonToString(rootValue); + return gDelegate->LogJSON(valueStr.c_str()); +} + void SetDelegate(RemoteDataModelLoggerDelegate * delegate) { gDelegate = delegate; diff --git a/examples/chip-tool/commands/common/RemoteDataModelLogger.h b/examples/chip-tool/commands/common/RemoteDataModelLogger.h index ed9cb1fe09b52d..a1d2464748cff0 100644 --- a/examples/chip-tool/commands/common/RemoteDataModelLogger.h +++ b/examples/chip-tool/commands/common/RemoteDataModelLogger.h @@ -38,5 +38,6 @@ CHIP_ERROR LogErrorAsJSON(const chip::app::ConcreteCommandPath & path, const chi CHIP_ERROR LogEventAsJSON(const chip::app::EventHeader & header, chip::TLV::TLVReader * data); CHIP_ERROR LogErrorAsJSON(const chip::app::EventHeader & header, const chip::app::StatusIB & status); CHIP_ERROR LogErrorAsJSON(const CHIP_ERROR & error); +CHIP_ERROR LogGetCommissionerNodeId(chip::NodeId value); void SetDelegate(RemoteDataModelLoggerDelegate * delegate); }; // namespace RemoteDataModelLogger diff --git a/examples/chip-tool/commands/example/ExampleCredentialIssuerCommands.h b/examples/chip-tool/commands/example/ExampleCredentialIssuerCommands.h index e06466ca4ab67d..a8694f02ff894e 100644 --- a/examples/chip-tool/commands/example/ExampleCredentialIssuerCommands.h +++ b/examples/chip-tool/commands/example/ExampleCredentialIssuerCommands.h @@ -45,6 +45,7 @@ class ExampleCredentialIssuerCommands : public CredentialIssuerCommands return CHIP_NO_ERROR; } chip::Controller::OperationalCredentialsDelegate * GetCredentialIssuer() override { return &mOpCredsIssuer; } + void SetCredentialIssuerCATValues(chip::CATValues cats) override { mOpCredsIssuer.SetCATValuesForNextNOCRequest(cats); } CHIP_ERROR GenerateControllerNOCChain(chip::NodeId nodeId, chip::FabricId fabricId, const chip::CATValues & cats, chip::Crypto::P256Keypair & keypair, chip::MutableByteSpan & rcac, chip::MutableByteSpan & icac, chip::MutableByteSpan & noc) override diff --git a/examples/chip-tool/commands/pairing/Commands.h b/examples/chip-tool/commands/pairing/Commands.h index 871b282ebd781d..0401c8888fffd7 100644 --- a/examples/chip-tool/commands/pairing/Commands.h +++ b/examples/chip-tool/commands/pairing/Commands.h @@ -21,6 +21,7 @@ #include "commands/common/Commands.h" #include "commands/pairing/CloseSessionCommand.h" #include "commands/pairing/CommissionedListCommand.h" +#include "commands/pairing/GetCommissionerNodeIdCommand.h" #include "commands/pairing/OpenCommissioningWindowCommand.h" #include "commands/pairing/PairingCommand.h" @@ -220,6 +221,7 @@ void registerCommandsPairing(Commands & commands, CredentialIssuerCommands * cre make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), make_unique(credsIssuerConfig), + make_unique(credsIssuerConfig), }; commands.Register(clusterName, clusterCommands); diff --git a/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h b/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h new file mode 100644 index 00000000000000..9d3d3deabd83d7 --- /dev/null +++ b/examples/chip-tool/commands/pairing/GetCommissionerNodeIdCommand.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2023 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#pragma once + +#include "../common/CHIPCommand.h" + +class GetCommissionerNodeIdCommand : public CHIPCommand +{ +public: + GetCommissionerNodeIdCommand(CredentialIssuerCommands * credIssuerCommands) : + CHIPCommand("get-commissioner-node-id", credIssuerCommands) + {} + + /////////// CHIPCommand Interface ///////// + CHIP_ERROR RunCommand() override + { + chip::NodeId id; + ReturnErrorOnFailure(GetIdentityNodeId(GetIdentity(), &id)); + ChipLogProgress(chipTool, "Commissioner Node Id 0x:" ChipLogFormatX64, ChipLogValueX64(id)); + + ReturnErrorOnFailure(RemoteDataModelLogger::LogGetCommissionerNodeId(id)); + SetCommandExitStatus(CHIP_NO_ERROR); + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(10); } +}; diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp index ec8deb76a6081f..6467e8ffcbe989 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.cpp +++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp @@ -33,6 +33,21 @@ using namespace ::chip::Controller; CHIP_ERROR PairingCommand::RunCommand() { CurrentCommissioner().RegisterPairingDelegate(this); + // Clear the CATs in OperationalCredentialsIssuer + mCredIssuerCmds->SetCredentialIssuerCATValues(kUndefinedCATs); + + if (mCASEAuthTags.HasValue() && mCASEAuthTags.Value().size() <= kMaxSubjectCATAttributeCount) + { + CATValues cats = kUndefinedCATs; + for (size_t index = 0; index < mCASEAuthTags.Value().size(); ++index) + { + cats.values[index] = mCASEAuthTags.Value()[index]; + } + if (cats.AreValid()) + { + mCredIssuerCmds->SetCredentialIssuerCATValues(cats); + } + } return RunInternal(mNodeId); } diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h index 142a09013806af..656b4c60d4db02 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.h +++ b/examples/chip-tool/commands/pairing/PairingCommand.h @@ -64,6 +64,7 @@ class PairingCommand : public CHIPCommand, AddArgument("bypass-attestation-verifier", 0, 1, &mBypassAttestationVerifier, "Bypass the attestation verifier. If not provided or false, the attestation verifier is not bypassed." " If true, the commissioning will continue in case of attestation verification failure."); + AddArgument("case-auth-tags", 1, UINT32_MAX, &mCASEAuthTags, "The CATs to be encoded in the NOC sent to the commissionee"); switch (networkType) { @@ -188,6 +189,7 @@ class PairingCommand : public CHIPCommand, chip::Optional mPaseOnly; chip::Optional mSkipCommissioningComplete; chip::Optional mBypassAttestationVerifier; + chip::Optional> mCASEAuthTags; uint16_t mRemotePort; uint16_t mDiscriminator; uint32_t mSetupPINCode; diff --git a/examples/chip-tool/commands/tests/TestCommand.h b/examples/chip-tool/commands/tests/TestCommand.h index c140fb689afde7..b1de8a20517024 100644 --- a/examples/chip-tool/commands/tests/TestCommand.h +++ b/examples/chip-tool/commands/tests/TestCommand.h @@ -78,12 +78,6 @@ class TestCommand : public TestRunner, chip::Controller::DeviceCommissioner & GetCommissioner(const char * identity) override { - // Best effort to get NodeId - if this fails, GetCommissioner will also fail - chip::NodeId id; - if (GetCommissionerNodeId(identity, &id) == CHIP_NO_ERROR) - { - mCommissionerNodeId.SetValue(id); - } return CHIPCommand::GetCommissioner(identity); }; @@ -101,7 +95,6 @@ class TestCommand : public TestRunner, chip::Optional mPICSFilePath; chip::Optional mTimeout; - chip::Optional mCommissionerNodeId; std::map> mDevices; // When set to false, prevents interaction model events from affecting the current test status. diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt index b56772d44a5ad5..2fcc7e1abb94e2 100644 --- a/examples/chip-tool/templates/commands.zapt +++ b/examples/chip-tool/templates/commands.zapt @@ -93,21 +93,17 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands, CredentialIss {{/zcl_attributes_server}} make_unique>(Id, credsIssuerConfig), // {{#zcl_attributes_server}} - {{#if isWritable}} {{#if_chip_complex}} - make_unique>(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // + make_unique>(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, WriteCommandType::k{{#unless isWritable}}Force{{/unless}}Write, credsIssuerConfig), // {{else if (isString type)}} - make_unique>(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // + make_unique>(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, WriteCommandType::k{{#unless isWritable}}Force{{/unless}}Write, credsIssuerConfig), // {{else}} - make_unique>(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", {{as_type_min_value type language='c++'}}, {{as_type_max_value type language='c++'}}, Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // + make_unique>(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", {{as_type_min_value type language='c++'}}, {{as_type_max_value type language='c++'}}, Attributes::{{asUpperCamelCase name}}::Id, WriteCommandType::k{{#unless isWritable}}Force{{/unless}}Write, credsIssuerConfig), // {{/if_chip_complex}} - {{/if}} {{/zcl_attributes_server}} make_unique(Id, credsIssuerConfig), // {{#zcl_attributes_server}} - {{#if isReportable}} make_unique(Id, "{{cleanse_label_as_kebab_case (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // - {{/if}} {{/zcl_attributes_server}} // // Events diff --git a/examples/chip-tool/templates/tests/partials/test_cluster.zapt b/examples/chip-tool/templates/tests/partials/test_cluster.zapt index 0eba4f18f22913..a968b9f1241839 100644 --- a/examples/chip-tool/templates/tests/partials/test_cluster.zapt +++ b/examples/chip-tool/templates/tests/partials/test_cluster.zapt @@ -48,14 +48,6 @@ private: void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -80,12 +72,6 @@ private: CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { {{#chip_tests_items}} diff --git a/examples/common/pigweed/rpc_services/Attributes.h b/examples/common/pigweed/rpc_services/Attributes.h index ba3453df43ed86..223ec3336f25bb 100644 --- a/examples/common/pigweed/rpc_services/Attributes.h +++ b/examples/common/pigweed/rpc_services/Attributes.h @@ -21,7 +21,6 @@ #include "app/util/attribute-storage.h" #include "attributes_service/attributes_service.rpc.pb.h" #include "pigweed/rpc_services/internal/StatusUtils.h" -#include #include #include #include diff --git a/examples/common/pigweed/rpc_services/Lighting.h b/examples/common/pigweed/rpc_services/Lighting.h index 533267a54c59bd..fb394cced45ef3 100644 --- a/examples/common/pigweed/rpc_services/Lighting.h +++ b/examples/common/pigweed/rpc_services/Lighting.h @@ -21,8 +21,8 @@ #include "app/util/attribute-storage.h" #include "lighting_service/lighting_service.rpc.pb.h" #include "pigweed/rpc_services/internal/StatusUtils.h" -#include -#include +#include +#include #include #include @@ -41,14 +41,12 @@ class Lighting : public pw_rpc::nanopb::Lighting::Service DeviceLayer::StackLock lock; uint8_t on = request.on; - RETURN_STATUS_IF_NOT_OK( - emberAfWriteServerAttribute(1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, &on, ZCL_BOOLEAN_ATTRIBUTE_ID)); + RETURN_STATUS_IF_NOT_OK(app::Clusters::OnOff::Attributes::OnOff::Set(1, on)); if (mSupportLevel && request.has_level) { // Clip level to max uint8_t level = std::min(request.level, static_cast(std::numeric_limits::max())); - RETURN_STATUS_IF_NOT_OK(emberAfWriteServerAttribute(kEndpoint, app::Clusters::LevelControl::Id, - ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, &level, ZCL_INT8U_ATTRIBUTE_TYPE)); + RETURN_STATUS_IF_NOT_OK(app::Clusters::LevelControl::Attributes::CurrentLevel::Set(kEndpoint, level)); } if (mSupportColor && request.has_color) @@ -57,11 +55,8 @@ class Lighting : public pw_rpc::nanopb::Lighting::Service // Clip color to max uint8_t hue = std::min(request.color.hue, kColorMax); uint8_t saturation = std::min(request.color.saturation, kColorMax); - RETURN_STATUS_IF_NOT_OK(emberAfWriteServerAttribute( - 1, app::Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, &hue, ZCL_INT8U_ATTRIBUTE_TYPE)); - RETURN_STATUS_IF_NOT_OK(emberAfWriteServerAttribute(kEndpoint, app::Clusters::ColorControl::Id, - ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, &saturation, - ZCL_INT8U_ATTRIBUTE_TYPE)); + RETURN_STATUS_IF_NOT_OK(app::Clusters::ColorControl::Attributes::CurrentHue::Set(1, hue)); + RETURN_STATUS_IF_NOT_OK(app::Clusters::ColorControl::Attributes::CurrentSaturation::Set(kEndpoint, saturation)); } return pw::OkStatus(); } @@ -70,28 +65,27 @@ class Lighting : public pw_rpc::nanopb::Lighting::Service { DeviceLayer::StackLock lock; - uint8_t on; - uint8_t level; + bool on; + app::DataModel::Nullable level; uint8_t hue; uint8_t saturation; - RETURN_STATUS_IF_NOT_OK(emberAfReadServerAttribute(1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, &on, sizeof(on))); + RETURN_STATUS_IF_NOT_OK(app::Clusters::OnOff::Attributes::OnOff::Get(1, &on)); response.on = on; if (mSupportLevel) { - RETURN_STATUS_IF_NOT_OK(emberAfReadServerAttribute(1, app::Clusters::LevelControl::Id, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, - &level, sizeof(level))); - response.level = level; - response.has_level = true; + RETURN_STATUS_IF_NOT_OK(app::Clusters::LevelControl::Attributes::CurrentLevel::Get(1, level)); + if (!level.IsNull()) + { + response.level = level.Value(); + response.has_level = true; + } } if (mSupportColor) { - RETURN_STATUS_IF_NOT_OK(emberAfReadServerAttribute(kEndpoint, app::Clusters::ColorControl::Id, - ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, &hue, sizeof(hue))); - RETURN_STATUS_IF_NOT_OK(emberAfReadServerAttribute(kEndpoint, app::Clusters::ColorControl::Id, - ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, &saturation, - sizeof(saturation))); + RETURN_STATUS_IF_NOT_OK(app::Clusters::ColorControl::Attributes::CurrentHue::Get(kEndpoint, &hue)); + RETURN_STATUS_IF_NOT_OK(app::Clusters::ColorControl::Attributes::CurrentSaturation::Get(kEndpoint, &saturation)); response.color.hue = hue; response.color.saturation = saturation; response.has_color = true; diff --git a/examples/common/pigweed/rpc_services/Locking.h b/examples/common/pigweed/rpc_services/Locking.h index 5400da3479f849..6d2e912858b47f 100644 --- a/examples/common/pigweed/rpc_services/Locking.h +++ b/examples/common/pigweed/rpc_services/Locking.h @@ -21,7 +21,6 @@ #include "app/util/attribute-storage.h" #include "locking_service/locking_service.rpc.pb.h" #include "pigweed/rpc_services/internal/StatusUtils.h" -#include #include #include diff --git a/examples/contact-sensor-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/contact-sensor-app/nxp/k32w/k32w0/main/AppTask.cpp index ef070c33c64273..504513e643e107 100644 --- a/examples/contact-sensor-app/nxp/k32w/k32w0/main/AppTask.cpp +++ b/examples/contact-sensor-app/nxp/k32w/k32w0/main/AppTask.cpp @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include #include @@ -854,8 +853,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg) uint8_t newValue = ContactSensorMgr().IsContactClosed(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, app::Clusters::BooleanState::Id, ZCL_STATE_VALUE_ATTRIBUTE_ID, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = app::Clusters::BooleanState::Attributes::StateValue::Set(1, newValue); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: updating boolean status value %x", status); @@ -873,8 +871,7 @@ void AppTask::UpdateDeviceStateInternal(intptr_t arg) bool stateValueAttrValue = 0; /* get onoff attribute value */ - (void) emberAfReadAttribute(1, app::Clusters::BooleanState::Id, ZCL_STATE_VALUE_ATTRIBUTE_ID, (uint8_t *) &stateValueAttrValue, - 1); + (void) app::Clusters::BooleanState::Attributes::StateValue::Get(1, &stateValueAttrValue); #if !cPWR_UsePowerDownMode /* set the device state */ sContactSensorLED.Set(stateValueAttrValue); diff --git a/examples/contact-sensor-app/telink/src/AppTask.cpp b/examples/contact-sensor-app/telink/src/AppTask.cpp index d237054a062794..375b649928b5a1 100644 --- a/examples/contact-sensor-app/telink/src/AppTask.cpp +++ b/examples/contact-sensor-app/telink/src/AppTask.cpp @@ -25,8 +25,7 @@ #include "ThreadUtil.h" #include -#include -#include +#include #include #include #include @@ -357,8 +356,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg) ChipLogProgress(NotSpecified, "emberAfWriteAttribute : %d", newValue); // write the new boolean state value - EmberAfStatus status = emberAfWriteAttribute(1, Clusters::BooleanState::Id, ZCL_STATE_VALUE_ATTRIBUTE_ID, (uint8_t *) &newValue, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = app::Clusters::BooleanState::Attributes::StateValue::Set(1, newValue); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: updating boolean status value %x", status); @@ -581,7 +579,7 @@ void AppTask::UpdateDeviceStateInternal(intptr_t arg) bool stateValueAttrValue = 0; /* get boolean state attribute value */ - (void) emberAfReadAttribute(1, Clusters::BooleanState::Id, ZCL_STATE_VALUE_ATTRIBUTE_ID, (uint8_t *) &stateValueAttrValue, 1); + (void) app::Clusters::BooleanState::Attributes::StateValue::Get(1, &stateValueAttrValue); ChipLogProgress(NotSpecified, "emberAfReadAttribute : %d", stateValueAttrValue); sContactSensorLED.Set(stateValueAttrValue); diff --git a/examples/darwin-framework-tool/BUILD.gn b/examples/darwin-framework-tool/BUILD.gn index cea7f9d794ff57..231ebac679b240 100644 --- a/examples/darwin-framework-tool/BUILD.gn +++ b/examples/darwin-framework-tool/BUILD.gn @@ -139,6 +139,8 @@ executable("darwin-framework-tool") { "commands/common/MTRLogging.h", "commands/pairing/Commands.h", "commands/pairing/DeviceControllerDelegateBridge.mm", + "commands/pairing/GetCommissionerNodeIdCommand.h", + "commands/pairing/GetCommissionerNodeIdCommand.mm", "commands/pairing/OpenCommissioningWindowCommand.h", "commands/pairing/OpenCommissioningWindowCommand.mm", "commands/pairing/PairingCommandBridge.mm", diff --git a/examples/darwin-framework-tool/commands/pairing/Commands.h b/examples/darwin-framework-tool/commands/pairing/Commands.h index 23242355ffaa3f..69eb9f39352e51 100644 --- a/examples/darwin-framework-tool/commands/pairing/Commands.h +++ b/examples/darwin-framework-tool/commands/pairing/Commands.h @@ -20,6 +20,7 @@ #import +#include "GetCommissionerNodeIdCommand.h" #include "OpenCommissioningWindowCommand.h" #include "PairingCommandBridge.h" #include "PreWarmCommissioningCommand.h" @@ -73,6 +74,7 @@ void registerCommandsPairing(Commands & commands) make_unique(), make_unique(), make_unique(), + make_unique(), }; commands.Register(clusterName, clusterCommands); diff --git a/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.h b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.h new file mode 100644 index 00000000000000..c07d3c2ac80899 --- /dev/null +++ b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2023 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#pragma once + +#include "../common/CHIPCommandBridge.h" + +class GetCommissionerNodeIdCommand : public CHIPCommandBridge +{ +public: + GetCommissionerNodeIdCommand() : CHIPCommandBridge("get-commissioner-node-id") {} + + /////////// CHIPCommand Interface ///////// + CHIP_ERROR RunCommand() override; + + chip::System::Clock::Timeout GetWaitDuration() const override { return chip::System::Clock::Seconds16(0); } +}; diff --git a/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm new file mode 100644 index 00000000000000..48502f84641b58 --- /dev/null +++ b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2023 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#import + +#include "GetCommissionerNodeIdCommand.h" + +CHIP_ERROR GetCommissionerNodeIdCommand::RunCommand() +{ + auto * controller = CurrentCommissioner(); + VerifyOrReturnError(nil != controller, CHIP_ERROR_INCORRECT_STATE); + + auto id = [controller.controllerNodeId unsignedLongLongValue]; + ChipLogProgress(chipTool, "Commissioner Node Id 0x:" ChipLogFormatX64, ChipLogValueX64(id)); + + SetCommandExitStatus(CHIP_NO_ERROR); + return CHIP_NO_ERROR; +} diff --git a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h index 52e49ff4abe392..0828e1d1eccac5 100644 --- a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h +++ b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h @@ -154,9 +154,6 @@ class TestCommandBridge : public CHIPCommandBridge, VerifyOrReturnError(controller != nil, CHIP_ERROR_INCORRECT_STATE); SetIdentity(identity); - if (controller.controllerNodeId != nil) { - mCommissionerNodeId.SetValue([controller.controllerNodeId unsignedLongLongValue]); - } // Invalidate our existing CASE session; otherwise trying to work with // our device will just reuse it without establishing a new CASE @@ -184,10 +181,6 @@ class TestCommandBridge : public CHIPCommandBridge, VerifyOrReturnError(controller != nil, CHIP_ERROR_INCORRECT_STATE); SetIdentity(identity); - if (controller.controllerNodeId != nil) { - mCommissionerNodeId.SetValue([controller.controllerNodeId unsignedLongLongValue]); - } - [controller setDeviceControllerDelegate:mDeviceControllerDelegate queue:mCallbackQueue]; [mDeviceControllerDelegate setDeviceId:value.nodeId]; [mDeviceControllerDelegate setActive:YES]; @@ -208,6 +201,26 @@ class TestCommandBridge : public CHIPCommandBridge, return MTRErrorToCHIPErrorCode(err); } + CHIP_ERROR GetCommissionerNodeId(const char * _Nullable identity, + const chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type & value, + void (^_Nonnull OnResponse)(const chip::GetCommissionerNodeIdResponse &)) + { + auto * controller = GetCommissioner(identity); + VerifyOrReturnError(controller != nil, CHIP_ERROR_INCORRECT_STATE); + + auto id = [controller.controllerNodeId unsignedLongLongValue]; + ChipLogProgress(chipTool, "Commissioner Node Id: %llu", id); + + chip::GetCommissionerNodeIdResponse outValue; + outValue.nodeId = id; + + dispatch_async(mCallbackQueue, ^{ + OnResponse(outValue); + }); + + return CHIP_NO_ERROR; + } + /////////// SystemCommands Interface ///////// CHIP_ERROR ContinueOnChipMainThread(CHIP_ERROR err) override { @@ -226,9 +239,6 @@ class TestCommandBridge : public CHIPCommandBridge, MTRDeviceController * controller = GetCommissioner(identity); SetIdentity(identity); - if (controller != nil && controller.controllerNodeId != nil) { - mCommissionerNodeId.SetValue([controller.controllerNodeId unsignedLongLongValue]); - } return mConnectedDevices[identity]; } @@ -270,7 +280,6 @@ class TestCommandBridge : public CHIPCommandBridge, chip::Optional mPICSFilePath; chip::Optional mEndpointId; chip::Optional mTimeout; - chip::Optional mCommissionerNodeId; bool CheckConstraintStartsWith( const char * _Nonnull itemName, const NSString * _Nonnull current, const char * _Nonnull expected) diff --git a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt index ab878c23fd6846..a3d06aa879cebe 100644 --- a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt +++ b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt @@ -23,17 +23,10 @@ class {{filename}}: public TestCommandBridge { } - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { @@ -140,10 +133,31 @@ class {{filename}}: public TestCommandBridge {{#chip_tests_item_parameters}} {{>commandValue ns=parent.cluster container=(asPropertyValue dontUnwrapValue=true) definedValue=definedValue depth=0}} {{/chip_tests_item_parameters}} + {{#if (and (isStrEqual cluster "CommissionerCommands") (isStrEqual command "GetCommissionerNodeId"))}} + return {{command}}("{{identity}}", value, ^(const chip::{{command}}Response & values) { + {{#chip_tests_item_responses}} + {{#chip_tests_item_response_parameters}} + {{#if hasExpectedValue}} + { + id actualValue = values.{{asStructPropertyName name}} + {{>check_test_value actual="actualValue" expected=expectedValue cluster=../cluster}} + } + {{/if}} + {{>maybeCheckExpectedConstraints}} + {{#if saveAs}} + { + {{saveAs}} = [[NSNumber alloc] initWithUnsignedLongLong:values.{{asStructPropertyName name}}]; + } + {{/if}} + {{/chip_tests_item_response_parameters}} + {{/chip_tests_item_responses}} + NextTest(); + }); + {{else}} return {{command}}("{{identity}}", value); + {{/if}} {{else}} MTRBaseDevice * device = GetDevice("{{identity}}"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseCluster{{>cluster}} alloc] initWithDevice:device endpointID:@({{endpoint}}) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); diff --git a/examples/dynamic-bridge-app/linux/DynamicDevice.cpp b/examples/dynamic-bridge-app/linux/DynamicDevice.cpp index e9b99c94b0537a..94ef87edfbc1e4 100644 --- a/examples/dynamic-bridge-app/linux/DynamicDevice.cpp +++ b/examples/dynamic-bridge-app/linux/DynamicDevice.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include "DynamicDevice.h" @@ -31,10 +31,14 @@ namespace { static const int kDescriptorAttributeArraySize = 254; DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(descriptorAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_SERVER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CLIENT_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ +DECLARE_DYNAMIC_ATTRIBUTE(chip::app::Clusters::Descriptor::Attributes::DeviceTypeList::Id, ARRAY, kDescriptorAttributeArraySize, + 0), /* device list */ + DECLARE_DYNAMIC_ATTRIBUTE(chip::app::Clusters::Descriptor::Attributes::ServerList::Id, ARRAY, kDescriptorAttributeArraySize, + 0), /* server list */ + DECLARE_DYNAMIC_ATTRIBUTE(chip::app::Clusters::Descriptor::Attributes::ClientList::Id, ARRAY, kDescriptorAttributeArraySize, + 0), /* client list */ + DECLARE_DYNAMIC_ATTRIBUTE(chip::app::Clusters::Descriptor::Attributes::PartsList::Id, ARRAY, kDescriptorAttributeArraySize, + 0), /* parts list */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); } // namespace diff --git a/examples/dynamic-bridge-app/linux/UserInputBackend.cpp b/examples/dynamic-bridge-app/linux/UserInputBackend.cpp index b609ad9cceffa9..5347919a552d30 100644 --- a/examples/dynamic-bridge-app/linux/UserInputBackend.cpp +++ b/examples/dynamic-bridge-app/linux/UserInputBackend.cpp @@ -2,6 +2,7 @@ #include "DynamicDevice.h" #include "main.h" +#include #include #include diff --git a/examples/dynamic-bridge-app/linux/bridge_service.h b/examples/dynamic-bridge-app/linux/bridge_service.h index faa744e7fba228..4e5cc1e057b4dc 100644 --- a/examples/dynamic-bridge-app/linux/bridge_service.h +++ b/examples/dynamic-bridge-app/linux/bridge_service.h @@ -21,8 +21,6 @@ #include "app/util/attribute-storage.h" #include "bridge_service/bridge_service.rpc.pb.h" #include "pigweed/rpc_services/internal/StatusUtils.h" -#include -#include #include namespace chip { diff --git a/examples/dynamic-bridge-app/linux/main.cpp b/examples/dynamic-bridge-app/linux/main.cpp index f71f120e3bdd38..1bbe05ef64aced 100644 --- a/examples/dynamic-bridge-app/linux/main.cpp +++ b/examples/dynamic-bridge-app/linux/main.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff --git a/examples/java-matter-controller/java/src/com/matter/controller/Main.java b/examples/java-matter-controller/java/src/com/matter/controller/Main.java index ffeefb43699a2e..0e24c6dc1c212d 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/Main.java +++ b/examples/java-matter-controller/java/src/com/matter/controller/Main.java @@ -112,9 +112,6 @@ public static void main(String[] args) { try { commandManager.run(args); - } catch (IllegalArgumentException e) { - logger.log(Level.INFO, "Arguments init failed with exception: " + e.getMessage()); - System.exit(1); } catch (Exception e) { logger.log(Level.INFO, "Run command failed with exception: " + e.getMessage()); System.exit(1); diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java index 2e1b373873478a..47e184ec3ae4d7 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java +++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.java @@ -96,8 +96,14 @@ public final void run(String[] args) throws Exception { // need skip over binary and command name and only get arguments String[] temp = Arrays.copyOfRange(args, 2, args.length); - command.initArguments(temp.length, temp); - showCommand(args[0], command); + try { + command.initArguments(temp.length, temp); + } catch (IllegalArgumentException e) { + logger.log(Level.INFO, "Arguments init failed with exception: " + e.getMessage()); + showCommand(args[0], command); + System.exit(1); + } + command.run(); } diff --git a/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp b/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp index 679faf925f5873..b0ffa52dbe050c 100644 --- a/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp +++ b/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp @@ -25,7 +25,7 @@ #include "DeviceCallbacks.h" #include "CHIPDeviceManager.h" -#include +#include #include #include #include @@ -154,7 +154,7 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState, CHIP_ERROR error void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, + VerifyOrExit(attributeId == Identify::Attributes::IdentifyTime::Id, ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId)); VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId)); diff --git a/examples/light-switch-app/genio/src/AppTask.cpp b/examples/light-switch-app/genio/src/AppTask.cpp index 4fd88497239959..f820d05ef14b05 100644 --- a/examples/light-switch-app/genio/src/AppTask.cpp +++ b/examples/light-switch-app/genio/src/AppTask.cpp @@ -25,8 +25,6 @@ #include "qrcodegen.h" -#include -#include #include #include #include diff --git a/examples/light-switch-app/silabs/SiWx917/BUILD.gn b/examples/light-switch-app/silabs/SiWx917/BUILD.gn index e4a31b94d2d502..a45c2d7a391ece 100644 --- a/examples/light-switch-app/silabs/SiWx917/BUILD.gn +++ b/examples/light-switch-app/silabs/SiWx917/BUILD.gn @@ -49,15 +49,9 @@ declare_args() { OTA_periodic_query_timeout = 86400 # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false sl_wfx_config_softap = false sl_wfx_config_scan = true - # Disable LCD on supported devices - disable_lcd = true - # Argument to Disable IPv4 for wifi(rs911) chip_enable_wifi_ipv4 = false @@ -71,14 +65,6 @@ declare_args() { chip_default_wifi_psk = "" } -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - # Sanity check assert(!(chip_enable_wifi && chip_enable_openthread)) assert(!(use_rs911x && chip_enable_openthread)) diff --git a/examples/light-switch-app/silabs/SiWx917/src/AppTask.cpp b/examples/light-switch-app/silabs/SiWx917/src/AppTask.cpp index f2246573a718d3..3ea96abf726399 100644 --- a/examples/light-switch-app/silabs/SiWx917/src/AppTask.cpp +++ b/examples/light-switch-app/silabs/SiWx917/src/AppTask.cpp @@ -43,8 +43,6 @@ #include "ShellCommands.h" #endif // defined(ENABLE_CHIP_SHELL) -#include -#include #include #include #include diff --git a/examples/light-switch-app/silabs/efr32/BUILD.gn b/examples/light-switch-app/silabs/efr32/BUILD.gn index 64c42eccbd9113..f989b0de1d337b 100644 --- a/examples/light-switch-app/silabs/efr32/BUILD.gn +++ b/examples/light-switch-app/silabs/efr32/BUILD.gn @@ -35,120 +35,11 @@ efr32_project_dir = "${chip_root}/examples/light-switch-app/silabs/efr32" examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" +import("${examples_plat_dir}/args.gni") + declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false - - # Monitor & log memory usage at runtime. - enable_heap_monitoring = false - - # Enable Sleepy end device - enable_sleepy_device = false - - # OTA timeout in seconds - OTA_periodic_query_timeout = 86400 - - # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false - sl_wfx_config_softap = false - sl_wfx_config_scan = true - - # Disable LCD on supported devices - disable_lcd = false - - # Argument to Disable IPv4 for wifi(rs911) - chip_enable_wifi_ipv4 = false - - # Argument to force enable WPA3 security - rs91x_wpa3_only = false - - #default WiFi SSID - chip_default_wifi_ssid = "" - - #default Wifi Password - chip_default_wifi_psk = "" -} - -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd - - # Use default handler to negotiate subscription max interval - chip_config_use_icd_subscription_callbacks = enable_sleepy_device -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - -# default read handler cannot be used without being an IC device (SED) -assert(!chip_config_use_icd_subscription_callbacks || enable_sleepy_device) - -# Sanity check -assert(!(chip_enable_wifi && chip_enable_openthread)) -assert(!(use_rs911x && chip_enable_openthread)) -assert(!(use_wf200 && chip_enable_openthread)) -if (chip_enable_wifi) { - assert(use_rs911x || use_wf200) - enable_openthread_cli = false - import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") -} - -# ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) -if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || - silabs_board == "BRD2703A" || silabs_board == "BRD4319A") { - show_qr_code = false - disable_lcd = true -} - -defines = [] - -# WiFi settings -if (chip_enable_wifi) { - if (chip_default_wifi_ssid != "") { - defines += [ - "CHIP_ONNETWORK_PAIRING=1", - "CHIP_WIFI_SSID=\"${chip_default_wifi_ssid}\"", - ] - } - if (chip_default_wifi_psk != "") { - assert(chip_default_wifi_ssid != "", - "ssid can't be null if psk is provided") - defines += [ "CHIP_WIFI_PSK=\"${chip_default_wifi_psk}\"" ] - } - wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" - efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] - if (lwip_ipv4) { - efr32_lwip_defs += [ - "LWIP_IPV4=1", - - # adds following options to provide - # them to .cpp source files - # flags ported from lwipopts file - # TODO: move lwipopts to one location - "LWIP_ARP=1", - "LWIP_ICMP=1", - "LWIP_IGMP=1", - "LWIP_DHCP=1", - "LWIP_DNS=0", - ] - } else { - efr32_lwip_defs += [ "LWIP_IPV4=0" ] - } - if (lwip_ipv6) { - efr32_lwip_defs += [ "LWIP_IPV6=1" ] - } else { - efr32_lwip_defs += [ "LWIP_IPV6=0" ] - } - - if (use_rs911x) { - wiseconnect_sdk_root = - "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk" - import("${examples_plat_dir}/rs911x/rs911x.gni") - } else { - import("${examples_plat_dir}/wf200/wf200.gni") - } } efr32_sdk("sdk") { @@ -166,43 +57,18 @@ efr32_sdk("sdk") { "${examples_common_plat_dir}", ] - defines += [ - "BOARD_ID=${silabs_board}", - "OTA_PERIODIC_TIMEOUT=${OTA_periodic_query_timeout}", - ] + if (use_wf200) { + # TODO efr32_sdk should not need a header from this location + include_dirs += [ "${examples_plat_dir}/wf200" ] + } + defines = [] if (chip_enable_pw_rpc) { defines += [ "HAL_VCOM_ENABLE=1", "PW_RPC_ENABLED", ] } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - defines += rs911x_defs - include_dirs += rs911x_plat_incs - } else if (use_wf200) { - defines += wf200_defs - include_dirs += wf200_plat_incs - } - - if (use_rs911x_sockets) { - include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ] - defines += rs911x_sock_defs - } else { - # Using LWIP instead of the native TCP/IP stack - defines += efr32_lwip_defs - } - - if (sl_wfx_config_softap) { - defines += [ "SL_WFX_CONFIG_SOFTAP" ] - } - if (sl_wfx_config_scan) { - defines += [ "SL_WFX_CONFIG_SCAN" ] - } - } } efr32_executable("light_switch_app") { @@ -214,31 +80,15 @@ efr32_executable("light_switch_app") { sources = [ "${chip_root}/examples/light-switch-app/silabs/common/BindingHandler.cpp", "${chip_root}/examples/light-switch-app/silabs/common/LightSwitchMgr.cpp", - "${examples_common_plat_dir}/heap_4_silabs.c", - "${examples_plat_dir}/BaseApplication.cpp", - "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/init_efrPlatform.cpp", - "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", "src/ZclCallbacks.cpp", "src/main.cpp", ] - if (use_wstk_leds) { - sources += [ "${examples_plat_dir}/LEDWidget.cpp" ] - } - - if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli || - use_wf200 || use_rs911x) { - sources += [ "${examples_plat_dir}/uart.cpp" ] - } - deps = [ ":sdk", - "${chip_root}/examples/light-switch-app/light-switch-common", - "${chip_root}/examples/providers:device_info_provider", - "${chip_root}/src/lib", - "${chip_root}/src/setup_payload", + "${examples_plat_dir}:efr32-common", + app_data_model, ] if (chip_build_libshell) { @@ -247,87 +97,8 @@ efr32_executable("light_switch_app") { ] } - # OpenThread Settings - if (chip_enable_openthread) { - deps += [ - "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread-platform", - "${examples_plat_dir}:efr-matter-shell", - ] - } - - # Attestation Credentials - if (chip_build_platform_attestation_credentials_provider) { - deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ] - } - - # Factory Data Provider - if (use_efr32_factory_data_provider) { - deps += [ "${examples_plat_dir}:efr32-factory-data-provider" ] - } - - # Default Read handler for SED - if (chip_config_use_icd_subscription_callbacks) { - deps += [ "${examples_plat_dir}:efr32-ICD-subscription-callback" ] - } - - if (chip_enable_ota_requestor) { - defines += [ "EFR32_OTA_ENABLED" ] - sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] - } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - sources += rs911x_src_plat - - # All the stuff from wiseconnect - sources += rs911x_src_sapi - - # Apparently - the rsi library needs this (though we may not use use it) - sources += rs911x_src_sock - include_dirs += rs911x_inc_plat - - if (use_rs911x_sockets) { - # - # Using native sockets inside RS911x - # - include_dirs += rs911x_sock_inc - } else { - # - # We use LWIP - not built-in sockets - # - sources += rs911x_src_lwip - } - } else if (use_wf200) { - sources += wf200_plat_src - include_dirs += wf200_plat_incs - } - - if (chip_enable_wifi_ipv4) { - defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] - } - - if (rs91x_wpa3_only) { - # TODO: Change this macro once WF200 support is provided - defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ] - } - } - if (!disable_lcd) { - sources += [ - "${examples_plat_dir}/display/demo-ui.c", - "${examples_plat_dir}/display/lcd.cpp", - ] - include_dirs += [ "${examples_plat_dir}/display" ] - defines += [ - "DISPLAY_ENABLED", - "IS_DEMO_SWITCH=1", - ] - if (show_qr_code) { - defines += [ "QR_CODE_ENABLED" ] - deps += [ "${chip_root}/examples/common/QRCode" ] - } + defines += [ "IS_DEMO_SWITCH=1" ] } if (chip_enable_pw_rpc) { @@ -367,11 +138,6 @@ efr32_executable("light_switch_app") { ] } - if (enable_heap_monitoring) { - sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] - defines += [ "HEAP_MONITORING" ] - } - ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld" inputs = [ ldscript ] diff --git a/examples/light-switch-app/silabs/efr32/args.gni b/examples/light-switch-app/silabs/efr32/args.gni index c7b087a4ee4f49..5ca79b0919f47b 100644 --- a/examples/light-switch-app/silabs/efr32/args.gni +++ b/examples/light-switch-app/silabs/efr32/args.gni @@ -18,6 +18,7 @@ import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") +app_data_model = "${chip_root}/examples/light-switch-app/light-switch-common" chip_enable_ota_requestor = true chip_enable_openthread = true openthread_external_platform = diff --git a/examples/light-switch-app/silabs/efr32/build_for_wifi_args.gni b/examples/light-switch-app/silabs/efr32/build_for_wifi_args.gni index 86d8a19bbc36ce..7069bd4823a499 100644 --- a/examples/light-switch-app/silabs/efr32/build_for_wifi_args.gni +++ b/examples/light-switch-app/silabs/efr32/build_for_wifi_args.gni @@ -19,3 +19,4 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true +app_data_model = "${chip_root}/examples/light-switch-app/light-switch-common" diff --git a/examples/light-switch-app/silabs/efr32/src/AppTask.cpp b/examples/light-switch-app/silabs/efr32/src/AppTask.cpp index 3e817e05901e84..4f2aca11f0712b 100644 --- a/examples/light-switch-app/silabs/efr32/src/AppTask.cpp +++ b/examples/light-switch-app/silabs/efr32/src/AppTask.cpp @@ -40,8 +40,6 @@ #endif // QR_CODE_ENABLED #endif // DISPLAY_ENABLED -#include -#include #include #include #include diff --git a/examples/light-switch-app/telink/src/AppTask.cpp b/examples/light-switch-app/telink/src/AppTask.cpp index e3fc414277bf22..9cf419a884e5c5 100644 --- a/examples/light-switch-app/telink/src/AppTask.cpp +++ b/examples/light-switch-app/telink/src/AppTask.cpp @@ -26,8 +26,6 @@ #include "ThreadUtil.h" #include -#include -#include #include #include #include diff --git a/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp b/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp index abc4968054bb76..98c148f505ed31 100644 --- a/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp +++ b/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp @@ -33,8 +33,8 @@ #include "Globals.h" #include "LEDWidget.h" -#include #include +#include #include #include #include @@ -97,7 +97,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & if (clusterId == app::Clusters::OnOff::Id) { - if (attributeId != ZCL_ON_OFF_ATTRIBUTE_ID) + if (attributeId != app::Clusters::OnOff::Attributes::OnOff::Id) { ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; @@ -107,7 +107,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & } else if (clusterId == app::Clusters::LevelControl::Id) { - if (attributeId != ZCL_CURRENT_LEVEL_ATTRIBUTE_ID) + if (attributeId != app::Clusters::LevelControl::Attributes::CurrentLevel::Id) { ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; @@ -123,38 +123,37 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & } else if (clusterId == app::Clusters::ColorControl::Id) { + using namespace app::Clusters::ColorControl::Attributes; + uint8_t hue, saturation; - if ((attributeId != ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID) && - (attributeId != ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID)) + if ((attributeId != CurrentHue::Id) && (attributeId != CurrentSaturation::Id)) { ChipLogProgress(Zcl, "Unknown attribute ID: %" PRIx32, attributeId); return; } - if (attributeId == ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID) + if (attributeId == CurrentHue::Id) { hue = *value; - emberAfReadServerAttribute(endpointId, app::Clusters::ColorControl::Id, - ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, &saturation, sizeof(uint8_t)); + CurrentSaturation::Get(endpointId, &saturation); } - if (attributeId == ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID) + if (attributeId == CurrentSaturation::Id) { saturation = *value; - emberAfReadServerAttribute(endpointId, app::Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, - &hue, sizeof(uint8_t)); + CurrentHue::Get(endpointId, &hue); } ChipLogProgress(Zcl, "New hue: %d, New saturation: %d ", hue, saturation); } else if (clusterId == app::Clusters::Identify::Id) { - if (attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID) + if (attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id) { if (cb != nullptr) { cb->PostAttributeChangeCallback(endpointId, clusterId, attributeId, type, size, value); } - ChipLogProgress(Zcl, "ZCL_IDENTIFY_TIME_ATTRIBUTE_ID value: %u ", *value); + ChipLogProgress(Zcl, "IdentifyTime value: %u ", *value); } } else diff --git a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp index d2f99168e97515..4ae9c49f1c88e6 100644 --- a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp +++ b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp @@ -25,7 +25,7 @@ #include "DeviceCallbacks.h" #include "CHIPDeviceManager.h" -#include +#include #include #include #include @@ -147,7 +147,7 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState) void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id, ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId)); VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId)); diff --git a/examples/lighting-app/beken/main/DeviceCallbacks.cpp b/examples/lighting-app/beken/main/DeviceCallbacks.cpp index 52da67d1253ecf..e2dc0d4e0e32ad 100644 --- a/examples/lighting-app/beken/main/DeviceCallbacks.cpp +++ b/examples/lighting-app/beken/main/DeviceCallbacks.cpp @@ -27,7 +27,6 @@ #include -#include #include #include #include @@ -72,8 +71,8 @@ void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, Clus void AppDeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, - ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); + VerifyOrExit(attributeId == app::Clusters::OnOff + : Attributes::OnOff::Id, ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -98,7 +97,7 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState) void AppDeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id, ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId)); VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId)); diff --git a/examples/lighting-app/bouffalolab/common/AppTask.cpp b/examples/lighting-app/bouffalolab/common/AppTask.cpp index 49c0e0f3443071..90fdc87299082a 100644 --- a/examples/lighting-app/bouffalolab/common/AppTask.cpp +++ b/examples/lighting-app/bouffalolab/common/AppTask.cpp @@ -20,8 +20,6 @@ #include #include -#include -#include #include #include #include @@ -340,46 +338,48 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t arg) void AppTask::LightingUpdate(app_event_t event) { - uint8_t v, onoff, hue, sat; + uint8_t hue, sat; + bool onoff; + DataModel::Nullable v; EndpointId endpoint = GetAppTask().GetEndpointId(); do { - if (EMBER_ZCL_STATUS_SUCCESS != - emberAfReadAttribute(endpoint, Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, &onoff, sizeof(onoff))) + if (EMBER_ZCL_STATUS_SUCCESS != Clusters::OnOff::Attributes::OnOff::Get(endpoint, &onoff)) { break; } - if (EMBER_ZCL_STATUS_SUCCESS != - emberAfReadAttribute(endpoint, Clusters::LevelControl::Id, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, &v, sizeof(v))) + if (EMBER_ZCL_STATUS_SUCCESS != Clusters::LevelControl::Attributes::CurrentLevel::Get(endpoint, v)) { break; } - if (EMBER_ZCL_STATUS_SUCCESS != - emberAfReadAttribute(endpoint, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, &hue, sizeof(v))) + if (EMBER_ZCL_STATUS_SUCCESS != Clusters::ColorControl::Attributes::CurrentHue::Get(endpoint, &hue)) { break; } - if (EMBER_ZCL_STATUS_SUCCESS != - emberAfReadAttribute(endpoint, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, &sat, - sizeof(v))) + if (EMBER_ZCL_STATUS_SUCCESS != Clusters::ColorControl::Attributes::CurrentSaturation::Get(endpoint, &sat)) { break; } - if (0 == onoff) + if (!onoff) { sLightLED.SetLevel(0); } else { + if (v.IsNull()) + { + // Just pick something. + v.SetNonNull(254); + } #if defined(BL706_NIGHT_LIGHT) || defined(BL602_NIGHT_LIGHT) - sLightLED.SetColor(v, hue, sat); + sLightLED.SetColor(v.Value(), hue, sat); #else - sLightLED.SetLevel(v); + sLightLED.SetLevel(v.Value()); #endif } @@ -392,36 +392,31 @@ void AppTask::LightingSetOnoff(uint8_t bonoff) EndpointId endpoint = GetAppTask().GetEndpointId(); // write the new on/off value - emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + Clusters::OnOff::Attributes::OnOff::Set(endpoint, newValue); newValue = 254; - emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, (uint8_t *) &newValue, - ZCL_INT8U_ATTRIBUTE_TYPE); + Clusters::LevelControl::Attributes::CurrentLevel::Set(endpoint, newValue); } void AppTask::LightingSetStatus(app_event_t status) { - uint8_t onoff = 1, level, hue, sat; + uint8_t level, hue, sat; + bool onoff = true; EndpointId endpoint = GetAppTask().GetEndpointId(); static bool isProvisioned = false; if (APP_EVENT_SYS_LIGHT_TOGGLE == status) { - emberAfReadAttribute(endpoint, Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &onoff, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); - onoff = 1 - onoff; + Clusters::OnOff::Attributes::OnOff::Get(endpoint, &onoff); + onoff = !onoff; } else if (APP_EVENT_SYS_BLE_ADV == status) { hue = 35; - emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID, (uint8_t *) &hue, - ZCL_INT8U_ATTRIBUTE_TYPE); + Clusters::ColorControl::Attributes::CurrentHue::Set(endpoint, hue); sat = 254; - emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, - (uint8_t *) &sat, ZCL_INT8U_ATTRIBUTE_TYPE); + Clusters::ColorControl::Attributes::CurrentSaturation::Set(endpoint, sat); level = 254; - emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, (uint8_t *) &level, - ZCL_INT8U_ATTRIBUTE_TYPE); + Clusters::LevelControl::Attributes::CurrentLevel::Set(endpoint, level); isProvisioned = false; } @@ -433,14 +428,12 @@ void AppTask::LightingSetStatus(app_event_t status) } isProvisioned = true; sat = 0; - emberAfWriteAttribute(endpoint, Clusters::ColorControl::Id, ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID, - (uint8_t *) &sat, ZCL_INT8U_ATTRIBUTE_TYPE); + Clusters::ColorControl::Attributes::CurrentSaturation::Set(endpoint, sat); level = 254; - emberAfWriteAttribute(endpoint, Clusters::LevelControl::Id, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, (uint8_t *) &level, - ZCL_INT8U_ATTRIBUTE_TYPE); + Clusters::LevelControl::Attributes::CurrentLevel::Set(endpoint, level); } - emberAfWriteAttribute(endpoint, Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &onoff, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + Clusters::OnOff::Attributes::OnOff::Set(endpoint, onoff); } bool AppTask::StartTimer(void) diff --git a/examples/lighting-app/esp32/main/AppTask.cpp b/examples/lighting-app/esp32/main/AppTask.cpp index 434d98396efc64..91f91340e37bca 100644 --- a/examples/lighting-app/esp32/main/AppTask.cpp +++ b/examples/lighting-app/esp32/main/AppTask.cpp @@ -20,8 +20,6 @@ #include "esp_log.h" #include "freertos/FreeRTOS.h" -#include -#include #include #define APP_TASK_NAME "APP" diff --git a/examples/lighting-app/genio/src/AppTask.cpp b/examples/lighting-app/genio/src/AppTask.cpp index 3542e1adca1381..6a121673a002a6 100644 --- a/examples/lighting-app/genio/src/AppTask.cpp +++ b/examples/lighting-app/genio/src/AppTask.cpp @@ -25,8 +25,6 @@ #include "qrcodegen.h" -#include -#include #include #include #include diff --git a/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp b/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp index f8719aa64850ec..fbb88faa5ef00c 100644 --- a/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp +++ b/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp @@ -19,8 +19,6 @@ #include "LightingManager.h" #include -#include -#include #include #include #include diff --git a/examples/lighting-app/infineon/psoc6/src/AppTask.cpp b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp index 6bbc62708117cf..bcbb79461dd4a2 100644 --- a/examples/lighting-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp @@ -22,8 +22,8 @@ #include "AppEvent.h" #include "ButtonHandler.h" #include "LEDWidget.h" -#include -#include +#include +#include #include #include #include @@ -554,8 +554,7 @@ void AppTask::UpdateClusterState(intptr_t context) uint8_t newValue = LightMgr().IsLightOn(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue); if (status != EMBER_ZCL_STATUS_SUCCESS) { P6_LOG("ERR: updating on/off %x", status); diff --git a/examples/lighting-app/mbed/main/AppTask.cpp b/examples/lighting-app/mbed/main/AppTask.cpp index 3cdf03a03edcec..fdbe8ea0cce291 100644 --- a/examples/lighting-app/mbed/main/AppTask.cpp +++ b/examples/lighting-app/mbed/main/AppTask.cpp @@ -33,8 +33,7 @@ #include "events/EventQueue.h" // ZAP -- ZCL Advanced Platform -#include -#include +#include #include #include @@ -463,8 +462,7 @@ void AppTask::UpdateClusterState() uint8_t onoff = LightingMgr().IsTurnedOn(); // write the new on/off value - EmberAfStatus status = - emberAfWriteServerAttribute(1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, &onoff, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = app::Clusters::OnOff::Attributes::OnOff::Set(1, onoff); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "Updating on/off cluster failed: %x", status); @@ -472,8 +470,7 @@ void AppTask::UpdateClusterState() uint8_t level = LightingMgr().GetLevel(); - status = emberAfWriteServerAttribute(1, app::Clusters::LevelControl::Id, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, &level, - ZCL_INT8U_ATTRIBUTE_TYPE); + status = app::Clusters::LevelControl::Attributes::CurrentLevel::Set(1, level); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp index 52e7c3100761f7..8948ae1d3b3d33 100644 --- a/examples/lighting-app/nrfconnect/main/AppTask.cpp +++ b/examples/lighting-app/nrfconnect/main/AppTask.cpp @@ -24,8 +24,6 @@ #include "PWMDevice.h" #include -#include -#include #include #include #include @@ -158,7 +156,13 @@ CHIP_ERROR AppTask::Init() return err; } +#if CONFIG_CHIP_THREAD_SSED + err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SynchronizedSleepyEndDevice); +#elif CONFIG_OPENTHREAD_MTD_SED + err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice); +#else err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router); +#endif if (err != CHIP_NO_ERROR) { diff --git a/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp index 4e45106161348e..18b9896475115b 100644 --- a/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp +++ b/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include #include @@ -922,8 +921,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg) uint8_t newValue = !LightingMgr().IsTurnedOff(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: updating on/off %x", status); @@ -940,7 +938,7 @@ void AppTask::UpdateDeviceStateInternal(intptr_t arg) bool onoffAttrValue = 0; /* get onoff attribute value */ - (void) emberAfReadAttribute(1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &onoffAttrValue, 1); + (void) app::Clusters::OnOff::Attributes::OnOff::Get(1, &onoffAttrValue); /* set the device state */ sLightLED.Set(onoffAttrValue); diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp index b2878cfd371ea9..216409c6570565 100644 --- a/examples/lighting-app/qpg/src/AppTask.cpp +++ b/examples/lighting-app/qpg/src/AppTask.cpp @@ -32,8 +32,6 @@ #include -#include -#include #include #include #include diff --git a/examples/lighting-app/silabs/SiWx917/BUILD.gn b/examples/lighting-app/silabs/SiWx917/BUILD.gn index 7fc114a1f45b26..d98d0a80b23388 100644 --- a/examples/lighting-app/silabs/SiWx917/BUILD.gn +++ b/examples/lighting-app/silabs/SiWx917/BUILD.gn @@ -49,15 +49,9 @@ declare_args() { OTA_periodic_query_timeout = 86400 # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false sl_wfx_config_softap = false sl_wfx_config_scan = true - # Disable LCD on supported devices - disable_lcd = true - # Argument to Disable IPv4 for wifi(rs911) chip_enable_wifi_ipv4 = false @@ -71,14 +65,6 @@ declare_args() { psk = "" } -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - # Sanity check assert(!(chip_enable_wifi && chip_enable_openthread)) assert(!(use_rs911x && chip_enable_openthread)) diff --git a/examples/lighting-app/silabs/SiWx917/src/AppTask.cpp b/examples/lighting-app/silabs/SiWx917/src/AppTask.cpp index 884bbce31b5eeb..6133df35c33610 100644 --- a/examples/lighting-app/silabs/SiWx917/src/AppTask.cpp +++ b/examples/lighting-app/silabs/SiWx917/src/AppTask.cpp @@ -21,8 +21,6 @@ #include "AppConfig.h" #include "AppEvent.h" -#include -#include #include #include #include diff --git a/examples/lighting-app/silabs/efr32/BUILD.gn b/examples/lighting-app/silabs/efr32/BUILD.gn index dcda82dc8d9dea..5a0c94254b0d37 100644 --- a/examples/lighting-app/silabs/efr32/BUILD.gn +++ b/examples/lighting-app/silabs/efr32/BUILD.gn @@ -35,115 +35,11 @@ efr32_project_dir = "${chip_root}/examples/lighting-app/silabs/efr32" examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" +import("${examples_plat_dir}/args.gni") + declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false - - # Monitor & log memory usage at runtime. - enable_heap_monitoring = false - - # Enable Sleepy end device - enable_sleepy_device = false - - # OTA timeout in seconds - OTA_periodic_query_timeout = 86400 - - # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false - sl_wfx_config_softap = false - sl_wfx_config_scan = true - - # Disable LCD on supported devices - disable_lcd = false - - # Argument to Disable IPv4 for wifi(rs911) - chip_enable_wifi_ipv4 = false - - # Argument to force enable WPA3 security on rs91x - rs91x_wpa3_only = false - - #default WiFi SSID - chip_default_wifi_ssid = "" - - #default Wifi Password - chip_default_wifi_psk = "" -} - -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - -# Sanity check -assert(!(chip_enable_wifi && chip_enable_openthread)) -assert(!(use_rs911x && chip_enable_openthread)) -assert(!(use_wf200 && chip_enable_openthread)) -if (chip_enable_wifi) { - assert(use_rs911x || use_wf200) - enable_openthread_cli = false - import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") -} - -# ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) -if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || - silabs_board == "BRD2703A" || silabs_board == "BRD4319A" || - silabs_board == "BRD2704A") { - show_qr_code = false - disable_lcd = true -} - -defines = [] - -# WiFi settings -if (chip_enable_wifi) { - if (chip_default_wifi_ssid != "") { - defines += [ - "CHIP_ONNETWORK_PAIRING=1", - "CHIP_WIFI_SSID=\"${chip_default_wifi_ssid}\"", - ] - } - if (chip_default_wifi_psk != "") { - assert(chip_default_wifi_ssid != "", - "ssid can't be null if psk is provided") - defines += [ "CHIP_WIFI_PSK=\"${chip_default_wifi_psk}\"" ] - } - wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" - efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] - if (lwip_ipv4) { - efr32_lwip_defs += [ - "LWIP_IPV4=1", - - # adds following options to provide - # them to .cpp source files - # flags ported from lwipopts file - # TODO: move lwipopts to one location - "LWIP_ARP=1", - "LWIP_ICMP=1", - "LWIP_IGMP=1", - "LWIP_DHCP=1", - "LWIP_DNS=0", - ] - } else { - efr32_lwip_defs += [ "LWIP_IPV4=0" ] - } - if (lwip_ipv6) { - efr32_lwip_defs += [ "LWIP_IPV6=1" ] - } else { - efr32_lwip_defs += [ "LWIP_IPV6=0" ] - } - - if (use_rs911x) { - wiseconnect_sdk_root = - "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk" - import("${examples_plat_dir}/rs911x/rs911x.gni") - } else { - import("${examples_plat_dir}/wf200/wf200.gni") - } } efr32_sdk("sdk") { @@ -160,47 +56,18 @@ efr32_sdk("sdk") { "${examples_common_plat_dir}", ] - defines += [ - "BOARD_ID=${silabs_board}", - "OTA_PERIODIC_TIMEOUT=${OTA_periodic_query_timeout}", - ] - - if (enable_heap_monitoring) { - defines += [ "HEAP_MONITORING" ] + if (use_wf200) { + # TODO efr32_sdk should not need a header from this location + include_dirs += [ "${examples_plat_dir}/wf200" ] } + defines = [] if (chip_enable_pw_rpc) { defines += [ "HAL_VCOM_ENABLE=1", "PW_RPC_ENABLED", ] } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - defines += rs911x_defs - include_dirs += rs911x_plat_incs - } else if (use_wf200) { - defines += wf200_defs - include_dirs += wf200_plat_incs - } - - if (use_rs911x_sockets) { - include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ] - defines += rs911x_sock_defs - } else { - # Using LWIP instead of the native TCP/IP stack - defines += efr32_lwip_defs - } - - if (sl_wfx_config_softap) { - defines += [ "SL_WFX_CONFIG_SOFTAP" ] - } - if (sl_wfx_config_scan) { - defines += [ "SL_WFX_CONFIG_SCAN" ] - } - } } efr32_executable("lighting_app") { @@ -214,102 +81,20 @@ efr32_executable("lighting_app") { } sources = [ - "${examples_common_plat_dir}/heap_4_silabs.c", - "${examples_plat_dir}/BaseApplication.cpp", - "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/init_efrPlatform.cpp", - "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", "src/LightingManager.cpp", "src/ZclCallbacks.cpp", "src/main.cpp", ] - if (use_wstk_leds) { - sources += [ "${examples_plat_dir}/LEDWidget.cpp" ] - } - - if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli || - use_wf200 || use_rs911x) { - sources += [ "${examples_plat_dir}/uart.cpp" ] - } - deps = [ ":sdk", - "${chip_root}/examples/lighting-app/lighting-common", - "${chip_root}/examples/providers:device_info_provider", - "${chip_root}/src/lib", - "${chip_root}/src/setup_payload", + "${examples_plat_dir}:efr32-common", + app_data_model, ] - # OpenThread Settings - if (chip_enable_openthread) { - deps += [ - "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread-platform", - "${examples_plat_dir}:efr-matter-shell", - ] - } - - if (chip_enable_ota_requestor) { - defines += [ "EFR32_OTA_ENABLED" ] - sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] - } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - sources += rs911x_src_plat - - # All the stuff from wiseconnect - sources += rs911x_src_sapi - - # Apparently - the rsi library needs this (though we may not use use it) - sources += rs911x_src_sock - include_dirs += rs911x_inc_plat - - if (use_rs911x_sockets) { - # - # Using native sockets inside RS911x - # - include_dirs += rs911x_sock_inc - } else { - # - # We use LWIP - not built-in sockets - # - sources += rs911x_src_lwip - } - } else if (use_wf200) { - sources += wf200_plat_src - include_dirs += wf200_plat_incs - } - - if (chip_enable_wifi_ipv4) { - defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] - } - - if (rs91x_wpa3_only) { - # TODO: Change this macro once WF200 support is provided - defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ] - } - } - if (!disable_lcd) { - sources += [ - "${examples_plat_dir}/display/demo-ui.c", - "${examples_plat_dir}/display/lcd.cpp", - ] - - include_dirs += [ "${examples_plat_dir}/display" ] - defines += [ - "DISPLAY_ENABLED", - "IS_DEMO_LIGHT=1", - ] - if (show_qr_code) { - defines += [ "QR_CODE_ENABLED" ] - - deps += [ "${chip_root}/examples/common/QRCode" ] - } + defines += [ "IS_DEMO_LIGHT=1" ] } if (chip_enable_pw_rpc) { @@ -357,11 +142,6 @@ efr32_executable("lighting_app") { ] } - if (enable_heap_monitoring) { - sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] - defines += [ "HEAP_MONITORING" ] - } - ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld" inputs = [ ldscript ] @@ -383,16 +163,6 @@ efr32_executable("lighting_app") { ] } - # Attestation Credentials - if (chip_build_platform_attestation_credentials_provider) { - deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ] - } - - # Factory Data Provider - if (use_efr32_factory_data_provider) { - deps += [ "${examples_plat_dir}:efr32-factory-data-provider" ] - } - output_dir = root_out_dir } diff --git a/examples/lighting-app/silabs/efr32/args.gni b/examples/lighting-app/silabs/efr32/args.gni index 6b0d9a8e2eb8a6..75b21eaef170aa 100644 --- a/examples/lighting-app/silabs/efr32/args.gni +++ b/examples/lighting-app/silabs/efr32/args.gni @@ -18,6 +18,7 @@ import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") +app_data_model = "${chip_root}/examples/lighting-app/lighting-common" chip_enable_ota_requestor = true chip_enable_openthread = true diff --git a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni b/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni index 86d8a19bbc36ce..a1e4b995d96b1a 100644 --- a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni +++ b/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni @@ -19,3 +19,4 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true +app_data_model = "${chip_root}/examples/lighting-app/lighting-common" diff --git a/examples/lighting-app/silabs/efr32/src/AppTask.cpp b/examples/lighting-app/silabs/efr32/src/AppTask.cpp index 458ae51d797865..1169e09619eb32 100755 --- a/examples/lighting-app/silabs/efr32/src/AppTask.cpp +++ b/examples/lighting-app/silabs/efr32/src/AppTask.cpp @@ -26,8 +26,6 @@ #include "sl_simple_led_instances.h" #endif // ENABLE_WSTK_LEDS -#include -#include #include #include #include diff --git a/examples/lighting-app/silabs/efr32/with_pw_rpc.gni b/examples/lighting-app/silabs/efr32/with_pw_rpc.gni index 40a8bb79d84b6a..3ee366c51ad498 100644 --- a/examples/lighting-app/silabs/efr32/with_pw_rpc.gni +++ b/examples/lighting-app/silabs/efr32/with_pw_rpc.gni @@ -21,6 +21,7 @@ import("${chip_root}/examples/platform/silabs/efr32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") +app_data_model = "${chip_root}/examples/lighting-app/lighting-common" chip_enable_pw_rpc = true chip_enable_openthread = true chip_build_pw_trace_lib = true diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp index 3578f005f5434a..41a3cfcc57f373 100644 --- a/examples/lighting-app/telink/src/AppTask.cpp +++ b/examples/lighting-app/telink/src/AppTask.cpp @@ -26,8 +26,6 @@ #include "ThreadUtil.h" #include -#include -#include #include #include #include diff --git a/examples/lock-app/cc32xx/main/AppTask.cpp b/examples/lock-app/cc32xx/main/AppTask.cpp index cff1e73bf8d0cf..a556fee7514f3d 100644 --- a/examples/lock-app/cc32xx/main/AppTask.cpp +++ b/examples/lock-app/cc32xx/main/AppTask.cpp @@ -20,7 +20,7 @@ #include "AppTask.h" #include "AppConfig.h" #include "AppEvent.h" -#include +#include #include #include #include @@ -263,7 +263,7 @@ void AppTask::ActionCompleted(BoltLockManager::Action_t aAction) LED_setOff(gLedRedHandle); state = 0; } - emberAfWriteAttribute(1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, &state, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + app::Clusters::OnOff::Attributes::OnOff::Set(1, state); } void AppTask::DispatchEvent(AppEvent * aEvent) diff --git a/examples/lock-app/esp32/main/AppTask.cpp b/examples/lock-app/esp32/main/AppTask.cpp index 9014982eba5975..a9fc2c35cdbd86 100644 --- a/examples/lock-app/esp32/main/AppTask.cpp +++ b/examples/lock-app/esp32/main/AppTask.cpp @@ -19,17 +19,15 @@ #include "Button.h" #include "LEDWidget.h" #include "esp_log.h" -#include -#include -#include -#include -//#include +#include #include #include #include #include #include #include +#include +#include #include #include @@ -464,8 +462,7 @@ void AppTask::UpdateClusterState(chip::System::Layer *, void * context) uint8_t newValue = !BoltLockMgr().IsUnlocked(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, chip::app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = chip::app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue); if (status != EMBER_ZCL_STATUS_SUCCESS) { ESP_LOGI(TAG, "ERR: updating on/off %x", status); diff --git a/examples/lock-app/esp32/main/DeviceCallbacks.cpp b/examples/lock-app/esp32/main/DeviceCallbacks.cpp index 576bbb7b8edf4f..ba738c7acab4d1 100644 --- a/examples/lock-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/lock-app/esp32/main/DeviceCallbacks.cpp @@ -27,7 +27,6 @@ #include #include -#include #include static const char * TAG = "lock-devicecallbacks"; diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp index 929013fbb717b3..2b1db547997bc9 100644 --- a/examples/lock-app/genio/src/AppTask.cpp +++ b/examples/lock-app/genio/src/AppTask.cpp @@ -24,8 +24,6 @@ #include "qrcodegen.h" #include -#include -#include #include #include #include diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp index 71567f3486aa22..2120a10ace0393 100644 --- a/examples/lock-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp @@ -22,8 +22,6 @@ #include "ButtonHandler.h" #include "LEDWidget.h" #include -#include -#include #include #include diff --git a/examples/lock-app/mbed/main/AppTask.cpp b/examples/lock-app/mbed/main/AppTask.cpp index 8e2b98dac5b3f2..4e1d0c70e943cc 100644 --- a/examples/lock-app/mbed/main/AppTask.cpp +++ b/examples/lock-app/mbed/main/AppTask.cpp @@ -33,8 +33,7 @@ #include "events/EventQueue.h" // ZAP -- ZCL Advanced Platform -#include -#include +#include #include #include @@ -462,8 +461,7 @@ void AppTask::UpdateClusterState() uint8_t newValue = !BoltLockMgr().IsUnlocked(); // write the new on/off value - EmberAfStatus status = - emberAfWriteAttribute(1, app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ZCL update failed: %lx", status); diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp index 20a4beeeb61de8..fc6c6bece1faf2 100644 --- a/examples/lock-app/nrfconnect/main/AppTask.cpp +++ b/examples/lock-app/nrfconnect/main/AppTask.cpp @@ -23,8 +23,6 @@ #include "LEDWidget.h" #include -#include -#include #include #include #include diff --git a/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp index deba6a5c63772d..5971c4ea7c28e0 100644 --- a/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp +++ b/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include #include @@ -763,8 +762,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg) uint8_t newValue = !BoltLockMgr().IsUnlocked(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, chip::app::Clusters::OnOff::Id, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = chip::app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: updating on/off %x", status); diff --git a/examples/lock-app/qpg/src/AppTask.cpp b/examples/lock-app/qpg/src/AppTask.cpp index 09aca7a146589d..b5c5d73fb723c1 100644 --- a/examples/lock-app/qpg/src/AppTask.cpp +++ b/examples/lock-app/qpg/src/AppTask.cpp @@ -25,8 +25,6 @@ #include -#include -#include #include #include #include diff --git a/examples/lock-app/silabs/SiWx917/BUILD.gn b/examples/lock-app/silabs/SiWx917/BUILD.gn index 2fc51146a94008..c2cbe6e06ebb59 100644 --- a/examples/lock-app/silabs/SiWx917/BUILD.gn +++ b/examples/lock-app/silabs/SiWx917/BUILD.gn @@ -49,15 +49,9 @@ declare_args() { OTA_periodic_query_timeout = 86400 # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false sl_wfx_config_softap = false sl_wfx_config_scan = true - # Disable LCD on supported devices - disable_lcd = true - # Argument to Disable IPv4 for wifi(rs911) chip_enable_wifi_ipv4 = false @@ -71,14 +65,6 @@ declare_args() { chip_default_wifi_psk = "" } -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - # Sanity check assert(!(chip_enable_wifi && chip_enable_openthread)) assert(!(use_rs911x && chip_enable_openthread)) diff --git a/examples/lock-app/silabs/SiWx917/src/AppTask.cpp b/examples/lock-app/silabs/SiWx917/src/AppTask.cpp index 569b0dd4e46515..0582eed798470c 100644 --- a/examples/lock-app/silabs/SiWx917/src/AppTask.cpp +++ b/examples/lock-app/silabs/SiWx917/src/AppTask.cpp @@ -36,8 +36,6 @@ #endif // DISPLAY_ENABLED #include -#include -#include #include #include diff --git a/examples/lock-app/silabs/efr32/BUILD.gn b/examples/lock-app/silabs/efr32/BUILD.gn index f07593e26bdc1f..cbf45096592f8d 100644 --- a/examples/lock-app/silabs/efr32/BUILD.gn +++ b/examples/lock-app/silabs/efr32/BUILD.gn @@ -35,114 +35,11 @@ efr32_project_dir = "${chip_root}/examples/lock-app/silabs/efr32" examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" +import("${examples_plat_dir}/args.gni") + declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false - - # Monitor & log memory usage at runtime. - enable_heap_monitoring = false - - # Enable Sleepy end device - enable_sleepy_device = false - - # OTA timeout in seconds - OTA_periodic_query_timeout = 86400 - - # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false - sl_wfx_config_softap = false - sl_wfx_config_scan = true - - # Disable LCD on supported devices - disable_lcd = false - - # Argument to Disable IPv4 for wifi(rs911) - chip_enable_wifi_ipv4 = false - - # Argument to force enable WPA3 security - rs91x_wpa3_only = false - - #default WiFi SSID - chip_default_wifi_ssid = "" - - #default Wifi Password - chip_default_wifi_psk = "" -} - -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - -# Sanity check -assert(!(chip_enable_wifi && chip_enable_openthread)) -assert(!(use_rs911x && chip_enable_openthread)) -assert(!(use_wf200 && chip_enable_openthread)) -if (chip_enable_wifi) { - assert(use_rs911x || use_wf200) - enable_openthread_cli = false - import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") -} - -# ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) -if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || - silabs_board == "BRD2703A" || silabs_board == "BRD4319A") { - show_qr_code = false - disable_lcd = true -} - -defines = [] - -# WiFi settings -if (chip_enable_wifi) { - if (chip_default_wifi_ssid != "") { - defines += [ - "CHIP_ONNETWORK_PAIRING=1", - "CHIP_WIFI_SSID=\"${chip_default_wifi_ssid}\"", - ] - } - if (chip_default_wifi_psk != "") { - assert(chip_default_wifi_ssid != "", - "ssid can't be null if psk is provided") - defines += [ "CHIP_WIFI_PSK=\"${chip_default_wifi_psk}\"" ] - } - wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" - efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] - if (lwip_ipv4) { - efr32_lwip_defs += [ - "LWIP_IPV4=1", - - # adds following options to provide - # them to .cpp source files - # flags ported from lwipopts file - # TODO: move lwipopts to one location - "LWIP_ARP=1", - "LWIP_ICMP=1", - "LWIP_IGMP=1", - "LWIP_DHCP=1", - "LWIP_DNS=0", - ] - } else { - efr32_lwip_defs += [ "LWIP_IPV4=0" ] - } - if (lwip_ipv6) { - efr32_lwip_defs += [ "LWIP_IPV6=1" ] - } else { - efr32_lwip_defs += [ "LWIP_IPV6=0" ] - } - - if (use_rs911x) { - wiseconnect_sdk_root = - "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk" - import("${examples_plat_dir}/rs911x/rs911x.gni") - } else { - import("${examples_plat_dir}/wf200/wf200.gni") - } } efr32_sdk("sdk") { @@ -159,42 +56,18 @@ efr32_sdk("sdk") { "${examples_common_plat_dir}", ] - defines += [ - "BOARD_ID=${silabs_board}", - "OTA_PERIODIC_TIMEOUT=${OTA_periodic_query_timeout}", - ] + if (use_wf200) { + # TODO efr32_sdk should not need a header from this location + include_dirs += [ "${examples_plat_dir}/wf200" ] + } + defines = [] if (chip_enable_pw_rpc) { defines += [ "HAL_VCOM_ENABLE=1", "PW_RPC_ENABLED", ] } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - defines += rs911x_defs - include_dirs += rs911x_plat_incs - } else if (use_wf200) { - defines += wf200_defs - include_dirs += wf200_plat_incs - } - - if (use_rs911x_sockets) { - include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ] - defines += rs911x_sock_defs - } else { - # Using LWIP instead of the native TCP/IP stack - defines += efr32_lwip_defs - } - if (sl_wfx_config_softap) { - defines += [ "SL_WFX_CONFIG_SOFTAP" ] - } - if (sl_wfx_config_scan) { - defines += [ "SL_WFX_CONFIG_SCAN" ] - } - } } efr32_executable("lock_app") { @@ -204,107 +77,20 @@ efr32_executable("lock_app") { defines = [] sources = [ - "${examples_common_plat_dir}/heap_4_silabs.c", - "${examples_plat_dir}/BaseApplication.cpp", - "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/init_efrPlatform.cpp", - "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", "src/LockManager.cpp", "src/ZclCallbacks.cpp", "src/main.cpp", ] - if (use_wstk_leds) { - sources += [ "${examples_plat_dir}/LEDWidget.cpp" ] - } - - if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli || - use_wf200 || use_rs911x) { - sources += [ "${examples_plat_dir}/uart.cpp" ] - } - - if (chip_build_libshell) { - sources += [ "src/EventHandlerLibShell.cpp" ] - } - deps = [ ":sdk", - "${chip_root}/examples/lock-app/lock-common", - "${chip_root}/examples/providers:device_info_provider", - "${chip_root}/src/lib", - "${chip_root}/src/setup_payload", - "${chip_root}/third_party/openthread/platforms:libopenthread-platform", - "${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils", - "${examples_plat_dir}:efr-matter-shell", + "${examples_plat_dir}:efr32-common", + app_data_model, ] - # OpenThread Settings - if (chip_enable_openthread) { - deps += [ - "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread-platform", - "${examples_plat_dir}:efr-matter-shell", - ] - } - - if (chip_enable_ota_requestor) { - defines += [ "EFR32_OTA_ENABLED" ] - sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] - } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - sources += rs911x_src_plat - - # All the stuff from wiseconnect - sources += rs911x_src_sapi - - # Apparently - the rsi library needs this (though we may not use use it) - sources += rs911x_src_sock - include_dirs += rs911x_inc_plat - - if (use_rs911x_sockets) { - # - # Using native sockets inside RS911x - # - include_dirs += rs911x_sock_inc - } else { - # - # We use LWIP - not built-in sockets - # - sources += rs911x_src_lwip - } - } else if (use_wf200) { - sources += wf200_plat_src - include_dirs += wf200_plat_incs - } - - if (chip_enable_wifi_ipv4) { - defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] - } - - if (rs91x_wpa3_only) { - # TODO: Change this macro once WF200 support is provided - defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ] - } - } - if (!disable_lcd) { - sources += [ - "${examples_plat_dir}/display/demo-ui.c", - "${examples_plat_dir}/display/lcd.cpp", - ] - include_dirs += [ "${examples_plat_dir}/display" ] - defines += [ - "DISPLAY_ENABLED", - "IS_DEMO_LOCK=1", - ] - if (show_qr_code) { - defines += [ "QR_CODE_ENABLED" ] - deps += [ "${chip_root}/examples/common/QRCode" ] - } + defines += [ "IS_DEMO_LOCK=1" ] } if (chip_enable_pw_rpc) { @@ -348,11 +134,6 @@ efr32_executable("lock_app") { ] } - if (enable_heap_monitoring) { - sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] - defines += [ "HEAP_MONITORING" ] - } - ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld" inputs = [ ldscript ] @@ -374,18 +155,9 @@ efr32_executable("lock_app") { ] } - # Attestation Credentials - if (chip_build_platform_attestation_credentials_provider) { - deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ] - } - - # Factory Data Provider - if (use_efr32_factory_data_provider) { - deps += [ "${examples_plat_dir}:efr32-factory-data-provider" ] - } - output_dir = root_out_dir } + group("efr32") { deps = [ ":lock_app" ] } diff --git a/examples/lock-app/silabs/efr32/args.gni b/examples/lock-app/silabs/efr32/args.gni index c7b087a4ee4f49..2795c9453cd48b 100644 --- a/examples/lock-app/silabs/efr32/args.gni +++ b/examples/lock-app/silabs/efr32/args.gni @@ -18,6 +18,7 @@ import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") +app_data_model = "${chip_root}/examples/lock-app/lock-common" chip_enable_ota_requestor = true chip_enable_openthread = true openthread_external_platform = diff --git a/examples/lock-app/silabs/efr32/build_for_wifi_args.gni b/examples/lock-app/silabs/efr32/build_for_wifi_args.gni index 86d8a19bbc36ce..556c097dcf568c 100644 --- a/examples/lock-app/silabs/efr32/build_for_wifi_args.gni +++ b/examples/lock-app/silabs/efr32/build_for_wifi_args.gni @@ -19,3 +19,4 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true +app_data_model = "${chip_root}/examples/lock-app/lock-common" diff --git a/examples/lock-app/silabs/efr32/src/AppTask.cpp b/examples/lock-app/silabs/efr32/src/AppTask.cpp index 142991bbe5be3e..a39cf6a15df18f 100644 --- a/examples/lock-app/silabs/efr32/src/AppTask.cpp +++ b/examples/lock-app/silabs/efr32/src/AppTask.cpp @@ -37,8 +37,6 @@ #endif // DISPLAY_ENABLED #include -#include -#include #include #include diff --git a/examples/lock-app/silabs/efr32/with_pw_rpc.gni b/examples/lock-app/silabs/efr32/with_pw_rpc.gni index faa281a6a4597c..b691609e6bf2d0 100644 --- a/examples/lock-app/silabs/efr32/with_pw_rpc.gni +++ b/examples/lock-app/silabs/efr32/with_pw_rpc.gni @@ -21,6 +21,7 @@ import("${chip_root}/examples/platform/silabs/efr32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") +app_data_model = "${chip_root}/examples/lock-app/lock-common" chip_enable_pw_rpc = true chip_enable_openthread = true chip_openthread_ftd = true diff --git a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp index 8e6b1192b96dd8..0ef956fe939e11 100644 --- a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp +++ b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp @@ -25,7 +25,7 @@ #include "DeviceCallbacks.h" #include "CHIPDeviceManager.h" -#include +#include #include #include #include @@ -139,7 +139,7 @@ void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event void DeviceCallbacks::OnOnOffPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_ON_OFF_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::OnOff::Attributes::OnOff::Id, ChipLogError(DeviceLayer, TAG, "Unhandled Attribute ID: '0x%04x", attributeId)); VerifyOrExit(endpointId == 1 || endpointId == 2, ChipLogError(DeviceLayer, TAG, "Unexpected EndPoint ID: `0x%02x'", endpointId)); @@ -161,7 +161,7 @@ void IdentifyTimerHandler(Layer * systemLayer, void * appState, CHIP_ERROR error void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value) { - VerifyOrExit(attributeId == ZCL_IDENTIFY_TIME_ATTRIBUTE_ID, + VerifyOrExit(attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id, ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId)); VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId)); diff --git a/examples/ota-requestor-app/telink/src/AppTask.cpp b/examples/ota-requestor-app/telink/src/AppTask.cpp index 122071169c45e7..1480a01e591e35 100644 --- a/examples/ota-requestor-app/telink/src/AppTask.cpp +++ b/examples/ota-requestor-app/telink/src/AppTask.cpp @@ -28,8 +28,6 @@ #include "ThreadUtil.h" -#include -#include #include #include diff --git a/examples/platform/beken/common/CommonDeviceCallbacks.cpp b/examples/platform/beken/common/CommonDeviceCallbacks.cpp index 990c381cfe2df6..573f37950c5be5 100644 --- a/examples/platform/beken/common/CommonDeviceCallbacks.cpp +++ b/examples/platform/beken/common/CommonDeviceCallbacks.cpp @@ -17,7 +17,6 @@ */ #include "CommonDeviceCallbacks.h" -#include #include #include #include diff --git a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp index df02cad16443de..be0fbf1255cce6 100644 --- a/examples/platform/esp32/common/CommonDeviceCallbacks.cpp +++ b/examples/platform/esp32/common/CommonDeviceCallbacks.cpp @@ -32,7 +32,6 @@ #include "esp_err.h" #include "esp_heap_caps.h" #include "esp_log.h" -#include #include #include #include diff --git a/examples/platform/silabs/SiWx917/BaseApplication.cpp b/examples/platform/silabs/SiWx917/BaseApplication.cpp index a22eadaa27b16e..081bbfa1055419 100644 --- a/examples/platform/silabs/SiWx917/BaseApplication.cpp +++ b/examples/platform/silabs/SiWx917/BaseApplication.cpp @@ -37,8 +37,6 @@ #endif // DISPLAY_ENABLED #include "SiWx917DeviceDataProvider.h" -#include -#include #include #include #include diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn index 4c62826c7c4a8a..b1c4f9eda57e34 100644 --- a/examples/platform/silabs/efr32/BUILD.gn +++ b/examples/platform/silabs/efr32/BUILD.gn @@ -14,12 +14,60 @@ import("//build_overrides/chip.gni") import("//build_overrides/efr32_sdk.gni") +import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/lib/lib.gni") import("${chip_root}/src/platform/device.gni") import("${efr32_sdk_build_root}/efr32_sdk.gni") +import("${efr32_sdk_build_root}/silabs_board.gni") + +declare_args() { + enable_heap_monitoring = false + + # OTA timeout in seconds + OTA_periodic_query_timeout = 86400 + + # Wifi related stuff - they are overridden by gn -args="use_wf200=true" + sl_wfx_config_softap = false + sl_wfx_config_scan = true + + # Argument to Disable IPv4 for wifi(rs911) + chip_enable_wifi_ipv4 = false + + # Argument to force enable WPA3 security on rs91x + rs91x_wpa3_only = false + + #default WiFi SSID + chip_default_wifi_ssid = "" + + #default Wifi Password + chip_default_wifi_psk = "" +} silabs_common_plat_dir = "${chip_root}/examples/platform/silabs" +import("${silabs_common_plat_dir}/efr32/args.gni") + +# Sanity check +assert(!(chip_enable_wifi && chip_enable_openthread)) +assert(!(use_rs911x && chip_enable_openthread)) +assert(!(use_wf200 && chip_enable_openthread)) + +if (chip_enable_wifi) { + assert(use_rs911x || use_wf200) + enable_openthread_cli = false + import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") + + if (use_rs911x) { + wiseconnect_sdk_root = + "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk" + import("rs911x/rs911x.gni") + } + + if (use_wf200) { + import("wf200/wf200.gni") + } +} + config("chip_examples_project_config") { include_dirs = [ "project_include" ] @@ -118,11 +166,162 @@ config("ICD-subscription-callback-config") { source_set("efr32-ICD-subscription-callback") { sources = [ - "../ICDSubscriptionCallback.cpp", - "../ICDSubscriptionCallback.h", + "${silabs_common_plat_dir}/ICDSubscriptionCallback.cpp", + "${silabs_common_plat_dir}/ICDSubscriptionCallback.h", ] public_deps = [ "${chip_root}/src/app:app" ] public_configs = [ ":ICD-subscription-callback-config" ] } + +config("efr32-common-config") { + defines = [ "OTA_PERIODIC_TIMEOUT=${OTA_periodic_query_timeout}" ] + + if (!disable_lcd) { + include_dirs = [ "display" ] + + defines += [ "DISPLAY_ENABLED" ] + } + + if (show_qr_code) { + defines += [ "QR_CODE_ENABLED" ] + } + + if (chip_enable_ota_requestor) { + defines += [ "EFR32_OTA_ENABLED" ] + } + + if (enable_heap_monitoring) { + defines += [ "HEAP_MONITORING" ] + } +} + +config("silabs-wifi-config") { + defines = [] + include_dirs = [] + + if (chip_default_wifi_ssid != "") { + defines += [ + "CHIP_ONNETWORK_PAIRING=1", + "CHIP_WIFI_SSID=\"${chip_default_wifi_ssid}\"", + ] + } + if (chip_default_wifi_psk != "") { + assert(chip_default_wifi_ssid != "", + "ssid can't be null if psk is provided") + defines += [ "CHIP_WIFI_PSK=\"${chip_default_wifi_psk}\"" ] + } + + if (sl_wfx_config_softap) { + defines += [ "SL_WFX_CONFIG_SOFTAP" ] + } + if (sl_wfx_config_scan) { + defines += [ "SL_WFX_CONFIG_SCAN" ] + } + + if (chip_enable_wifi_ipv4) { + defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] + } + + if (rs91x_wpa3_only) { + # TODO: Change this macro once WF200 support is provided + defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ] + } +} + +source_set("efr32-common") { + deps = [] + public_deps = [] + public_configs = [ ":efr32-common-config" ] + + include_dirs = [ "." ] + + sources = [ + "${silabs_common_plat_dir}/heap_4_silabs.c", + "efr32_utils.cpp", + "init_efrPlatform.cpp", + "matter_config.cpp", + ] + + if (use_base_app) { + sources += [ "BaseApplication.cpp" ] + } + + if (use_wstk_leds) { + sources += [ "LEDWidget.cpp" ] + } + + if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli || + use_wf200 || use_rs911x) { + sources += [ "uart.cpp" ] + } + + if (chip_enable_ota_requestor) { + sources += [ "OTAConfig.cpp" ] + } + + if (!disable_lcd) { + sources += [ + "display/demo-ui.c", + "display/lcd.cpp", + ] + + include_dirs += [ "display" ] + public_deps += [ "${chip_root}/examples/common/QRCode" ] + } + + if (enable_heap_monitoring) { + sources += [ "${silabs_common_plat_dir}/MemMonitoring.cpp" ] + } + + # OpenThread Settings + if (chip_enable_openthread) { + deps += [ + "${chip_root}/third_party/openthread:openthread", + "${chip_root}/third_party/openthread:openthread-platform", + ] + } + + if (chip_enable_wifi) { + if (use_rs911x) { + sources += rs911x_src_plat + + # All the stuff from wiseconnect + sources += rs911x_src_sapi + include_dirs += rs911x_inc_plat + + #add compilation flags for rs991x build. This will be addressed directly in wiseconnect sdk in the next version release of that sdk + cflags = rs911x_cflags + } else if (use_wf200) { + sources += wf200_plat_src + include_dirs += wf200_plat_incs + } + + public_configs += [ ":silabs-wifi-config" ] + } + + if (chip_build_libshell) { + deps += [ "${examples_plat_dir}:efr-matter-shell" ] + } + + # Attestation Credentials + if (chip_build_platform_attestation_credentials_provider) { + deps += [ ":efr32-attestation-credentials" ] + } + + # Factory Data Provider + if (use_efr32_factory_data_provider) { + public_deps += [ ":efr32-factory-data-provider" ] + } + + public_deps += [ + "${chip_root}/examples/providers:device_info_provider", + "${chip_root}/src/lib", + "${chip_root}/src/setup_payload", + ] + + if (app_data_model != "") { + public_deps += [ app_data_model ] + } +} diff --git a/examples/platform/silabs/efr32/BaseApplication.cpp b/examples/platform/silabs/efr32/BaseApplication.cpp index 648f192087fd80..44e1658001ecf8 100755 --- a/examples/platform/silabs/efr32/BaseApplication.cpp +++ b/examples/platform/silabs/efr32/BaseApplication.cpp @@ -38,8 +38,6 @@ #endif // DISPLAY_ENABLED #include "EFR32DeviceDataProvider.h" -#include -#include #include #include #include diff --git a/examples/platform/silabs/efr32/args.gni b/examples/platform/silabs/efr32/args.gni index 1726b62a75d86b..47d4cbb5c7bc20 100644 --- a/examples/platform/silabs/efr32/args.gni +++ b/examples/platform/silabs/efr32/args.gni @@ -19,3 +19,8 @@ chip_device_project_config_include = "" chip_project_config_include = "" chip_inet_project_config_include = "" chip_system_project_config_include = "" + +declare_args() { + app_data_model = "" + use_base_app = true +} diff --git a/examples/platform/silabs/efr32/rs911x/rs911x.gni b/examples/platform/silabs/efr32/rs911x/rs911x.gni index f11981023e35f2..40e6412cc8648a 100644 --- a/examples/platform/silabs/efr32/rs911x/rs911x.gni +++ b/examples/platform/silabs/efr32/rs911x/rs911x.gni @@ -1,25 +1,17 @@ import("//build_overrides/chip.gni") -import("//build_overrides/efr32_sdk.gni") -import("//build_overrides/pigweed.gni") examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" wiseconnect_sdk_root = "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk" -rs911x_cflags = [] rs911x_src_plat = [ "${examples_plat_dir}/rs911x/rsi_if.c", "${examples_plat_dir}/rs911x/wfx_rsi_host.c", - "${wifi_sdk_dir}/wfx_notify.cpp", "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_interrupt.c", "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_ioports.c", "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_timer.c", "${examples_plat_dir}/rs911x/hal/efx_spi.c", -] -rs911x_plat_incs = [ - "${wifi_sdk_dir}", - "${wifi_sdk_dir}/hal", - "${chip_root}/src/platform/EFR32", + "${wifi_sdk_dir}/wfx_notify.cpp", ] # @@ -57,45 +49,16 @@ rs911x_src_sapi = [ "${wiseconnect_sdk_root}/sapi/driver/rsi_utils.c", "${wiseconnect_sdk_root}/sapi/driver/rsi_wlan.c", "${wiseconnect_sdk_root}/sapi/rtos/freertos_wrapper/rsi_os_wrapper.c", + + # Apparently - the rsi library needs this (though we may not use use it) + "${wiseconnect_sdk_root}/sapi/network/socket/rsi_socket.c", + "${wiseconnect_sdk_root}/sapi/network/socket/rsi_socket_rom.c", ] -foreach(src_file, rs911x_src_sapi) { - rs911x_cflags += [ "-Wno-empty-body" ] -} +rs911x_cflags = [ "-Wno-empty-body" ] rs911x_inc_plat = [ - "${wifi_sdk_dir}", "${examples_plat_dir}/rs911x", "${examples_plat_dir}/rs911x/hal", "${wiseconnect_sdk_root}/sapi/include", ] - -# Apparently - the rsi library needs this -rs911x_src_sock = [ - "${wiseconnect_sdk_root}/sapi/network/socket/rsi_socket.c", - "${wiseconnect_sdk_root}/sapi/network/socket/rsi_socket_rom.c", -] -rs911x_sock_inc = [ "${wifi_sdk_dir}/rsi-sockets" ] - -# -# If we use LWIP - not built-in sockets -# -rs911x_src_lwip = [ - "${wifi_sdk_dir}/ethernetif.cpp", - "${wifi_sdk_dir}/dhcp_client.cpp", - "${wifi_sdk_dir}/lwip_netif.cpp", -] -rs911x_defs = [ - "SL_HEAP_SIZE=32768", - "SL_WIFI=1", - "SL_WFX_USE_SPI", - "EFX32_RS911X=1", - "RS911X_WIFI", - "RSI_WLAN_ENABLE", - "RSI_SPI_INTERFACE", - "RSI_WITH_OS", -] -rs911x_sock_defs = [ - "RS911X_SOCKETS", - "RSI_IPV6_ENABLE", -] diff --git a/examples/platform/silabs/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c index ad72f6361c055c..fdeb534916aae2 100644 --- a/examples/platform/silabs/efr32/rs911x/rsi_if.c +++ b/examples/platform/silabs/efr32/rs911x/rsi_if.c @@ -67,6 +67,12 @@ bool hasNotifiedIPV4 = false; #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */ bool hasNotifiedWifiConnectivity = false; +/* Declare a flag to differentiate between after boot-up first IP connection or reconnection */ +bool is_wifi_disconnection_event = false; + +/* Declare a variable to hold connection time intervals */ +uint32_t retryInterval = WLAN_MIN_RETRY_TIMER_MS; + /* * This file implements the interface to the RSI SAPIs */ @@ -195,12 +201,9 @@ static void wfx_rsi_join_cb(uint16_t status, const uint8_t * buf, const uint16_t * We should enable retry.. (Need config variable for this) */ WFX_RSI_LOG("%s: failed. retry: %d", __func__, wfx_rsi.join_retries); -#if (WFX_RSI_CONFIG_MAX_JOIN != 0) - if (++wfx_rsi.join_retries < WFX_RSI_CONFIG_MAX_JOIN) -#endif - { + wfx_retry_interval_handler(is_wifi_disconnection_event, wfx_rsi.join_retries++); + if (is_wifi_disconnection_event || wfx_rsi.join_retries <= WFX_RSI_CONFIG_MAX_JOIN) xEventGroupSetBits(wfx_rsi.events, WFX_EVT_STA_START_JOIN); - } } else { @@ -213,6 +216,8 @@ static void wfx_rsi_join_cb(uint16_t status, const uint8_t * buf, const uint16_t #else xEventGroupSetBits(wfx_rsi.events, WFX_EVT_STA_CONN); #endif + wfx_rsi.join_retries = 0; + retryInterval = WLAN_MIN_RETRY_TIMER_MS; } } @@ -228,9 +233,10 @@ static void wfx_rsi_join_cb(uint16_t status, const uint8_t * buf, const uint16_t *********************************************************************/ static void wfx_rsi_join_fail_cb(uint16_t status, uint8_t * buf, uint32_t len) { - WFX_RSI_LOG("%s: error: failed status: %02x on try %d", __func__, status, wfx_rsi.join_retries); + WFX_RSI_LOG("%s: error: failed status: %02x", __func__, status); wfx_rsi.join_retries += 1; - wfx_rsi.dev_state &= ~WFX_RSI_ST_STA_CONNECTING; + wfx_rsi.dev_state &= ~(WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED); + is_wifi_disconnection_event = true; xEventGroupSetBits(wfx_rsi.events, WFX_EVT_STA_START_JOIN); } #ifdef RS911X_SOCKETS @@ -461,6 +467,7 @@ static void wfx_rsi_do_join(void) { WFX_RSI_LOG("%s: WLAN: connecting to %s==%s, sec=%d", __func__, &wfx_rsi.sec.ssid[0], &wfx_rsi.sec.passkey[0], wfx_rsi.sec.security); + /* * Join the network */ @@ -469,12 +476,16 @@ static void wfx_rsi_do_join(void) */ wfx_rsi.dev_state |= WFX_RSI_ST_STA_CONNECTING; + if ((status = rsi_wlan_register_callbacks(RSI_JOIN_FAIL_CB, wfx_rsi_join_fail_cb)) != RSI_SUCCESS) + { + WFX_RSI_LOG("%s: RSI callback register join failed with status: %02x", __func__, status); + } + /* Try to connect Wifi with given Credentials * untill there is a success or maximum number of tries allowed */ - while (++wfx_rsi.join_retries < WFX_RSI_CONFIG_MAX_JOIN) + while (is_wifi_disconnection_event || wfx_rsi.join_retries <= WFX_RSI_CONFIG_MAX_JOIN) { - /* Call rsi connect call with given ssid and password * And check there is a success */ @@ -485,22 +496,17 @@ static void wfx_rsi_do_join(void) wfx_rsi.dev_state &= ~WFX_RSI_ST_STA_CONNECTING; WFX_RSI_LOG("%s: rsi_wlan_connect_async failed with status: %02x on try %d", __func__, status, wfx_rsi.join_retries); - vTaskDelay(4000); - /* TODO - Start a timer.. to retry */ + + wfx_retry_interval_handler(is_wifi_disconnection_event, wfx_rsi.join_retries); + wfx_rsi.join_retries++; } else { + WFX_RSI_LOG("%s: starting JOIN to %s after %d tries\n", __func__, (char *) &wfx_rsi.sec.ssid[0], + wfx_rsi.join_retries); break; // exit while loop } } - if (wfx_rsi.join_retries == MAX_JOIN_RETRIES_COUNT) - { - WFX_RSI_LOG("Connect failed after %d tries", wfx_rsi.join_retries); - } - else - { - WFX_RSI_LOG("%s: starting JOIN to %s after %d tries\n", __func__, (char *) &wfx_rsi.sec.ssid[0], wfx_rsi.join_retries); - } } } diff --git a/examples/platform/silabs/efr32/wf200/host_if.cpp b/examples/platform/silabs/efr32/wf200/host_if.cpp index a22735ae448529..faa2262bc7c090 100644 --- a/examples/platform/silabs/efr32/wf200/host_if.cpp +++ b/examples/platform/silabs/efr32/wf200/host_if.cpp @@ -99,6 +99,12 @@ bool hasNotifiedWifiConnectivity = false; static uint8_t retryJoin = 0; bool retryInProgress = false; +/* Declare a flag to differentiate between after boot-up first IP connection or reconnection */ +bool is_wifi_disconnection_event = false; + +/* Declare a variable to hold connection time intervals */ +uint32_t retryInterval = WLAN_MIN_RETRY_TIMER_MS; + #ifdef SL_WFX_CONFIG_SCAN static struct scan_result_holder { @@ -394,7 +400,7 @@ static void sl_wfx_connect_callback(sl_wfx_connect_ind_body_t connect_indication } } - if ((status != WFM_STATUS_SUCCESS) && retryJoin < MAX_JOIN_RETRIES_COUNT) + if ((status != WFM_STATUS_SUCCESS) && (!is_wifi_disconnection_event ? (retryJoin < MAX_JOIN_RETRIES_COUNT) : true)) { retryJoin += 1; retryInProgress = false; @@ -417,7 +423,9 @@ static void sl_wfx_disconnect_callback(uint8_t * mac, uint16_t reason) SILABS_LOG("WFX Disconnected %d\r\n", reason); sl_wfx_context->state = static_cast(static_cast(sl_wfx_context->state) & ~static_cast(SL_WFX_STA_INTERFACE_CONNECTED)); - xEventGroupSetBits(sl_wfx_event_group, SL_WFX_DISCONNECT); + retryInProgress = false; + is_wifi_disconnection_event = true; + xEventGroupSetBits(sl_wfx_event_group, SL_WFX_RETRY_CONNECT); } #ifdef SL_WFX_CONFIG_SOFTAP @@ -534,9 +542,10 @@ static void wfx_events_task(void * p_arg) { if (!retryInProgress) { + retryInProgress = true; + wfx_retry_interval_handler(is_wifi_disconnection_event, retryJoin); SILABS_LOG("WFX sending the connect command"); wfx_connect_to_ap(); - retryInProgress = true; } } @@ -589,6 +598,8 @@ static void wfx_events_task(void * p_arg) hasNotifiedWifiConnectivity = false; SILABS_LOG("WIFI: Connected to AP"); wifi_extra |= WE_ST_STA_CONN; + retryJoin = 0; + retryInterval = WLAN_MIN_RETRY_TIMER_MS; wfx_lwip_set_sta_link_up(); #ifdef SLEEP_ENABLED if (!(wfx_get_wifi_state() & SL_WFX_AP_INTERFACE_UP)) diff --git a/examples/platform/silabs/efr32/wf200/wf200.gni b/examples/platform/silabs/efr32/wf200/wf200.gni index fbe67d002faf67..2c0ac803c3c443 100644 --- a/examples/platform/silabs/efr32/wf200/wf200.gni +++ b/examples/platform/silabs/efr32/wf200/wf200.gni @@ -1,27 +1,10 @@ import("//build_overrides/chip.gni") -import("//build_overrides/efr32_sdk.gni") -import("//build_overrides/pigweed.gni") examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" -wf200_defs = [ - "SL_HEAP_SIZE=24576", - "WF200_WIFI=1", - "SL_WIFI=1", - "SL_WFX_USE_SPI", - "SL_WFX_DEBUG_MASK=0x0003", -] -softap_defs = "SL_WFX_CONFIG_SOFTAP" -wifi_scan_defs = "SL_WFX_CONFIG_SCAN" -wf200_plat_incs = [ - "${wifi_sdk_dir}/", - "${examples_plat_dir}/wf200", -] +wf200_plat_incs = [ "${examples_plat_dir}/wf200" ] wf200_plat_src = [ - "${wifi_sdk_dir}/dhcp_client.cpp", - "${wifi_sdk_dir}/ethernetif.cpp", - "${wifi_sdk_dir}/lwip_netif.cpp", "${wifi_sdk_dir}/wfx_notify.cpp", "${examples_plat_dir}/wf200/sl_wfx_task.c", "${examples_plat_dir}/wf200/wf200_init.c", diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp index 73c9e1621b46f0..a276405355482f 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp +++ b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp @@ -27,7 +27,6 @@ #include "AppConfig.h" #include "PumpManager.h" -#include #include #include #include diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp index c779cee1e6e336..ac94f703c2ce2f 100644 --- a/examples/pump-app/nrfconnect/main/AppTask.cpp +++ b/examples/pump-app/nrfconnect/main/AppTask.cpp @@ -23,8 +23,6 @@ #include "PumpManager.h" #include -#include -#include #include #include #include diff --git a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp index 8753f759763357..2b11e7cbbb37ac 100644 --- a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp +++ b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp @@ -23,8 +23,6 @@ #include "PumpManager.h" #include -#include -#include #include #include #include diff --git a/examples/shell/nxp/k32w/k32w0/main/AppTask.cpp b/examples/shell/nxp/k32w/k32w0/main/AppTask.cpp index 47c5f4d62b44b8..ac98d19eb0d574 100644 --- a/examples/shell/nxp/k32w/k32w0/main/AppTask.cpp +++ b/examples/shell/nxp/k32w/k32w0/main/AppTask.cpp @@ -30,8 +30,6 @@ #include -#include -#include #include #include "Keyboard.h" diff --git a/examples/thermostat/genio/src/AppTask.cpp b/examples/thermostat/genio/src/AppTask.cpp index 8630aad9fbf2ba..ac419e01f51b9b 100644 --- a/examples/thermostat/genio/src/AppTask.cpp +++ b/examples/thermostat/genio/src/AppTask.cpp @@ -24,8 +24,6 @@ #include "qrcodegen.h" -#include -#include #include #include #include diff --git a/examples/thermostat/silabs/efr32/BUILD.gn b/examples/thermostat/silabs/efr32/BUILD.gn index a2ad43efcfa945..b6c7f81671501b 100644 --- a/examples/thermostat/silabs/efr32/BUILD.gn +++ b/examples/thermostat/silabs/efr32/BUILD.gn @@ -35,117 +35,17 @@ efr32_project_dir = "${chip_root}/examples/thermostat/silabs/efr32" examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" +import("${examples_plat_dir}/args.gni") + declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false - # Monitor & log memory usage at runtime. - enable_heap_monitoring = false - - # Enable Sleepy end device - enable_sleepy_device = false - - # OTA timeout in seconds - OTA_periodic_query_timeout = 86400 - - # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false - sl_wfx_config_softap = false - sl_wfx_config_scan = true - - # Disable LCD on supported devices - disable_lcd = false - - # Argument to Disable IPv4 for wifi(rs911) - chip_enable_wifi_ipv4 = false - - #default WiFi SSID - chip_default_wifi_ssid = "" - - #default Wifi Password - chip_default_wifi_psk = "" - # Enable the temperature sensor # Some boards do not have a temperature sensor use_temp_sensor = silabs_board != "BRD2703A" && silabs_board != "BRD4319A" } -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - -# Sanity check -assert(!(chip_enable_wifi && chip_enable_openthread)) -assert(!(use_rs911x && chip_enable_openthread)) -assert(!(use_wf200 && chip_enable_openthread)) -if (chip_enable_wifi) { - assert(use_rs911x || use_wf200) - enable_openthread_cli = false - import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") -} - -# ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) -if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || - silabs_board == "BRD2703A" || silabs_board == "BRD4319A") { - show_qr_code = false - disable_lcd = true -} - -defines = [] - -# WiFi settings -if (chip_enable_wifi) { - if (chip_default_wifi_ssid != "") { - defines += [ - "CHIP_ONNETWORK_PAIRING=1", - "CHIP_WIFI_SSID=\"${chip_default_wifi_ssid}\"", - ] - } - if (chip_default_wifi_psk != "") { - assert(chip_default_wifi_ssid != "", - "ssid can't be null if psk is provided") - defines += [ "CHIP_WIFI_PSK=\"${chip_default_wifi_psk}\"" ] - } - wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" - efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] - if (lwip_ipv4) { - efr32_lwip_defs += [ - "LWIP_IPV4=1", - - # adds following options to provide - # them to .cpp source files - # flags ported from lwipopts file - # TODO: move lwipopts to one location - "LWIP_ARP=1", - "LWIP_ICMP=1", - "LWIP_IGMP=1", - "LWIP_DHCP=1", - "LWIP_DNS=0", - ] - } else { - efr32_lwip_defs += [ "LWIP_IPV4=0" ] - } - if (lwip_ipv6) { - efr32_lwip_defs += [ "LWIP_IPV6=1" ] - } else { - efr32_lwip_defs += [ "LWIP_IPV6=0" ] - } - - if (use_rs911x) { - wiseconnect_sdk_root = - "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk" - import("${examples_plat_dir}/rs911x/rs911x.gni") - } else { - import("${examples_plat_dir}/wf200/wf200.gni") - } -} - efr32_sdk("sdk") { sources = [ "${efr32_project_dir}/include/CHIPProjectConfig.h", @@ -160,11 +60,12 @@ efr32_sdk("sdk") { "${examples_common_plat_dir}", ] - defines += [ - "BOARD_ID=${silabs_board}", - "OTA_PERIODIC_TIMEOUT=${OTA_periodic_query_timeout}", - ] + if (use_wf200) { + # TODO efr32_sdk should not need a header from this location + include_dirs += [ "${examples_plat_dir}/wf200" ] + } + defines = [] if (chip_enable_pw_rpc) { defines += [ "HAL_VCOM_ENABLE=1", @@ -172,31 +73,6 @@ efr32_sdk("sdk") { ] } - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - defines += rs911x_defs - include_dirs += rs911x_plat_incs - } else if (use_wf200) { - defines += wf200_defs - include_dirs += wf200_plat_incs - } - - if (use_rs911x_sockets) { - include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ] - defines += rs911x_sock_defs - } else { - # Using LWIP instead of the native TCP/IP stack - defines += efr32_lwip_defs - } - - if (sl_wfx_config_softap) { - defines += [ "SL_WFX_CONFIG_SOFTAP" ] - } - if (sl_wfx_config_scan) { - defines += [ "SL_WFX_CONFIG_SCAN" ] - } - } if (use_temp_sensor) { include_dirs += [ "${efr32_sdk_root}/platform/driver/i2cspm/inc", @@ -218,11 +94,6 @@ efr32_executable("thermostat_app") { defines = [] sources = [ - "${examples_common_plat_dir}/heap_4_silabs.c", - "${examples_plat_dir}/BaseApplication.cpp", - "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/init_efrPlatform.cpp", - "${examples_plat_dir}/matter_config.cpp", "src/AppTask.cpp", "src/SensorManager.cpp", "src/TemperatureManager.cpp", @@ -230,10 +101,6 @@ efr32_executable("thermostat_app") { "src/main.cpp", ] - if (use_wstk_leds) { - sources += [ "${examples_plat_dir}/LEDWidget.cpp" ] - } - if (use_temp_sensor) { sources += [ "${efr32_sdk_root}/app/bluetooth/common/sensor_rht/sl_sensor_rht.c", @@ -247,93 +114,17 @@ efr32_executable("thermostat_app") { ] } - if (chip_enable_pw_rpc || chip_build_libshell || enable_openthread_cli || - use_wf200 || use_rs911x) { - sources += [ "${examples_plat_dir}/uart.cpp" ] + if (!disable_lcd) { + sources += [ "src/ThermostatUI.cpp" ] + defines += [ "IS_DEMO_THERMOSTAT=1" ] } deps = [ ":sdk", - "${chip_root}/examples/providers:device_info_provider", - "${chip_root}/examples/thermostat/thermostat-common", - "${chip_root}/src/lib", - "${chip_root}/src/setup_payload", + "${examples_plat_dir}:efr32-common", + app_data_model, ] - # OpenThread Settings - if (chip_enable_openthread) { - deps += [ - "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread-platform", - "${examples_plat_dir}:efr-matter-shell", - ] - } - - # Attestation Credentials - if (chip_build_platform_attestation_credentials_provider) { - deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ] - } - - # Factory Data Provider - if (use_efr32_factory_data_provider) { - deps += [ "${examples_plat_dir}:efr32-factory-data-provider" ] - } - - if (chip_enable_ota_requestor) { - defines += [ "EFR32_OTA_ENABLED" ] - sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] - } - - if (chip_enable_wifi_ipv4) { - defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] - } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - sources += rs911x_src_plat - - # All the stuff from wiseconnect - sources += rs911x_src_sapi - - # Apparently - the rsi library needs this (though we may not use use it) - sources += rs911x_src_sock - include_dirs += rs911x_inc_plat - - if (use_rs911x_sockets) { - # - # Using native sockets inside RS911x - # - include_dirs += rs911x_sock_inc - } else { - # - # We use LWIP - not built-in sockets - # - sources += rs911x_src_lwip - } - } else if (use_wf200) { - sources += wf200_plat_src - include_dirs += wf200_plat_incs - } - } - - if (!disable_lcd) { - sources += [ - "${examples_plat_dir}/display/demo-ui.c", - "${examples_plat_dir}/display/lcd.cpp", - "src/ThermostatUI.cpp", - ] - include_dirs += [ "${examples_plat_dir}/display" ] - defines += [ - "DISPLAY_ENABLED", - "IS_DEMO_THERMOSTAT=1", - ] - if (show_qr_code) { - defines += [ "QR_CODE_ENABLED" ] - deps += [ "${chip_root}/examples/common/QRCode" ] - } - } - if (chip_enable_pw_rpc) { defines += [ "PW_RPC_ENABLED", @@ -371,11 +162,6 @@ efr32_executable("thermostat_app") { ] } - if (enable_heap_monitoring) { - sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] - defines += [ "HEAP_MONITORING" ] - } - ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld" inputs = [ ldscript ] diff --git a/examples/thermostat/silabs/efr32/args.gni b/examples/thermostat/silabs/efr32/args.gni index 6b0d9a8e2eb8a6..542ac00f3e41b2 100644 --- a/examples/thermostat/silabs/efr32/args.gni +++ b/examples/thermostat/silabs/efr32/args.gni @@ -18,6 +18,7 @@ import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") +app_data_model = "${chip_root}/examples/thermostat/thermostat-common" chip_enable_ota_requestor = true chip_enable_openthread = true diff --git a/examples/thermostat/silabs/efr32/build_for_wifi_args.gni b/examples/thermostat/silabs/efr32/build_for_wifi_args.gni index 86d8a19bbc36ce..0124f6a2f0f455 100644 --- a/examples/thermostat/silabs/efr32/build_for_wifi_args.gni +++ b/examples/thermostat/silabs/efr32/build_for_wifi_args.gni @@ -19,3 +19,4 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true +app_data_model = "${chip_root}/examples/thermostat/thermostat-common" diff --git a/examples/thermostat/silabs/efr32/src/AppTask.cpp b/examples/thermostat/silabs/efr32/src/AppTask.cpp index ec6fa525d6db32..2ccaec5fed2e1c 100644 --- a/examples/thermostat/silabs/efr32/src/AppTask.cpp +++ b/examples/thermostat/silabs/efr32/src/AppTask.cpp @@ -38,8 +38,6 @@ #endif // QR_CODE_ENABLED #endif // DISPLAY_ENABLED -#include -#include #include #include #include diff --git a/examples/thermostat/telink/src/AppTask.cpp b/examples/thermostat/telink/src/AppTask.cpp index 02ba927f8c568c..6c4d026329c422 100644 --- a/examples/thermostat/telink/src/AppTask.cpp +++ b/examples/thermostat/telink/src/AppTask.cpp @@ -25,8 +25,6 @@ #include "ThreadUtil.h" #include -#include -#include #include #include #include diff --git a/examples/tv-app/android/include/cluster-init.cpp b/examples/tv-app/android/include/cluster-init.cpp index 45bc21a45f4ee8..cde32581ecabb6 100644 --- a/examples/tv-app/android/include/cluster-init.cpp +++ b/examples/tv-app/android/include/cluster-init.cpp @@ -21,7 +21,6 @@ #include "audio-output/AudioOutputManager.h" #include "target-navigator/TargetNavigatorManager.h" -#include #include #include #include diff --git a/examples/tv-app/android/java/AppImpl.cpp b/examples/tv-app/android/java/AppImpl.cpp index d2e392533ad9f4..91d177bba831b5 100644 --- a/examples/tv-app/android/java/AppImpl.cpp +++ b/examples/tv-app/android/java/AppImpl.cpp @@ -23,7 +23,6 @@ #include "ContentAppAttributeDelegate.h" #include "ContentAppCommandDelegate.h" -#include #include #include #include @@ -47,6 +46,7 @@ #include using namespace chip; +using namespace chip::app::Clusters; using namespace chip::AppPlatform; using namespace chip::DeviceLayer; @@ -87,34 +87,36 @@ static const int kDescriptorAttributeArraySize = 254; // Declare Descriptor cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(descriptorAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_SERVER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CLIENT_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ +DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::DeviceTypeList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::ServerList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::ClientList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::PartsList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Application Basic information cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(applicationBasicAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_VENDOR_NAME_ATTRIBUTE_ID, CHAR_STRING, kNameSize, 0), /* VendorName */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_VENDOR_ID_ATTRIBUTE_ID, INT16U, 1, 0), /* VendorID */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_NAME_ATTRIBUTE_ID, CHAR_STRING, kNameSize, 0), /* ApplicationName */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_PRODUCT_ID_ATTRIBUTE_ID, INT16U, 1, 0), /* ProductID */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_STATUS_ATTRIBUTE_ID, INT8U, 1, 0), /* ApplicationStatus */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_VERSION_ATTRIBUTE_ID, CHAR_STRING, kNameSize, 0), /* ApplicationVersion */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_ALLOWED_VENDOR_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, +DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::VendorName::Id, CHAR_STRING, kNameSize, 0), /* VendorName */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::VendorID::Id, INT16U, 1, 0), /* VendorID */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::ApplicationName::Id, CHAR_STRING, kNameSize, 0), /* ApplicationName */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::ProductID::Id, INT16U, 1, 0), /* ProductID */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::Status::Id, INT8U, 1, 0), /* ApplicationStatus */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::ApplicationVersion::Id, CHAR_STRING, kNameSize, + 0), /* ApplicationVersion */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::AllowedVendorList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* AllowedVendorList */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Keypad Input cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(keypadInputAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ +DECLARE_DYNAMIC_ATTRIBUTE(KeypadInput::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Application Launcher cluster attributes // NOTE: Does not make sense for content app to be able to set the AP feature flag DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(applicationLauncherAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_LAUNCHER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* catalog list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_LAUNCHER_CURRENT_APP_ATTRIBUTE_ID, STRUCT, 1, 0), /* current app */ +DECLARE_DYNAMIC_ATTRIBUTE(ApplicationLauncher::Attributes::CatalogList::Id, ARRAY, kDescriptorAttributeArraySize, + 0), /* catalog list */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationLauncher::Attributes::CurrentApp::Id, STRUCT, 1, 0), /* current app */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Account Login cluster attributes @@ -123,37 +125,37 @@ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Content Launcher cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(contentLauncherAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CONTENT_LAUNCHER_ACCEPT_HEADER_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, +DECLARE_DYNAMIC_ATTRIBUTE(ContentLauncher::Attributes::AcceptHeader::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* accept header list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID, BITMAP32, 1, - 0), /* streaming protocols */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ + DECLARE_DYNAMIC_ATTRIBUTE(ContentLauncher::Attributes::SupportedStreamingProtocols::Id, BITMAP32, 1, + 0), /* streaming protocols */ + DECLARE_DYNAMIC_ATTRIBUTE(ContentLauncher::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Media Playback cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(mediaPlaybackAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_STATE_ATTRIBUTE_ID, ENUM8, 1, 0), /* current state */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_START_TIME_ATTRIBUTE_ID, EPOCH_US, 1, 0), /* start time */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_DURATION_ATTRIBUTE_ID, INT64U, 1, 0), /* duration */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_PLAYBACK_POSITION_ATTRIBUTE_ID, STRUCT, 1, 0), /* playback speed */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_PLAYBACK_SPEED_ATTRIBUTE_ID, SINGLE, 1, 0), /* playback speed */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_PLAYBACK_SEEK_RANGE_END_ATTRIBUTE_ID, INT64U, 1, 0), /* seek range end */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_PLAYBACK_SEEK_RANGE_START_ATTRIBUTE_ID, INT64U, 1, 0), /* seek range start */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ +DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::CurrentState::Id, ENUM8, 1, 0), /* current state */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::StartTime::Id, EPOCH_US, 1, 0), /* start time */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::Duration::Id, INT64U, 1, 0), /* duration */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::SampledPosition::Id, STRUCT, 1, 0), /* SampledPosition */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::PlaybackSpeed::Id, SINGLE, 1, 0), /* playback speed */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::SeekRangeEnd::Id, INT64U, 1, 0), /* seek range end */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::SeekRangeStart::Id, INT64U, 1, 0), /* seek range start */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Target Navigator cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(targetNavigatorAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TARGET_NAVIGATOR_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* target list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TARGET_NAVIGATOR_CURRENT_TARGET_ATTRIBUTE_ID, INT8U, 1, 0), /* current target */ +DECLARE_DYNAMIC_ATTRIBUTE(TargetNavigator::Attributes::TargetList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* target list */ + DECLARE_DYNAMIC_ATTRIBUTE(TargetNavigator::Attributes::CurrentTarget::Id, INT8U, 1, 0), /* current target */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Channel cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(channelAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CHANNEL_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* channel list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CHANNEL_LINEUP_ATTRIBUTE_ID, STRUCT, 1, 0), /* lineup */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CHANNEL_CURRENT_CHANNEL_ATTRIBUTE_ID, STRUCT, 1, 0), /* current channel */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ +DECLARE_DYNAMIC_ATTRIBUTE(Channel::Attributes::ChannelList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* channel list */ + DECLARE_DYNAMIC_ATTRIBUTE(Channel::Attributes::Lineup::Id, STRUCT, 1, 0), /* lineup */ + DECLARE_DYNAMIC_ATTRIBUTE(Channel::Attributes::CurrentChannel::Id, STRUCT, 1, 0), /* current channel */ + DECLARE_DYNAMIC_ATTRIBUTE(Channel::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); constexpr CommandId keypadInputIncomingCommands[] = { diff --git a/examples/tv-app/android/java/DeviceCallbacks.cpp b/examples/tv-app/android/java/DeviceCallbacks.cpp index cf61e191385317..ad1b40fa10bcb4 100644 --- a/examples/tv-app/android/java/DeviceCallbacks.cpp +++ b/examples/tv-app/android/java/DeviceCallbacks.cpp @@ -24,7 +24,6 @@ **/ #include "DeviceCallbacks.h" -#include #include #include #include diff --git a/examples/tv-app/linux/AppImpl.cpp b/examples/tv-app/linux/AppImpl.cpp index a23f939ba92671..9ecb9bcb39d0c4 100644 --- a/examples/tv-app/linux/AppImpl.cpp +++ b/examples/tv-app/linux/AppImpl.cpp @@ -21,7 +21,6 @@ #include "AppImpl.h" -#include #include #include #include @@ -245,34 +244,36 @@ static const int kDescriptorAttributeArraySize = 254; // Declare Descriptor cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(descriptorAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_DEVICE_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_SERVER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CLIENT_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_PARTS_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ +DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::DeviceTypeList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* device list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::ServerList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* server list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::ClientList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* client list */ + DECLARE_DYNAMIC_ATTRIBUTE(Descriptor::Attributes::PartsList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* parts list */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Application Basic information cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(applicationBasicAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_VENDOR_NAME_ATTRIBUTE_ID, CHAR_STRING, kNameSize, 0), /* VendorName */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_VENDOR_ID_ATTRIBUTE_ID, INT16U, 1, 0), /* VendorID */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_NAME_ATTRIBUTE_ID, CHAR_STRING, kNameSize, 0), /* ApplicationName */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_PRODUCT_ID_ATTRIBUTE_ID, INT16U, 1, 0), /* ProductID */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_STATUS_ATTRIBUTE_ID, INT8U, 1, 0), /* ApplicationStatus */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_VERSION_ATTRIBUTE_ID, CHAR_STRING, kNameSize, 0), /* ApplicationVersion */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_ALLOWED_VENDOR_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, +DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::VendorName::Id, CHAR_STRING, kNameSize, 0), /* VendorName */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::VendorID::Id, INT16U, 1, 0), /* VendorID */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::ApplicationName::Id, CHAR_STRING, kNameSize, 0), /* ApplicationName */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::ProductID::Id, INT16U, 1, 0), /* ProductID */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::Status::Id, INT8U, 1, 0), /* ApplicationStatus */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::ApplicationVersion::Id, CHAR_STRING, kNameSize, + 0), /* ApplicationVersion */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationBasic::Attributes::AllowedVendorList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* AllowedVendorList */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Keypad Input cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(keypadInputAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ +DECLARE_DYNAMIC_ATTRIBUTE(KeypadInput::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Application Launcher cluster attributes // NOTE: Does not make sense for content app to be able to set the AP feature flag DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(applicationLauncherAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_LAUNCHER_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* catalog list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_APPLICATION_LAUNCHER_CURRENT_APP_ATTRIBUTE_ID, STRUCT, 1, 0), /* current app */ +DECLARE_DYNAMIC_ATTRIBUTE(ApplicationLauncher::Attributes::CatalogList::Id, ARRAY, kDescriptorAttributeArraySize, + 0), /* catalog list */ + DECLARE_DYNAMIC_ATTRIBUTE(ApplicationLauncher::Attributes::CurrentApp::Id, STRUCT, 1, 0), /* current app */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Account Login cluster attributes @@ -281,37 +282,37 @@ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Content Launcher cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(contentLauncherAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CONTENT_LAUNCHER_ACCEPT_HEADER_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, +DECLARE_DYNAMIC_ATTRIBUTE(ContentLauncher::Attributes::AcceptHeader::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* accept header list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID, BITMAP32, 1, - 0), /* streaming protocols */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ + DECLARE_DYNAMIC_ATTRIBUTE(ContentLauncher::Attributes::SupportedStreamingProtocols::Id, BITMAP32, 1, + 0), /* streaming protocols */ + DECLARE_DYNAMIC_ATTRIBUTE(ContentLauncher::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Media Playback cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(mediaPlaybackAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_STATE_ATTRIBUTE_ID, ENUM8, 1, 0), /* current state */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_START_TIME_ATTRIBUTE_ID, EPOCH_US, 1, 0), /* start time */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_DURATION_ATTRIBUTE_ID, INT64U, 1, 0), /* duration */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_PLAYBACK_POSITION_ATTRIBUTE_ID, STRUCT, 1, 0), /* playback speed */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_PLAYBACK_SPEED_ATTRIBUTE_ID, SINGLE, 1, 0), /* playback speed */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_PLAYBACK_SEEK_RANGE_END_ATTRIBUTE_ID, INT64U, 1, 0), /* seek range end */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_MEDIA_PLAYBACK_PLAYBACK_SEEK_RANGE_START_ATTRIBUTE_ID, INT64U, 1, 0), /* seek range start */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ +DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::CurrentState::Id, ENUM8, 1, 0), /* current state */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::StartTime::Id, EPOCH_US, 1, 0), /* start time */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::Duration::Id, INT64U, 1, 0), /* duration */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::SampledPosition::Id, STRUCT, 1, 0), /* SampledPosition */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::PlaybackSpeed::Id, SINGLE, 1, 0), /* playback speed */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::SeekRangeEnd::Id, INT64U, 1, 0), /* seek range end */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::SeekRangeStart::Id, INT64U, 1, 0), /* seek range start */ + DECLARE_DYNAMIC_ATTRIBUTE(MediaPlayback::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Target Navigator cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(targetNavigatorAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TARGET_NAVIGATOR_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* target list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TARGET_NAVIGATOR_CURRENT_TARGET_ATTRIBUTE_ID, INT8U, 1, 0), /* current target */ +DECLARE_DYNAMIC_ATTRIBUTE(TargetNavigator::Attributes::TargetList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* target list */ + DECLARE_DYNAMIC_ATTRIBUTE(TargetNavigator::Attributes::CurrentTarget::Id, INT8U, 1, 0), /* current target */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); // Declare Channel cluster attributes DECLARE_DYNAMIC_ATTRIBUTE_LIST_BEGIN(channelAttrs) -DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CHANNEL_LIST_ATTRIBUTE_ID, ARRAY, kDescriptorAttributeArraySize, 0), /* channel list */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CHANNEL_LINEUP_ATTRIBUTE_ID, STRUCT, 1, 0), /* lineup */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_CHANNEL_CURRENT_CHANNEL_ATTRIBUTE_ID, STRUCT, 1, 0), /* current channel */ - DECLARE_DYNAMIC_ATTRIBUTE(ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID, BITMAP32, 4, 0), /* FeatureMap */ +DECLARE_DYNAMIC_ATTRIBUTE(Channel::Attributes::ChannelList::Id, ARRAY, kDescriptorAttributeArraySize, 0), /* channel list */ + DECLARE_DYNAMIC_ATTRIBUTE(Channel::Attributes::Lineup::Id, STRUCT, 1, 0), /* lineup */ + DECLARE_DYNAMIC_ATTRIBUTE(Channel::Attributes::CurrentChannel::Id, STRUCT, 1, 0), /* current channel */ + DECLARE_DYNAMIC_ATTRIBUTE(Channel::Attributes::FeatureMap::Id, BITMAP32, 4, 0), /* FeatureMap */ DECLARE_DYNAMIC_ATTRIBUTE_LIST_END(); constexpr CommandId keypadInputIncomingCommands[] = { diff --git a/examples/tv-app/linux/include/cluster-init.cpp b/examples/tv-app/linux/include/cluster-init.cpp index ea56403a7df4c6..496aa1c3288288 100644 --- a/examples/tv-app/linux/include/cluster-init.cpp +++ b/examples/tv-app/linux/include/cluster-init.cpp @@ -25,7 +25,6 @@ #include "target-navigator/TargetNavigatorManager.h" #include "wake-on-lan/WakeOnLanManager.h" -#include #include #include #include diff --git a/examples/tv-app/linux/include/level-control/LevelControl.cpp b/examples/tv-app/linux/include/level-control/LevelControl.cpp index dd919ca342f46b..4c54fd4fb8886a 100644 --- a/examples/tv-app/linux/include/level-control/LevelControl.cpp +++ b/examples/tv-app/linux/include/level-control/LevelControl.cpp @@ -19,8 +19,6 @@ #include #include -#include -#include #include #include diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/AppParameters.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/AppParameters.java index 78cbad859fc961..cf4d626bac248c 100644 --- a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/AppParameters.java +++ b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/AppParameters.java @@ -17,7 +17,12 @@ */ package com.chip.casting; +import android.util.Log; +import java.math.BigInteger; +import java.util.Arrays; + public class AppParameters { + private static final String TAG = AppParameters.class.getSimpleName(); public static final int MIN_ROTATING_DEVICE_ID_UNIQUE_ID_LENGTH = 16; private static final int TEST_SETUP_PASSCODE = 20202021; private static final int TEST_DISCRIMINATOR = 0xF00; @@ -32,11 +37,20 @@ public class AppParameters { private int discriminator = TEST_DISCRIMINATOR; public void setRotatingDeviceIdUniqueId(byte[] rotatingDeviceIdUniqueId) { - this.rotatingDeviceIdUniqueId = rotatingDeviceIdUniqueId; + Log.d( + TAG, + "AppParameters.setRotatingDeviceIdUniqueId called with " + + new BigInteger(1, rotatingDeviceIdUniqueId).toString(16)); + this.rotatingDeviceIdUniqueId = + Arrays.copyOf(rotatingDeviceIdUniqueId, rotatingDeviceIdUniqueId.length); } public byte[] getRotatingDeviceIdUniqueId() { - return rotatingDeviceIdUniqueId; + Log.d( + TAG, + "AppParameters.getRotatingDeviceIdUniqueId returning copyOf " + + new BigInteger(1, rotatingDeviceIdUniqueId).toString(16)); + return Arrays.copyOf(rotatingDeviceIdUniqueId, rotatingDeviceIdUniqueId.length); } public DACProvider getDacProvider() { diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp index 8112c6b2acfb90..cff8ddd8ba9677 100644 --- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp +++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp @@ -32,12 +32,27 @@ CHIP_ERROR convertJAppParametersToCppAppParams(jobject appParameters, AppParams ReturnErrorOnFailure( chip::JniReferences::GetInstance().GetClassRef(env, "com/chip/casting/AppParameters", jAppParametersClass)); - jfieldID jRotatingDeviceIdUniqueIdField = env->GetFieldID(jAppParametersClass, "rotatingDeviceIdUniqueId", "[B"); - jobject jRotatingDeviceIdUniqueId = env->GetObjectField(appParameters, jRotatingDeviceIdUniqueIdField); + jmethodID getRotatingDeviceIdUniqueIdMethod = env->GetMethodID(jAppParametersClass, "getRotatingDeviceIdUniqueId", "()[B"); + if (getRotatingDeviceIdUniqueIdMethod == nullptr) + { + ChipLogError(Zcl, "Failed to access AppParameters 'getRotatingDeviceIdUniqueId' method"); + env->ExceptionClear(); + } + + jobject jRotatingDeviceIdUniqueId = (jobject) env->CallObjectMethod(appParameters, getRotatingDeviceIdUniqueIdMethod); + if (env->ExceptionCheck()) + { + ChipLogError(Zcl, "Java exception in AppParameters::getRotatingDeviceIdUniqueId"); + env->ExceptionDescribe(); + env->ExceptionClear(); + return CHIP_ERROR_INCORRECT_STATE; + } + if (jRotatingDeviceIdUniqueId != nullptr) { - chip::JniByteArray jniRotatingDeviceIdUniqueIdByteArray(env, static_cast(jRotatingDeviceIdUniqueId)); - outAppParams.SetRotatingDeviceIdUniqueId(MakeOptional(jniRotatingDeviceIdUniqueIdByteArray.byteSpan())); + chip::JniByteArray * jniRotatingDeviceIdUniqueIdByteArray = + new chip::JniByteArray(env, static_cast(jRotatingDeviceIdUniqueId)); + outAppParams.SetRotatingDeviceIdUniqueId(MakeOptional(jniRotatingDeviceIdUniqueIdByteArray->byteSpan())); } return CHIP_NO_ERROR; diff --git a/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h b/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h index e11b96824bcd5a..641cf0d120be0c 100644 --- a/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h +++ b/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h @@ -60,4 +60,4 @@ #define CHIP_ENABLE_ROTATING_DEVICE_ID 1 -#define CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID_LENGTH 64 +#define CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID_LENGTH 128 diff --git a/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp b/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp index 1e92e6eb4e2e13..dea0277064b30c 100644 --- a/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp +++ b/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp @@ -46,12 +46,17 @@ CHIP_ERROR PersistenceManager::AddVideoPlayer(TargetVideoPlayerInfo * targetVide // found the same video player, overwrite the data if (cachedVideoPlayers[i] == *targetVideoPlayerInfo) { + ChipLogProgress(AppServer, + "PersistenceManager::AddVideoPlayer found video player already cached. Overwriting at position: %lu", + static_cast(i)); cachedVideoPlayers[i] = *targetVideoPlayerInfo; newVideoPlayer = false; } } if (newVideoPlayer) { + ChipLogProgress(AppServer, "PersistenceManager::AddVideoPlayer writing new video player at position: %lu", + static_cast(i)); VerifyOrReturnError(i < kMaxCachedVideoPlayers, CHIP_ERROR_BUFFER_TOO_SMALL); cachedVideoPlayers[i] = *targetVideoPlayerInfo; } @@ -78,7 +83,8 @@ CHIP_ERROR PersistenceManager::WriteAllVideoPlayers(TargetVideoPlayerInfo videoP ReturnErrorOnFailure( tlvWriter.StartContainer(TLV::ContextTag(kVideoPlayersContainerTag), TLV::kTLVType_Structure, videoPlayersContainerType)); - for (size_t videoPlayerIndex = 0; videoPlayerIndex < kMaxCachedVideoPlayers && videoPlayers[videoPlayerIndex].IsInitialized(); + size_t videoPlayerIndex; + for (videoPlayerIndex = 0; videoPlayerIndex < kMaxCachedVideoPlayers && videoPlayers[videoPlayerIndex].IsInitialized(); videoPlayerIndex++) { TargetVideoPlayerInfo * videoPlayer = &videoPlayers[videoPlayerIndex]; @@ -146,19 +152,19 @@ CHIP_ERROR PersistenceManager::WriteAllVideoPlayers(TargetVideoPlayerInfo videoP // Content app endpoints container ends ReturnErrorOnFailure(tlvWriter.EndContainer(contentAppEndpointsContainerType)); } - // Video Players container ends - ReturnErrorOnFailure(tlvWriter.EndContainer(videoPlayersContainerType)); - ReturnErrorOnFailure(tlvWriter.EndContainer(outerContainerType)); - - ReturnErrorOnFailure(tlvWriter.Finalize()); - ChipLogProgress(AppServer, - "PersistenceManager::WriteAllVideoPlayers TLV(CastingData).LengthWritten: %d bytes and version: %d", - tlvWriter.GetLengthWritten(), kCurrentCastingDataVersion); - return chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Put(kCastingDataKey, castingData, - tlvWriter.GetLengthWritten()); } } - return CHIP_NO_ERROR; + + // Video Players container ends + ReturnErrorOnFailure(tlvWriter.EndContainer(videoPlayersContainerType)); + ReturnErrorOnFailure(tlvWriter.EndContainer(outerContainerType)); + + ReturnErrorOnFailure(tlvWriter.Finalize()); + ChipLogProgress(AppServer, + "PersistenceManager::WriteAllVideoPlayers TLV(CastingData).LengthWritten: %d bytes, video player count: %lu " + "and version: %d", + tlvWriter.GetLengthWritten(), static_cast(videoPlayerIndex), kCurrentCastingDataVersion); + return chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Put(kCastingDataKey, castingData, tlvWriter.GetLengthWritten()); } CHIP_ERROR PersistenceManager::ReadAllVideoPlayers(TargetVideoPlayerInfo outVideoPlayers[]) @@ -379,6 +385,9 @@ CHIP_ERROR PersistenceManager::ReadAllVideoPlayers(TargetVideoPlayerInfo outVide VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(videoPlayersContainerType)); ReturnErrorOnFailure(reader.ExitContainer(outerContainerType)); + + ChipLogProgress(AppServer, "PersistenceManager::ReadAllVideoPlayers Video player read count: %lu", + static_cast(videoPlayerIndex)); return CHIP_NO_ERROR; } diff --git a/examples/window-app/nrfconnect/main/AppTask.cpp b/examples/window-app/nrfconnect/main/AppTask.cpp index 69d21a4455090f..119f8346c4cdda 100644 --- a/examples/window-app/nrfconnect/main/AppTask.cpp +++ b/examples/window-app/nrfconnect/main/AppTask.cpp @@ -23,8 +23,6 @@ #include -#include -#include #include #include #include diff --git a/examples/window-app/silabs/SiWx917/BUILD.gn b/examples/window-app/silabs/SiWx917/BUILD.gn index 4d020b040d70e7..1aa89a1e00be5a 100644 --- a/examples/window-app/silabs/SiWx917/BUILD.gn +++ b/examples/window-app/silabs/SiWx917/BUILD.gn @@ -43,15 +43,9 @@ declare_args() { OTA_periodic_query_timeout = 86400 # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false sl_wfx_config_softap = false sl_wfx_config_scan = true - # Disable LCD on supported devices - disable_lcd = true - # Argument to Disable IPv4 for wifi(rs911) chip_enable_wifi_ipv4 = false @@ -65,14 +59,6 @@ declare_args() { chip_default_wifi_psk = "" } -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - # Sanity check assert(!(chip_enable_wifi && chip_enable_openthread)) assert(!(use_rs911x && chip_enable_openthread)) diff --git a/examples/window-app/silabs/efr32/BUILD.gn b/examples/window-app/silabs/efr32/BUILD.gn index 7b832a852375df..7bc1bc4133727f 100644 --- a/examples/window-app/silabs/efr32/BUILD.gn +++ b/examples/window-app/silabs/efr32/BUILD.gn @@ -29,114 +29,11 @@ efr32_project_dir = "${project_dir}/silabs/efr32" examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32" examples_common_plat_dir = "${chip_root}/examples/platform/silabs" +import("${examples_plat_dir}/args.gni") + declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false - - # Monitor & log memory usage at runtime. - enable_heap_monitoring = false - - # Enable Sleepy end device - enable_sleepy_device = false - - # OTA timeout in seconds - OTA_periodic_query_timeout = 86400 - - # Wifi related stuff - they are overridden by gn -args="use_wf200=true" - use_wf200 = false - use_rs911x = false - use_rs911x_sockets = false - sl_wfx_config_softap = false - sl_wfx_config_scan = true - - # Disable LCD on supported devices - disable_lcd = false - - # Argument to Disable IPv4 for wifi(rs911) - chip_enable_wifi_ipv4 = false - - # Argument to force enable WPA3 security - rs91x_wpa3_only = false - - #default WiFi SSID - chip_default_wifi_ssid = "" - - #default Wifi Password - chip_default_wifi_psk = "" -} - -declare_args() { - # Enables LCD Qr Code on supported devices - show_qr_code = !disable_lcd -} - -# qr code cannot be true if lcd is disabled -assert(!(disable_lcd && show_qr_code)) - -# Sanity check -assert(!(chip_enable_wifi && chip_enable_openthread)) -assert(!(use_rs911x && chip_enable_openthread)) -assert(!(use_wf200 && chip_enable_openthread)) -if (chip_enable_wifi) { - assert(use_rs911x || use_wf200) - enable_openthread_cli = false - import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") -} - -# ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD) -if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" || - silabs_board == "BRD2703A" || silabs_board == "BRD4319A") { - show_qr_code = false - disable_lcd = true -} - -defines = [] - -# WiFi settings -if (chip_enable_wifi) { - if (chip_default_wifi_ssid != "") { - defines += [ - "CHIP_ONNETWORK_PAIRING=1", - "CHIP_WIFI_SSID=\"${chip_default_wifi_ssid}\"", - ] - } - if (chip_default_wifi_psk != "") { - assert(chip_default_wifi_ssid != "", - "ssid can't be null if psk is provided") - defines += [ "CHIP_WIFI_PSK=\"${chip_default_wifi_psk}\"" ] - } - wifi_sdk_dir = "${chip_root}/src/platform/silabs/EFR32/wifi" - efr32_lwip_defs = [ "LWIP_NETIF_API=1" ] - if (lwip_ipv4) { - efr32_lwip_defs += [ - "LWIP_IPV4=1", - - # adds following options to provide - # them to .cpp source files - # flags ported from lwipopts file - # TODO: move lwipopts to one location - "LWIP_ARP=1", - "LWIP_ICMP=1", - "LWIP_IGMP=1", - "LWIP_DHCP=1", - "LWIP_DNS=0", - ] - } else { - efr32_lwip_defs += [ "LWIP_IPV4=0" ] - } - if (lwip_ipv6) { - efr32_lwip_defs += [ "LWIP_IPV6=1" ] - } else { - efr32_lwip_defs += [ "LWIP_IPV6=0" ] - } - - if (use_rs911x) { - wiseconnect_sdk_root = - "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk" - import("${examples_plat_dir}/rs911x/rs911x.gni") - } else { - import("${examples_plat_dir}/wf200/wf200.gni") - } } efr32_sdk("sdk") { @@ -153,35 +50,9 @@ efr32_sdk("sdk") { "${examples_common_plat_dir}", ] - defines += [ - "BOARD_ID=${silabs_board}", - "OTA_PERIODIC_TIMEOUT=${OTA_periodic_query_timeout}", - ] - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - defines += rs911x_defs - include_dirs += rs911x_plat_incs - } else if (use_wf200) { - defines += wf200_defs - include_dirs += wf200_plat_incs - } - - if (use_rs911x_sockets) { - include_dirs += [ "${examples_plat_dir}/wifi/rsi-sockets" ] - defines += rs911x_sock_defs - } else { - # Using LWIP instead of the native TCP/IP stack - defines += efr32_lwip_defs - } - - if (sl_wfx_config_softap) { - defines += [ "SL_WFX_CONFIG_SOFTAP" ] - } - if (sl_wfx_config_scan) { - defines += [ "SL_WFX_CONFIG_SCAN" ] - } + if (use_wf200) { + # TODO efr32_sdk should not need a header from this location + include_dirs += [ "${examples_plat_dir}/wf200" ] } } @@ -196,105 +67,22 @@ efr32_executable("window_app") { defines = [] sources = [ - "${examples_common_plat_dir}/heap_4_silabs.c", - "${examples_plat_dir}/efr32_utils.cpp", - "${examples_plat_dir}/init_efrPlatform.cpp", - "${examples_plat_dir}/matter_config.cpp", "${project_dir}/common/src/WindowApp.cpp", "${project_dir}/common/src/ZclCallbacks.cpp", "src/WindowAppImpl.cpp", "src/main.cpp", ] - if (use_wstk_leds) { - sources += [ "${examples_plat_dir}/LEDWidget.cpp" ] - } - - if (chip_build_libshell || enable_openthread_cli || use_wf200 || use_rs911x) { - sources += [ "${examples_plat_dir}/uart.cpp" ] + if (!disable_lcd) { + sources += [ "src/LcdPainter.cpp" ] } deps = [ ":sdk", - "${chip_root}/examples/providers:device_info_provider", - "${chip_root}/examples/window-app/common:window-common", - "${chip_root}/src/lib", - "${chip_root}/src/setup_payload", + "${examples_plat_dir}:efr32-common", + app_data_model, ] - # OpenThread Settings - if (chip_enable_openthread) { - deps += [ - "${chip_root}/third_party/openthread:openthread", - "${chip_root}/third_party/openthread:openthread-platform", - "${examples_plat_dir}:efr-matter-shell", - ] - } - - if (chip_enable_ota_requestor) { - defines += [ "EFR32_OTA_ENABLED" ] - sources += [ "${examples_plat_dir}/OTAConfig.cpp" ] - } - - # WiFi Settings - if (chip_enable_wifi) { - if (use_rs911x) { - sources += rs911x_src_plat - - # All the stuff from wiseconnect - sources += rs911x_src_sapi - - # Apparently - the rsi library needs this (though we may not use use it) - sources += rs911x_src_sock - include_dirs += rs911x_inc_plat - - if (use_rs911x_sockets) { - # - # Using native sockets inside RS911x - # - include_dirs += rs911x_sock_inc - } else { - # - # We use LWIP - not built-in sockets - # - sources += rs911x_src_lwip - } - } else if (use_wf200) { - sources += wf200_plat_src - include_dirs += wf200_plat_incs - } - - if (chip_enable_wifi_ipv4) { - defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ] - } - - if (rs91x_wpa3_only) { - # TODO: Change this macro once WF200 support is provided - defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ] - } - } - - if (!disable_lcd) { - sources += [ - "${examples_plat_dir}/display/demo-ui.c", - "${examples_plat_dir}/display/lcd.cpp", - "src/LcdPainter.cpp", - ] - include_dirs += [ "${examples_plat_dir}/display" ] - defines += [ "DISPLAY_ENABLED" ] - - if (show_qr_code) { - deps += [ "${chip_root}/examples/common/QRCode" ] - defines += [ "QR_CODE_ENABLED" ] - } - } - - if (enable_heap_monitoring) { - defines += [ "HEAP_MONITORING" ] - - sources += [ "${examples_common_plat_dir}/MemMonitoring.cpp" ] - } - ldscript = "${examples_plat_dir}/ldscripts/${silabs_family}.ld" inputs = [ ldscript ] @@ -315,16 +103,6 @@ efr32_executable("window_app") { "-Wl,SILABS_WIFI=1", ] } - - # Attestation Credentials - if (chip_build_platform_attestation_credentials_provider) { - deps += [ "${examples_plat_dir}:efr32-attestation-credentials" ] - } - - # Factory Data Provider - if (use_efr32_factory_data_provider) { - deps += [ "${examples_plat_dir}:efr32-factory-data-provider" ] - } } group("efr32") { diff --git a/examples/window-app/silabs/efr32/args.gni b/examples/window-app/silabs/efr32/args.gni index c7b087a4ee4f49..979b3fda6ce2dd 100644 --- a/examples/window-app/silabs/efr32/args.gni +++ b/examples/window-app/silabs/efr32/args.gni @@ -18,7 +18,10 @@ import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") +app_data_model = "${chip_root}/examples/window-app/common:window-common" chip_enable_ota_requestor = true chip_enable_openthread = true openthread_external_platform = "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32" + +use_base_app = false diff --git a/examples/window-app/silabs/efr32/build_for_wifi_args.gni b/examples/window-app/silabs/efr32/build_for_wifi_args.gni index 8a00db97bd958d..0110df318f0955 100644 --- a/examples/window-app/silabs/efr32/build_for_wifi_args.gni +++ b/examples/window-app/silabs/efr32/build_for_wifi_args.gni @@ -18,3 +18,5 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true +app_data_model = "${chip_root}/examples/window-app/common:window-common" +use_base_app = false diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/CHIPCirqueDaemon.py b/integrations/docker/ci-only-images/chip-cirque-device-base/CHIPCirqueDaemon.py index a24403cdfe1c7e..a96868a4593c67 100755 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/CHIPCirqueDaemon.py +++ b/integrations/docker/ci-only-images/chip-cirque-device-base/CHIPCirqueDaemon.py @@ -90,7 +90,7 @@ def CommandFactory(args): def ServerMain(args): extraOptions = { - "otbr-agent": ShellCommand(["otbr-agent", "-I", "wpan0", "spinel+hdlc+uart:///dev/ttyUSB0"]) + "otbr-agent": ShellCommand(["otbr-agent", "-I", "wpan0", "-B", "eth0", "spinel+hdlc+uart:///dev/ttyUSB0"]) } with Listener(SERVER_ADDRESS) as listener: diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh b/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh index 2bea878a71d95d..768a71b5c0e9e9 100755 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh +++ b/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh @@ -22,8 +22,12 @@ # This script expects to find a Dockerfile next to $0, so symlink # in an image name directory is the expected use case. -me=$(basename "$0") -cd "$(dirname "$0")" +set -xe + +SOURCE=${BASH_SOURCE[0]} +cd "$(dirname "$SOURCE")" + +SOURCE_DIR=$PWD ORG=${DOCKER_BUILD_ORG:-connectedhomeip} @@ -35,6 +39,13 @@ VERSION=${DOCKER_BUILD_VERSION:-$(sed 's/ .*//' version)} GITHUB_ACTION_RUN=${GITHUB_ACTION_RUN:-"0"} +REPO_DIR="$SOURCE_DIR/../../../../" + +if [[ "x$GITHUB_ACTION_RUN" = "x1" ]]; then + # Note: This script will be invoked in docker on CI, We should ensure CHIP repo to safe directory to silent git error messages. + git config --global --add safe.directory /home/runner/work/connectedhomeip/connectedhomeip +fi + # The image build will clone its own ot-br-posix checkout due to limitations of git submodule. # Using the same ot-br-posix version as chip OT_BR_POSIX=$REPO_DIR/third_party/ot-br-posix/repo @@ -85,10 +96,6 @@ else fi fi -SOURCE=${BASH_SOURCE[0]} -SOURCE_DIR=$(cd "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd) -REPO_DIR="$SOURCE_DIR/../../../../" - docker build -t "$ORG/$IMAGE" -f "$SOURCE_DIR/Dockerfile" "${BUILD_ARGS[@]}" --build-arg OT_BR_POSIX_CHECKOUT="$OT_BR_POSIX_CHECKOUT" "$SOURCE_DIR" if [[ -n GITHUB_ACTION_RUN ]]; then diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh b/integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh index ee7f5fa23ee397..4e5c754538a5f0 100755 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh +++ b/integrations/docker/ci-only-images/chip-cirque-device-base/cachekey.sh @@ -24,6 +24,10 @@ me=$(basename "$0") cd "$(dirname "$0")" +SOURCE=${BASH_SOURCE[0]} +SOURCE_DIR=$(cd "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd) +REPO_DIR="$SOURCE_DIR/../../../../" + # The image build will clone its own ot-br-posix checkout due to limitations of git submodule. # Using the same ot-br-posix version as chip OT_BR_POSIX=$REPO_DIR/third_party/ot-br-posix/repo diff --git a/integrations/docker/ci-only-images/chip-cirque-device-base/version b/integrations/docker/ci-only-images/chip-cirque-device-base/version index 2b2a18d2659ec8..4add8a3f3185ce 100644 --- a/integrations/docker/ci-only-images/chip-cirque-device-base/version +++ b/integrations/docker/ci-only-images/chip-cirque-device-base/version @@ -1 +1 @@ -0.4.20 +0.4.21 diff --git a/integrations/docker/images/chip-build-tizen-qemu/Dockerfile b/integrations/docker/images/chip-build-tizen-qemu/Dockerfile new file mode 100644 index 00000000000000..8d2c3abb2ecbe1 --- /dev/null +++ b/integrations/docker/images/chip-build-tizen-qemu/Dockerfile @@ -0,0 +1,180 @@ +ARG VERSION=latest +FROM connectedhomeip/chip-build-tizen:${VERSION} + +ENV TIZEN_IOT_QEMU_KERNEL $TIZEN_SDK_ROOT/iot-qemu-virt-zImage +ENV TIZEN_IOT_IMAGE_ROOT $TIZEN_SDK_ROOT/iot-rootfs.img +ENV TIZEN_IOT_IMAGE_DATA $TIZEN_SDK_ROOT/iot-sysdata.img + +# ------------------------------------------------------------------------------ +# Switch to the root user so we could install things +USER root + +# ------------------------------------------------------------------------------ +# Install QEMU and build dependencies +RUN set -x \ + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ + bc \ + genisoimage \ + qemu-system-arm \ + # Cleanup + && apt-get clean \ + && rm -rf /var/lib/apt/lists \ + && : # last line + +# It seems that Linux kernel does not support overlay FS with SMACK enabled. In +# order not to disable SMACK LSM support completely (it could break some tools +# in Tizen ecosystem) we will add "permissive" mode to SMACK. +COPY files/0001-smack-add-permissive-mode.patch $TIZEN_SDK_ROOT/files/ + +# ------------------------------------------------------------------------------ +# Build Tizen kernel +RUN set -x \ + && mkdir -p /tmp/workdir && cd /tmp/workdir \ + # Download Linux rpi4 kernel + && wget --progress=dot:giga -r -nd --no-parent -A 'rpi4-linux-kernel-*.src.rpm' \ + http://download.tizen.org/snapshots/tizen/$TIZEN_VERSION-unified/latest/repos/standard/source/ \ + # Prepare kernel source (Linux kernel + Tizen patchset) + && unrpm rpi4-linux-kernel-*.src.rpm \ + && tar -xJf linux-kernel-*.tar.xz \ + && rm linux-kernel-*.tar.xz \ + && cd linux-kernel-* \ + && zcat ../*-to-*.diff.gz | patch -p1 \ + && patch -p1 < $TIZEN_SDK_ROOT/files/0001-smack-add-permissive-mode.patch \ + # Compile + && export MAKEFLAGS=-j$(nproc) \ + && export ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- \ + && make tizen_bcm2711_defconfig \ + && ./scripts/config -e ARCH_VIRT \ + && ./scripts/config -e VIRTIO_MMIO -e HW_RANDOM_VIRTIO \ + && ./scripts/config -e VIRTIO_PCI -e VIRTIO_BLK \ + && ./scripts/config -e VIRTIO_NET -e VETH \ + && ./scripts/config -e IKCONFIG -e IKCONFIG_PROC \ + && ./scripts/config -e BT_HCIVHCI -e CRYPTO_USER_API_HASH -e CRYPTO_USER_API_SKCIPHER \ + && ./scripts/config -e OVERLAY_FS -e ISO9660_FS \ + && ./scripts/config -e SECURITY_SMACK_PERMISSIVE_MODE \ + && make olddefconfig \ + && make zImage \ + && mv arch/arm/boot/zImage $TIZEN_IOT_QEMU_KERNEL \ + # Cleanup + && rm -rf /tmp/workdir \ + && : # last line + +# ------------------------------------------------------------------------------ +# Create Tizen IoT File System +RUN set -x \ + && mkdir -p /tmp/workdir && cd /tmp/workdir \ + && SYSTEMD_SYSTEM=/usr/lib/systemd/system \ + # Download Tizen images + && wget --progress=dot:giga -r -nd --no-parent -A 'tizen-*.tar.gz' \ + http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/tizen-headless-armv7l/ \ + # Unpack + && tar -xzf tizen-*.tar.gz \ + && mv system-data.img $TIZEN_IOT_IMAGE_DATA \ + && mv rootfs.img $TIZEN_IOT_IMAGE_ROOT \ + # Install libguestfs and linux-image-generic required for in-place + # modifications of the rootfs image + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends libguestfs-tools linux-image-generic \ + # Add extra libraries to the root image + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda glob copy-in \ + $TIZEN_SDK_TOOLCHAIN/arm-tizen-linux-gnueabi/lib/libasan.so.* \ + $TIZEN_SDK_TOOLCHAIN/arm-tizen-linux-gnueabi/lib/libubsan.so.* \ + $TIZEN_SDK_SYSROOT/usr/lib/libcapi-network-thread.so.* \ + $TIZEN_SDK_SYSROOT/usr/lib/libnsd-dns-sd.so.* \ + /usr/lib/ \ + # Disable failing systemd services + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda glob rm $SYSTEMD_SYSTEM/deviced.service \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda glob rm $SYSTEMD_SYSTEM/mnt-inform.mount \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda glob rm $SYSTEMD_SYSTEM/murphyd.service \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda glob rm $SYSTEMD_SYSTEM/pulseaudio.service \ + # Mount Tizen system partition on /opt-ro instead of /opt + && SYSTEMD_UNIT_OPT_RO_MOUNT=$SYSTEMD_SYSTEM/opt\\x2dro.mount \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda ln-sf $SYSTEMD_UNIT_OPT_RO_MOUNT $SYSTEMD_SYSTEM/local-fs.target.requires \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda mv $SYSTEMD_SYSTEM/opt.mount $SYSTEMD_UNIT_OPT_RO_MOUNT \ + && virt-edit $TIZEN_IOT_IMAGE_ROOT -e 's#/opt#/opt-ro#g' $SYSTEMD_UNIT_OPT_RO_MOUNT \ + && virt-edit $TIZEN_IOT_IMAGE_ROOT -e 's#Options=#Options=ro,#' $SYSTEMD_UNIT_OPT_RO_MOUNT \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda mkdir /opt-ro \ + # Create /tmp/.opt-upper and /tmp/.opt-work after /tmp is mounted + && SYSTEMD_UNIT_OPT_PRE_MOUNT=$SYSTEMD_SYSTEM/opt.pre-mount.service \ + && echo -n \ + "[Unit]\n" \ + "DefaultDependencies=no\n" \ + "RequiresMountsFor=/tmp\n" \ + "[Service]\n" \ + "Type=oneshot\n" \ + "ExecStart=mkdir -p /tmp/.opt-upper /tmp/.opt-work\n" \ + "RemainAfterExit=yes\n" \ + | guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda upload - $SYSTEMD_UNIT_OPT_PRE_MOUNT \ + # Mount Tizen system partition as a tmp-based overlay + && SYSTEMD_UNIT_OPT_MOUNT=$SYSTEMD_SYSTEM/opt.mount \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda ln-sf $SYSTEMD_UNIT_OPT_MOUNT $SYSTEMD_SYSTEM/local-fs.target.requires \ + && echo -n \ + "[Unit]\nConditionPathIsMountPoint=!/opt\n" \ + "RequiresMountsFor=/opt-ro /tmp\n" \ + "Wants=opt.pre-mount.service\n" \ + "After=opt.pre-mount.service\n" \ + "[Mount]\n" \ + "What=overlay\n" \ + "Where=/opt\n" \ + "Type=overlay\n" \ + "Options=lowerdir=/opt-ro,upperdir=/tmp/.opt-upper,workdir=/tmp/.opt-work\n" \ + | guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda upload - $SYSTEMD_UNIT_OPT_MOUNT \ + # Fix SMACK label for /tmp/.opt-work/work + && SYSTEMD_UNIT_OPT_POST_MOUNT=$SYSTEMD_SYSTEM/opt.post-mount.service \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda ln-sf $SYSTEMD_UNIT_OPT_POST_MOUNT $SYSTEMD_SYSTEM/local-fs.target.requires \ + && echo -n \ + "[Unit]\n" \ + "DefaultDependencies=no\n" \ + "RequiresMountsFor=/opt\n" \ + "[Service]\n" \ + "Type=oneshot\n" \ + "ExecStart=chsmack -a * /tmp/.opt-work/work\n" \ + "RemainAfterExit=yes\n" \ + | guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda upload - $SYSTEMD_UNIT_OPT_POST_MOUNT \ + # Mount Matter ISO image on startup + && SYSTEMD_UNIT_CHIP_MOUNT=$SYSTEMD_SYSTEM/mnt-chip.mount \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda ln-sf $SYSTEMD_UNIT_CHIP_MOUNT $SYSTEMD_SYSTEM/local-fs.target.requires \ + && echo -n \ + "[Unit]\n" \ + "ConditionPathIsMountPoint=!/mnt/chip\n" \ + "[Mount]\n" \ + "What=/dev/disk/by-label/CHIP\n" \ + "Where=/mnt/chip\n" \ + "Options=nofail\n" \ + | guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda upload - $SYSTEMD_UNIT_CHIP_MOUNT \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda mkdir /mnt/chip \ + # Setup auto-login for root user + && SYSTEMD_UNIT_SERIAL_GETTY=$SYSTEMD_SYSTEM/serial-getty@.service \ + && virt-edit $TIZEN_IOT_IMAGE_ROOT -e \ + 's#^ExecStart=.*#ExecStart=-/sbin/agetty -o "-p -f root" --noclear -a root --keep-baud 115200 %I \$TERM#' $SYSTEMD_UNIT_SERIAL_GETTY \ + # Execute launcher script after root login + && echo -n \ + "[ -x /launcher.sh ] && /launcher.sh\n" \ + | guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda upload - /root/.profile \ + # Launcher script + && echo -n \ + "#!/bin/bash\n" \ + "if [[ -x /mnt/chip/runner.sh ]]; then\n" \ + " echo '### RUNNER START ###'\n" \ + " /mnt/chip/runner.sh\n" \ + " echo '### RUNNER STOP:' $?\n" \ + "else\n" \ + " read -r -t 5 -p 'Press ENTER to access root shell...' && exit || echo ' timeout.'\n" \ + "fi\n" \ + "echo 'Shutting down emulated system...'\n" \ + "echo o > /proc/sysrq-trigger\n" \ + | guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda upload - /launcher.sh \ + && guestfish --rw -a $TIZEN_IOT_IMAGE_ROOT -m /dev/sda chmod 0755 /launcher.sh \ + # Remove ALL previously installed packages + && apt-get autopurge -fy $(tail -2 /var/log/apt/history.log | grep ^Install | cut -c 10- | sed 's/([^)]*),\?//g') \ + && rm -rf /var/lib/apt/lists \ + && rm -rf /var/tmp/.guestfs-0 \ + # Cleanup + && rm -rf /tmp/workdir \ + && : # last line + +# ------------------------------------------------------------------------------ +# Switch back to the non-root user +USER $USER_NAME +WORKDIR $USER_HOME diff --git a/integrations/docker/images/chip-build-tizen-qemu/build.sh b/integrations/docker/images/chip-build-tizen-qemu/build.sh new file mode 120000 index 00000000000000..fcb4d4ee75d531 --- /dev/null +++ b/integrations/docker/images/chip-build-tizen-qemu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen-qemu/files/0001-smack-add-permissive-mode.patch b/integrations/docker/images/chip-build-tizen-qemu/files/0001-smack-add-permissive-mode.patch new file mode 100644 index 00000000000000..2328f7fae4cb05 --- /dev/null +++ b/integrations/docker/images/chip-build-tizen-qemu/files/0001-smack-add-permissive-mode.patch @@ -0,0 +1,208 @@ +From: Chanho Park +Date: Tue, 3 Jun 2014 19:54:53 +0900 +Subject: [PATCH] LOCAL / smack: add permissive mode for debugging purpose + +This patch adds smack permissive mode. + +Signed-off-by: Chanho Park +Signed-off-by: Seung-Woo Kim +[k.kozlowski: rebased on 4.1] +Signed-off-by: Krzysztof Kozlowski +[m.szyprowski: rebased on 5.4] +Signed-off-by: Marek Szyprowski +--- + security/smack/Kconfig | 8 ++++ + security/smack/smack.h | 9 +++++ + security/smack/smack_access.c | 12 ++++++ + security/smack/smack_lsm.c | 11 ++++++ + security/smack/smackfs.c | 72 +++++++++++++++++++++++++++++++++++ + 5 files changed, 112 insertions(+) + +diff --git a/security/smack/Kconfig b/security/smack/Kconfig +index 5a8dfad469c3..39ded0b9bf38 100644 +--- a/security/smack/Kconfig ++++ b/security/smack/Kconfig +@@ -53,3 +53,11 @@ config SECURITY_SMACK_APPEND_SIGNALS + to differentiate between delivering a network packet and + delivering a signal in the Smack rules. + If you are unsure how to answer this question, answer N. ++ ++config SECURITY_SMACK_PERMISSIVE_MODE ++ bool "Enable Permissive mode for debugging purpose" ++ depends on SECURITY_SMACK ++ help ++ This selects the permissive mode of smack for debug purpose. This ++ do not block any access of the smack policy and just warn the block ++ by log message. +diff --git a/security/smack/smack.h b/security/smack/smack.h +index 335d2411abe4..9e8000c283cc 100644 +--- a/security/smack/smack.h ++++ b/security/smack/smack.h +@@ -424,6 +424,15 @@ static inline struct smack_known *smk_of_current(void) + return smk_of_task(smack_cred(current_cred())); + } + ++#ifdef CONFIG_SECURITY_SMACK_PERMISSIVE_MODE ++/* ++ * permissive mode ++ */ ++#define SMACK_PERMISSIVE_DENIED 0x0 ++#define SMACK_PERMISSIVE_ALLOWED 0x1 ++extern int permissive_mode; ++#endif ++ + /* + * logging functions + */ +diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c +index 38ac3da4e791..2b63a2643ef5 100644 +--- a/security/smack/smack_access.c ++++ b/security/smack/smack_access.c +@@ -45,6 +45,14 @@ LIST_HEAD(smack_known_list); + */ + static u32 smack_next_secid = 10; + ++/* ++ * are we running in permissive mode? ++ * can be overwritten at run-time by /smack/permissive ++ */ ++#ifdef CONFIG_SECURITY_SMACK_PERMISSIVE_MODE ++int permissive_mode = SMACK_PERMISSIVE_ALLOWED; ++#endif ++ + /* + * what events do we log + * can be overwritten at run-time by /smack/logging +@@ -200,6 +208,10 @@ int smk_access(struct smack_known *subject, struct smack_known *object, + smack_log(subject->smk_known, object->smk_known, + request, rc, a); + #endif ++#ifdef CONFIG_SECURITY_SMACK_PERMISSIVE_MODE ++ if (permissive_mode == SMACK_PERMISSIVE_ALLOWED) ++ return 0; ++#endif + + return rc; + } +diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c +index 12c0fa85d9f8..a8d2f81690e4 100644 +--- a/security/smack/smack_lsm.c ++++ b/security/smack/smack_lsm.c +@@ -4796,6 +4796,17 @@ static __init int smack_init(void) + return 0; + } + ++#ifdef CONFIG_SECURITY_SMACK_PERMISSIVE_MODE ++static int __init mode_setup(char *str) ++{ ++ unsigned long mode; ++ if (!kstrtoul(str, 10, &mode)) ++ permissive_mode = mode ? 1 : 0; ++ return 1; ++} ++__setup("permissive=", mode_setup); ++#endif ++ + /* + * Smack requires early initialization in order to label + * all processes and objects when they are created. +diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c +index c21b656b3263..fc033626085f 100644 +--- a/security/smack/smackfs.c ++++ b/security/smack/smackfs.c +@@ -59,6 +59,9 @@ enum smk_inos { + SMK_NET6ADDR = 23, /* single label IPv6 hosts */ + #endif /* CONFIG_IPV6 */ + SMK_RELABEL_SELF = 24, /* relabel possible without CAP_MAC_ADMIN */ ++#ifdef CONFIG_SECURITY_SMACK_PERMISSIVE_MODE ++ SMK_PERMISSIVE = 25, /* permissive mode */ ++#endif + }; + + /* +@@ -677,6 +680,71 @@ static const struct file_operations smk_load_ops = { + .release = seq_release, + }; + ++#ifdef CONFIG_SECURITY_SMACK_PERMISSIVE_MODE ++/** ++ * smk_read_permissive - read() for /smack/permissive ++ * @filp: file pointer, not actually used ++ * @buf: where to put the result ++ * @cn: maximum to send along ++ * @ppos: where to start ++ * ++ * Returns number of bytes read or error code, as appropriate ++ */ ++static ssize_t smk_read_permissive(struct file *filp, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ char temp[32]; ++ ssize_t rc; ++ ++ if (*ppos != 0) ++ return 0; ++ ++ sprintf(temp, "%d\n", permissive_mode); ++ rc = simple_read_from_buffer(buf, count, ppos, temp, strlen(temp)); ++ return rc; ++} ++ ++/** ++ * smk_write_permissive - write() for /smack/permissive ++ * @file: file pointer, not actually used ++ * @buf: where to get the data from ++ * @count: bytes sent ++ * @ppos: where to start ++ * ++ * Returns number of bytes written or error code, as appropriate ++ */ ++static ssize_t smk_write_permissive(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ char temp[32]; ++ int i; ++ ++ if (!capable(CAP_MAC_ADMIN)) ++ return -EPERM; ++ ++ if (count >= sizeof(temp) || count == 0) ++ return -EINVAL; ++ ++ if (copy_from_user(temp, buf, count) != 0) ++ return -EFAULT; ++ ++ temp[count] = '\0'; ++ ++ if (sscanf(temp, "%d", &i) != 1) ++ return -EINVAL; ++ if (i < 0 || i > 1) ++ return -EINVAL; ++ permissive_mode = i; ++ return count; ++} ++ ++static const struct file_operations smk_permissive_ops = { ++ .read = smk_read_permissive, ++ .write = smk_write_permissive, ++ .llseek = default_llseek, ++}; ++#endif /* End of CONFIG_SECURITY_SMACK_PERMISSIVE_MODE */ ++ + /** + * smk_cipso_doi - initialize the CIPSO domain + */ +@@ -2881,6 +2949,10 @@ static int smk_fill_super(struct super_block *sb, struct fs_context *fc) + [SMK_UNCONFINED] = { + "unconfined", &smk_unconfined_ops, S_IRUGO|S_IWUSR}, + #endif ++#ifdef CONFIG_SECURITY_SMACK_PERMISSIVE_MODE ++ [SMK_PERMISSIVE] = { ++ "permissive", &smk_permissive_ops, S_IRUGO|S_IWUSR}, ++#endif + #if IS_ENABLED(CONFIG_IPV6) + [SMK_NET6ADDR] = { + "ipv6host", &smk_net6addr_ops, S_IRUGO|S_IWUSR}, +-- +2.17.1 + diff --git a/integrations/docker/images/chip-build-tizen-qemu/run.sh b/integrations/docker/images/chip-build-tizen-qemu/run.sh new file mode 120000 index 00000000000000..ccbd3501b330d9 --- /dev/null +++ b/integrations/docker/images/chip-build-tizen-qemu/run.sh @@ -0,0 +1 @@ +../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen-qemu/version b/integrations/docker/images/chip-build-tizen-qemu/version new file mode 120000 index 00000000000000..a4280acd348e7f --- /dev/null +++ b/integrations/docker/images/chip-build-tizen-qemu/version @@ -0,0 +1 @@ +../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-tizen/Dockerfile b/integrations/docker/images/chip-build-tizen/Dockerfile index 4aac9c1846f01a..f0334106b6cbbe 100644 --- a/integrations/docker/images/chip-build-tizen/Dockerfile +++ b/integrations/docker/images/chip-build-tizen/Dockerfile @@ -33,15 +33,13 @@ RUN set -x \ ENV TIZEN_VERSION 6.0 ENV TIZEN_SDK_ROOT /opt/tizen-sdk -COPY tizen-sdk-installer /tmp/tizen-sdk-installer +COPY tizen-sdk-installer $TIZEN_SDK_ROOT/files/installer RUN set -x \ - && bash /tmp/tizen-sdk-installer/install.sh \ + && bash $TIZEN_SDK_ROOT/files/installer/install.sh \ --tizen-sdk-path $TIZEN_SDK_ROOT \ --tizen-sdk-data-path $USER_HOME/tizen-sdk-data \ --tizen-version $TIZEN_VERSION \ --override-secret-tool \ - # Cleanup - && rm -rf /tmp/tizen-sdk-installer \ && : # last line # ------------------------------------------------------------------------------ diff --git a/integrations/docker/images/chip-build/Dockerfile b/integrations/docker/images/chip-build/Dockerfile index 8c0eaf7e486010..7b2f5c4593e3d3 100644 --- a/integrations/docker/images/chip-build/Dockerfile +++ b/integrations/docker/images/chip-build/Dockerfile @@ -95,7 +95,7 @@ RUN set -x \ && : # last line RUN set -x \ - && pip3 install \ + && pip3 install --no-cache-dir \ attrs \ click \ coloredlogs \ @@ -109,8 +109,6 @@ RUN set -x \ pygit \ PyGithub \ tabulate \ - # Cleanup - && pip3 cache purge \ && : # last line # build and install gn @@ -151,7 +149,7 @@ RUN set -x \ # Save clang-12 files, so we can restore them after build dependencies cleanup && tar -cf clang-12-files.tar $(dpkg -L libclang-common-12-dev |grep /include) /usr/lib/llvm-12/lib/libLLVM-12.so.1 \ # Cleanup build dependencies - && apt autoremove -fy clang-12 libclang-12-dev \ + && apt autopurge -fy clang-12 libclang-12-dev \ && rm -rf /var/lib/apt/lists/ \ # Restore clang-12 files && tar -xf clang-12-files.tar -C / \ @@ -168,6 +166,7 @@ RUN set -x \ ENV LD_LIBRARY_PATH_TSAN=/usr/lib/x86_64-linux-gnu-tsan RUN set -x \ && mkdir -p $LD_LIBRARY_PATH_TSAN \ + && export CCACHE_DISABLE=1 PYTHONDONTWRITEBYTECODE=1 \ && GLIB_VERSION=$(pkg-config --modversion glib-2.0) \ && git clone --depth=1 --branch=$GLIB_VERSION https://github.com/GNOME/glib.git \ && CFLAGS="-O2 -g -fsanitize=thread" meson glib/build glib \ diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 0eb25cce600a57..d003f9e89eb144 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.6.37 Version bump reason: removed ZAP from docker as CIPD now has it. +0.6.38 Version bump reason: [Tizen] Add QEMU docker image for running tests diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index 0514668098f7d2..b78d318e387d7a 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb # ZAP Development install, so that it runs on both x64 and arm64 # Generally this should match with the ZAP version that is used for codegen within the # specified SHA -ARG ZAP_VERSION=v2023.01.19-nightly +ARG ZAP_VERSION=v2023.01.31-nightly # Ensure TARGETPLATFORM is set RUN case ${TARGETPLATFORM} in \ diff --git a/scripts/build_python.sh b/scripts/build_python.sh index 9247b873d568ee..866244c7e5379b 100755 --- a/scripts/build_python.sh +++ b/scripts/build_python.sh @@ -63,6 +63,7 @@ Input Options: no: Do not install build-env: install to virtual env for build matter separate: install to another virtual env (out/python_env) + -z --pregen_dir DIRECTORY Directory where generated zap files have been pre-generated. " } @@ -94,6 +95,10 @@ while (($#)); do install_wheel=$2 shift ;; + --pregen_dir | -z) + pregen_dir=$2 + shift + ;; -*) help echo "Unknown Option \"$1\"" @@ -104,7 +109,7 @@ while (($#)); do done # Print input values -echo "Input values: chip_detail_logging = $chip_detail_logging , chip_mdns = \"$chip_mdns\", enable_pybindings = $enable_pybindings, chip_case_retry_delta=\"$chip_case_retry_delta\"" +echo "Input values: chip_detail_logging = $chip_detail_logging , chip_mdns = \"$chip_mdns\", enable_pybindings = $enable_pybindings, chip_case_retry_delta=\"$chip_case_retry_delta\", pregen_dir=\"$pregen_dir\"" # Ensure we have a compilation environment source "$CHIP_ROOT/scripts/activate.sh" @@ -112,8 +117,9 @@ source "$CHIP_ROOT/scripts/activate.sh" # Generates ninja files [[ -n "$chip_mdns" ]] && chip_mdns_arg="chip_mdns=\"$chip_mdns\"" || chip_mdns_arg="" [[ -n "$chip_case_retry_delta" ]] && chip_case_retry_arg="chip_case_retry_delta=$chip_case_retry_delta" || chip_case_retry_arg="" +[[ -n "$pregen_dir" ]] && pregen_dir_arg="chip_code_pre_generated_directory=\"$pregen_dir\"" || pregen_dir_arg="" -gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_project_config_include_dirs=[\"//config/python\"] $chip_mdns_arg $chip_case_retry_arg" +gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_project_config_include_dirs=[\"//config/python\"] $chip_mdns_arg $chip_case_retry_arg $pregen_dir_arg" # Compiles python files # Check pybindings was requested diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersGlobalStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersGlobalStructs.jinja index 0fcee9b1efe45d..8486f07211fe74 100644 --- a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersGlobalStructs.jinja +++ b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersGlobalStructs.jinja @@ -1,6 +1,5 @@ #pragma once -#include #include #include diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja index 66aebf7d9d02cd..698da602ccf698 100644 --- a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja +++ b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja @@ -1,5 +1,3 @@ -#include - #include #include "bridge/BridgeGlobalStructs.h" diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h index 3b56a6f868b109..d3e85ed7e34601 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h index 3b56a6f868b109..d3e85ed7e34601 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h index 4b67ca9cbaeefe..d448f606c747ac 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h index 3b56a6f868b109..d3e85ed7e34601 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h index 3b56a6f868b109..d3e85ed7e34601 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include diff --git a/scripts/py_matter_yamltests/matter_yamltests/constraints.py b/scripts/py_matter_yamltests/matter_yamltests/constraints.py index a41f584ae793f7..b186fb1bef6282 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/constraints.py +++ b/scripts/py_matter_yamltests/matter_yamltests/constraints.py @@ -24,11 +24,6 @@ def __init__(self, message): super().__init__(message) -class ConstraintValidationError(Exception): - def __init__(self, message): - super().__init__(message) - - class BaseConstraint(ABC): '''Constraint Interface''' @@ -37,18 +32,21 @@ def __init__(self, types: list, is_null_allowed: bool = False): self._types = types self._is_null_allowed = is_null_allowed - def is_met(self, value): + def is_met(self, value, value_type_name): if value is None: return self._is_null_allowed response_type = type(value) - if self._types and response_type not in self._types: - return False + if self._types: + found_type_match = any( + [issubclass(response_type, expected) for expected in self._types]) + if not found_type_match: + return False - return self.check_response(value) + return self.check_response(value, value_type_name) @abstractmethod - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: pass @@ -57,9 +55,15 @@ def __init__(self, has_value): super().__init__(types=[]) self._has_value = has_value - def check_response(self, value) -> bool: - raise ConstraintValidationError( - 'HasValue constraint currently not implemented') + def is_met(self, value, value_type_name): + # We are overriding the BaseConstraint of is_met since has value is a special case where + # we might not be expecting a value at all, but the basic null check in BaseConstraint + # is not what we want. + return self.check_response(value, value_type_name) + + def check_response(self, value, value_type_name) -> bool: + has_value = value is not None + return self._has_value == has_value class _ConstraintType(BaseConstraint): @@ -67,7 +71,7 @@ def __init__(self, type): super().__init__(types=[], is_null_allowed=True) self._type = type - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: success = False if self._type == 'boolean' and type(value) is bool: success = True @@ -75,8 +79,12 @@ def check_response(self, value) -> bool: success = True elif self._type == 'char_string' and type(value) is str: success = True + elif self._type == 'long_char_string' and type(value) is str: + success = True elif self._type == 'octet_string' and type(value) is bytes: success = True + elif self._type == 'long_octet_string' and type(value) is bytes: + success = True elif self._type == 'vendor_id' and type(value) is int: success = value >= 0 and value <= 0xFFFF elif self._type == 'device_type_id' and type(value) is int: @@ -105,9 +113,9 @@ def check_response(self, value) -> bool: success = value >= 0 and value <= 0xFFFFFFFF elif self._type == 'bitmap64' and type(value) is int: success = value >= 0 and value <= 0xFFFFFFFFFFFFFFFF - elif self._type == 'enum8' and type(value) is int: + elif self._type == 'enum8' and isinstance(value, int): success = value >= 0 and value <= 0xFF - elif self._type == 'enum16' and type(value) is int: + elif self._type == 'enum16' and isinstance(value, int): success = value >= 0 and value <= 0xFFFF elif self._type == 'Percent' and type(value) is int: success = value >= 0 and value <= 0xFF @@ -187,6 +195,8 @@ def check_response(self, value) -> bool: success = value >= -36028797018963967 and value <= 36028797018963967 elif self._type == 'nullable_int64s' and type(value) is int: success = value >= -9223372036854775807 and value <= 9223372036854775807 + else: + success = self._type == value_type_name return success @@ -195,7 +205,7 @@ def __init__(self, min_length): super().__init__(types=[str, bytes, list]) self._min_length = min_length - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return len(value) >= self._min_length @@ -204,7 +214,7 @@ def __init__(self, max_length): super().__init__(types=[str, bytes, list]) self._max_length = max_length - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return len(value) <= self._max_length @@ -213,7 +223,7 @@ def __init__(self, is_hex_string: bool): super().__init__(types=[str]) self._is_hex_string = is_hex_string - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return all(c in string.hexdigits for c in value) == self._is_hex_string @@ -222,7 +232,7 @@ def __init__(self, starts_with): super().__init__(types=[str]) self._starts_with = starts_with - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return value.startswith(self._starts_with) @@ -231,7 +241,7 @@ def __init__(self, ends_with): super().__init__(types=[str]) self._ends_with = ends_with - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return value.endswith(self._ends_with) @@ -240,7 +250,7 @@ def __init__(self, is_upper_case): super().__init__(types=[str]) self._is_upper_case = is_upper_case - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return value.isupper() == self._is_upper_case @@ -249,7 +259,7 @@ def __init__(self, is_lower_case): super().__init__(types=[str]) self._is_lower_case = is_lower_case - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return value.islower() == self._is_lower_case @@ -258,7 +268,7 @@ def __init__(self, min_value): super().__init__(types=[int, float], is_null_allowed=True) self._min_value = min_value - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return value >= self._min_value @@ -267,7 +277,7 @@ def __init__(self, max_value): super().__init__(types=[int, float], is_null_allowed=True) self._max_value = max_value - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return value <= self._max_value @@ -276,7 +286,7 @@ def __init__(self, contains): super().__init__(types=[list]) self._contains = contains - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return set(self._contains).issubset(value) @@ -285,7 +295,7 @@ def __init__(self, excludes): super().__init__(types=[list]) self._excludes = excludes - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return set(self._excludes).isdisjoint(value) @@ -294,7 +304,7 @@ def __init__(self, has_masks_set): super().__init__(types=[int]) self._has_masks_set = has_masks_set - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return all([(value & mask) == mask for mask in self._has_masks_set]) @@ -303,7 +313,7 @@ def __init__(self, has_masks_clear): super().__init__(types=[int]) self._has_masks_clear = has_masks_clear - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return all([(value & mask) == 0 for mask in self._has_masks_clear]) @@ -312,7 +322,7 @@ def __init__(self, not_value): super().__init__(types=[], is_null_allowed=True) self._not_value = not_value - def check_response(self, value) -> bool: + def check_response(self, value, value_type_name) -> bool: return value != self._not_value diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser.py b/scripts/py_matter_yamltests/matter_yamltests/parser.py index 9b6a4c80577a05..e60e0acd44bcaf 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/parser.py +++ b/scripts/py_matter_yamltests/matter_yamltests/parser.py @@ -233,6 +233,7 @@ def __init__(self, test: dict, config: dict, definitions: SpecDefinitions, pics_ argument_mapping = None response_mapping = None + response_mapping_name = None if self.is_attribute: attribute = definitions.get_attribute_by_name( @@ -242,6 +243,7 @@ def __init__(self, test: dict, config: dict, definitions: SpecDefinitions, pics_ attribute.definition.data_type.name) argument_mapping = attribute_mapping response_mapping = attribute_mapping + response_mapping_name = attribute.definition.data_type.name else: command = definitions.get_command_by_name( self.cluster, self.command) @@ -250,9 +252,11 @@ def __init__(self, test: dict, config: dict, definitions: SpecDefinitions, pics_ definitions, self.cluster, command.input_param) response_mapping = self._as_mapping( definitions, self.cluster, command.output_param) + response_mapping_name = command.output_param self.argument_mapping = argument_mapping self.response_mapping = response_mapping + self.response_mapping_name = response_mapping_name self.update_arguments(self.arguments_with_placeholders) self.update_response(self.response_with_placeholders) @@ -401,12 +405,13 @@ def __init__(self, test: _TestStepWithPlaceholders, runtime_config_variable_stor self._runtime_config_variable_storage = runtime_config_variable_storage self.arguments = copy.deepcopy(test.arguments_with_placeholders) self.response = copy.deepcopy(test.response_with_placeholders) - self._update_placeholder_values(self.arguments) - self._update_placeholder_values(self.response) - self._test.node_id = self._config_variable_substitution( - self._test.node_id) - test.update_arguments(self.arguments) - test.update_response(self.response) + if test.is_pics_enabled: + self._update_placeholder_values(self.arguments) + self._update_placeholder_values(self.response) + self._test.node_id = self._config_variable_substitution( + self._test.node_id) + test.update_arguments(self.arguments) + test.update_response(self.response) @property def is_enabled(self): @@ -580,13 +585,7 @@ def _response_error_validation(self, response, result): expected_error = self.response.get('error') if self.response else None - # Handle generic success/error - if type(response) is str and response == 'failure': - received_error = response - elif type(response) is str and response == 'success': - received_error = None - else: - received_error = response.get('error') + received_error = response.get('error') if expected_error and received_error and expected_error == received_error: result.success(check_type, error_success.format( @@ -682,26 +681,33 @@ def _response_constraints_validation(self, response, result): check_type = PostProcessCheckType.CONSTRAINT_VALIDATION error_success = 'Constraints check passed' error_failure = 'Constraints check failed' - error_name_does_not_exist = 'The test expects a value named "{name}" but it does not exists in the response."' + response_type_name = self._test.response_mapping_name for value in self.response['values']: if 'constraints' not in value: continue - expected_name = 'value' received_value = response.get('value') if not self.is_attribute: expected_name = value.get('name') if received_value is None or expected_name not in received_value: - result.error(check_type, error_name_does_not_exist.format( - name=expected_name)) - continue + received_value = None + else: + received_value = received_value.get( + expected_name) if received_value else None - received_value = received_value.get( - expected_name) if received_value else None + if self._test.response_mapping: + response_type_name = self._test.response_mapping.get( + expected_name) + else: + # We don't have a mapping for this type. This happens for pseudo clusters. + # If there is a constraint check for the type it is likely an incorrect + # constraint check by the test writter. + response_type_name = None constraints = get_constraints(value['constraints']) - if all([constraint.is_met(received_value) for constraint in constraints]): + + if all([constraint.is_met(received_value, response_type_name) for constraint in constraints]): result.success(check_type, error_success) else: # TODO would be helpful to be more verbose here @@ -716,7 +722,6 @@ def _maybe_save_as(self, response, result): if 'saveAs' not in value: continue - expected_name = 'value' received_value = response.get('value') if not self.is_attribute: expected_name = value.get('name') @@ -841,7 +846,14 @@ def __init__(self, test_file, pics_file, definitions): self.name = _value_or_none(data, 'name') self.PICS = _value_or_none(data, 'PICS') - self._parsing_config_variable_storage = _value_or_none(data, 'config') + self._parsing_config_variable_storage = data.get('config', {}) + + # These are a list of "KnownVariables". These are defaults the codegen used to use. This + # is added for legacy support of tests that expect to uses these "defaults". + self.__populate_default_config_if_missing('nodeId', 0x12345) + self.__populate_default_config_if_missing('endpoint', '') + self.__populate_default_config_if_missing('cluster', '') + self.__populate_default_config_if_missing('timeout', '90') pics_checker = PICSChecker(pics_file) tests = _value_or_none(data, 'tests') @@ -851,6 +863,10 @@ def __init__(self, test_file, pics_file, definitions): def update_config(self, key, value): self._parsing_config_variable_storage[key] = value + def __populate_default_config_if_missing(self, key, value): + if key not in self._parsing_config_variable_storage: + self._parsing_config_variable_storage[key] = value + def __load_yaml(self, test_file): with open(test_file) as f: loader = yaml.FullLoader diff --git a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/accessory_server_bridge.py b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/accessory_server_bridge.py new file mode 100644 index 00000000000000..dce65187763a81 --- /dev/null +++ b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/accessory_server_bridge.py @@ -0,0 +1,124 @@ +# +# Copyright (c) 2023 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the 'License'); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an 'AS IS' BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import sys +import xmlrpc.client + +_DEFAULT_KEY = 'default' +_IP = '127.0.0.1' +_PORT = 9000 + +if sys.platform == 'linux': + _IP = '10.10.10.5' + + +def _make_url(): + return f'http://{_IP}:{_PORT}/' + + +def _get_option(request, item_name: str, default_value=None): + if request.arguments: + values = request.arguments['values'] + for item in values: + name = item['name'] + value = item['value'] + if name == item_name: + return value + + return default_value + + +def _get_start_options(request): + options = [] + + if request.arguments: + values = request.arguments['values'] + for item in values: + name = item['name'] + value = item['value'] + + if name == 'discriminator': + options.append('--discriminator') + options.append(str(value)) + elif name == 'port': + options.append('--secured-device-port') + options.append(str(value)) + elif name == 'kvs': + options.append('--KVS') + options.append(str(value)) + elif name == 'minCommissioningTimeout': + options.append('--min_commissioning_timeout') + options.append(str(value)) + elif name == 'filepath': + options.append('--filepath') + options.append(str(value)) + elif name == 'otaDownloadPath': + options.append('--otaDownloadPath') + options.append(str(value)) + elif name == 'registerKey': + pass + else: + raise KeyError(f'Unknown key: {name}') + + return options + + +class AccessoryServerBridge(): + def start(request): + register_key = _get_option(request, 'registerKey', _DEFAULT_KEY) + options = _get_start_options(request) + + with xmlrpc.client.ServerProxy(_make_url(), allow_none=True) as proxy: + proxy.start(register_key, options) + + def stop(request): + register_key = _get_option(request, 'registerKey', _DEFAULT_KEY) + + with xmlrpc.client.ServerProxy(_make_url(), allow_none=True) as proxy: + proxy.stop(register_key) + + def reboot(request): + register_key = _get_option(request, 'registerKey', _DEFAULT_KEY) + + with xmlrpc.client.ServerProxy(_make_url(), allow_none=True) as proxy: + proxy.reboot(register_key) + + def factoryReset(request): + register_key = _get_option(request, 'registerKey', _DEFAULT_KEY) + + with xmlrpc.client.ServerProxy(_make_url(), allow_none=True) as proxy: + proxy.factoryReset(register_key) + + def waitForMessage(request): + register_key = _get_option(request, 'registerKey', _DEFAULT_KEY) + message = _get_option(request, 'message') + + with xmlrpc.client.ServerProxy(_make_url(), allow_none=True) as proxy: + proxy.waitForMessage(register_key, [message]) + + def createOtaImage(request): + otaImageFilePath = _get_option(request, 'otaImageFilePath') + rawImageFilePath = _get_option(request, 'rawImageFilePath') + rawImageContent = _get_option(request, 'rawImageContent') + + with xmlrpc.client.ServerProxy(_make_url(), allow_none=True) as proxy: + proxy.createOtaImage(otaImageFilePath, rawImageFilePath, rawImageContent) + + def compareFiles(request): + file1 = _get_option(request, 'file1') + file2 = _get_option(request, 'file2') + + with xmlrpc.client.ServerProxy(_make_url(), allow_none=True) as proxy: + proxy.compareFiles(file1, file2) diff --git a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/delay_commands.py b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/delay_commands.py index 285f3cd2163dfc..9cf90fab89b32c 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/delay_commands.py +++ b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/delay_commands.py @@ -17,6 +17,7 @@ import time from ..pseudo_cluster import PseudoCluster +from .accessory_server_bridge import AccessoryServerBridge class DelayCommands(PseudoCluster): @@ -31,3 +32,6 @@ async def WaitForMs(self, request): sys.stdout.flush() time.sleep(duration_in_ms / 1000) + + async def WaitForMessage(self, request): + AccessoryServerBridge.waitForMessage(request) diff --git a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/system_commands.py b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/system_commands.py index 41ca73e098618a..eb46438a3502b7 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/system_commands.py +++ b/scripts/py_matter_yamltests/matter_yamltests/pseudo_clusters/clusters/system_commands.py @@ -13,94 +13,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys -import xmlrpc.client - from ..pseudo_cluster import PseudoCluster - -DEFAULT_KEY = 'default' -IP = '127.0.0.1' -PORT = 9000 - -if sys.platform == 'linux': - IP = '10.10.10.5' - - -def make_url(): - return 'http://' + IP + ':' + str(PORT) + '/' - - -def get_register_key(request): - if request.arguments: - values = request.arguments['values'] - for item in values: - name = item['name'] - value = item['value'] - if name == 'registerKey': - return value - - return DEFAULT_KEY - - -def get_options(request): - options = [] - - if request.arguments: - values = request.arguments['values'] - for item in values: - name = item['name'] - value = item['value'] - - if name == 'discriminator': - options.append('--discriminator') - options.append(str(value)) - elif name == 'port': - options.append('--secured-device-port') - options.append(str(value)) - elif name == 'kvs': - options.append('--KVS') - options.append(str(value)) - elif name == 'minCommissioningTimeout': - options.append('--min_commissioning_timeout') - options.append(str(value)) - elif name == 'filepath': - options.append('--filepath') - options.append(str(value)) - elif name == 'otaDownloadPath': - options.append('--otaDownloadPath') - options.append(str(value)) - elif name == 'registerKey': - pass - else: - raise KeyError(f'Unknown key: {name}') - - return options +from .accessory_server_bridge import AccessoryServerBridge class SystemCommands(PseudoCluster): name = 'SystemCommands' async def Start(self, request): - register_key = get_register_key(request) - options = get_options(request) - - with xmlrpc.client.ServerProxy(make_url(), allow_none=True) as proxy: - proxy.start(register_key, options) + AccessoryServerBridge.start(request) async def Stop(self, request): - register_key = get_register_key(request) - - with xmlrpc.client.ServerProxy(make_url(), allow_none=True) as proxy: - proxy.stop(register_key) + AccessoryServerBridge.stop(request) async def Reboot(self, request): - register_key = get_register_key(request) - - with xmlrpc.client.ServerProxy(make_url(), allow_none=True) as proxy: - proxy.reboot(register_key) + AccessoryServerBridge.reboot(request) async def FactoryReset(self, request): - register_key = get_register_key(request) + AccessoryServerBridge.factoryReset(request) + + async def CreateOtaImage(self, request): + AccessoryServerBridge.createOtaImage(request) - with xmlrpc.client.ServerProxy(make_url(), allow_none=True) as proxy: - proxy.factoryReset(register_key) + async def CompareFiles(self, request): + AccessoryServerBridge.compareFiles(request) diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py index 49b34102482bc9..aecdf0cf0336f2 100644 --- a/scripts/tests/chiptest/__init__.py +++ b/scripts/tests/chiptest/__init__.py @@ -59,51 +59,26 @@ def _GetManualTests() -> Set[ManualTest]: # for this reason are marked as manual". # # We are working to get this list down to 0. - manualtests.add(ManualTest(yaml="OTA_SuccessfulTransfer.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACE_1_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACE_1_5.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACL_2_10.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACL_2_7.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACL_2_8.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACL_2_9.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_APBSC_9_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_BINFO_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CC_6_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CC_6_3.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CC_8_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CGEN_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CHANNEL_5_3.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DGETH_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DGETH_2_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DGGEN_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DGWIFI_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DRLK_2_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DRLK_2_3.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DRLK_2_5.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DRLK_2_7.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_LOWPOWER_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_LUNIT_3_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAINPUT_3_12.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAPLAYBACK_6_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAPLAYBACK_6_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAPLAYBACK_6_3.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAPLAYBACK_6_4.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_PCC_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_PS_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_SC_5_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_SC_5_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_TSTAT_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_TSTAT_2_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_TSUIC_2_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_WAKEONLAN_4_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_WNCV_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_WNCV_2_5.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestClusterMultiFabric.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestCommissionerNodeId.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestDiscovery.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestEvents.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestGroupMessaging.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestMultiAdmin.yaml", reason="TODO")) + manualtests.add(ManualTest(yaml="Test_TC_ACL_2_10.yaml", reason="TODO Event Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_ACL_2_7.yaml", reason="TODO Event Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_ACL_2_8.yaml", reason="TODO Event Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_ACL_2_9.yaml", reason="TODO Event Not Supported Yet")) + manualtests.add(ManualTest(yaml="TestEvents.yaml", reason="TODO Event Not Supported Yet")) + + manualtests.add(ManualTest(yaml="Test_TC_ACE_1_1.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_ACE_1_5.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_SC_5_1.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_SC_5_2.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + manualtests.add(ManualTest(yaml="TestCommissionerNodeId.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + + manualtests.add(ManualTest(yaml="TestClusterMultiFabric.yaml", reason="TODO Enum Mismatch")) + manualtests.add(ManualTest(yaml="TestGroupMessaging.yaml", reason="TODO Group Message Not Supported in chip-repl yet")) + manualtests.add(ManualTest(yaml="TestMultiAdmin.yaml", reason="TODO chip-repl hangs on command expected to fail")) + + # Failing, unclear why. Likely repl specific, used to pass however first + # failure point seems unrelated. Historically this seems (very?) flaky + # in repl. + manualtests.add(ManualTest(yaml="Test_TC_OO_2_4.yaml", reason="Flaky")) # Examples: # @@ -113,8 +88,7 @@ def _GetManualTests() -> Set[ManualTest]: # This is on purpose for now to make it harder to orphan files, however # we can reconsider as things evolve. manualtests.add(ManualTest(yaml="Config_Example.yaml", reason="Example")) - manualtests.add(ManualTest( - yaml="Config_Variables_Example.yaml", reason="Example")) + manualtests.add(ManualTest(yaml="Config_Variables_Example.yaml", reason="Example")) manualtests.add(ManualTest(yaml="PICS_Example.yaml", reason="Example")) manualtests.add(ManualTest(yaml="Response_Example.yaml", reason="Example")) manualtests.add(ManualTest(yaml="Test_Example.yaml", reason="Example")) diff --git a/scripts/tests/chiptest/accessories.py b/scripts/tests/chiptest/accessories.py index 67938c1b12514f..c3641d641171fa 100644 --- a/scripts/tests/chiptest/accessories.py +++ b/scripts/tests/chiptest/accessories.py @@ -13,11 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. +import filecmp import logging +import os +import subprocess import sys import threading from xmlrpc.server import SimpleXMLRPCServer +_DEFAULT_CHIP_ROOT = os.path.abspath( + os.path.join(os.path.dirname(__file__), '..', '..', '..')) + IP = '127.0.0.1' PORT = 9000 @@ -100,6 +106,26 @@ def waitForMessage(self, name, message): return accessory.waitForMessage(' '.join(message)) return False + def createOtaImage(self, otaImageFilePath, rawImageFilePath, rawImageContent): + # Write the raw image content + with open(rawImageFilePath, 'w') as rawFile: + rawFile.write(rawImageContent) + + # Add an OTA header to the raw file + otaImageTool = _DEFAULT_CHIP_ROOT + '/src/app/ota_image_tool.py' + cmd = [otaImageTool, 'create', '-v', '0xDEAD', '-p', '0xBEEF', '-vn', '2', + '-vs', "2.0", '-da', 'sha256', rawImageFilePath, otaImageFilePath] + s = subprocess.Popen(cmd) + s.wait() + if s.returncode != 0: + raise Exception('Cannot create OTA image file') + return True + + def compareFiles(self, file1, file2): + if filecmp.cmp(file1, file2, shallow=False) is False: + raise Exception('Files %s and %s do not match' % (file1, file2)) + return True + def __startXMLRPCServer(self): self.server = SimpleXMLRPCServer((IP, PORT)) @@ -108,6 +134,8 @@ def __startXMLRPCServer(self): self.server.register_function(self.reboot, 'reboot') self.server.register_function(self.factoryReset, 'factoryReset') self.server.register_function(self.waitForMessage, 'waitForMessage') + self.server.register_function(self.compareFiles, 'compareFiles') + self.server.register_function(self.createOtaImage, 'createOtaImage') self.server_thread = threading.Thread(target=self.server.serve_forever) self.server_thread.start() diff --git a/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py b/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py index f852d30c9b4a53..fada763dc15466 100644 --- a/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py +++ b/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py @@ -15,6 +15,7 @@ # limitations under the License. import atexit +import logging import os import tempfile import traceback @@ -32,7 +33,7 @@ from chip.ChipStack import * from chip.yaml.runner import ReplTestRunner from matter_yamltests.definitions import SpecDefinitionsFromPaths -from matter_yamltests.parser import TestParser +from matter_yamltests.parser import PostProcessCheckStatus, TestParser _DEFAULT_CHIP_ROOT = os.path.abspath( os.path.join(os.path.dirname(__file__), "..", "..", "..")) @@ -105,19 +106,24 @@ def _StackShutDown(): # Executing and validating test for test_step in yaml.tests: + if not test_step.is_pics_enabled: + continue test_action = runner.encode(test_step) # TODO if test_action is None we should see if it is a pseudo cluster. if test_action is None: raise Exception( f'Failed to encode test step {test_step.label}') - if not test_action.pics_enabled: - continue response = runner.execute(test_action) decoded_response = runner.decode(response) post_processing_result = test_step.post_process_response( decoded_response) if not post_processing_result.is_success(): + logging.warning(f"Test step failure in 'test_step.label'") + for entry in post_processing_result.entries: + if entry.state == PostProcessCheckStatus.SUCCESS: + continue + logging.warning("%s: %s", entry.state, entry.message) raise Exception(f'Test step failed {test_step.label}') except Exception: print(traceback.format_exc()) diff --git a/scripts/tests/cirque_tests.sh b/scripts/tests/cirque_tests.sh index b018117df6216a..07f243c8bc13ac 100755 --- a/scripts/tests/cirque_tests.sh +++ b/scripts/tests/cirque_tests.sh @@ -112,6 +112,11 @@ function cirquetest_bootstrap() { make NO_GRPC=1 install -j + if [[ "x$GITHUB_ACTION_RUN" = "x1" ]]; then + # Note: This script will be invoked in docker on CI, We should add CHIP repo to safe directory to silent git error messages. + git config --global --add safe.directory /home/runner/work/connectedhomeip/connectedhomeip + fi + "$REPO_DIR"/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh __cirquetest_build_ot_lazy diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index 3705970571fada..5fd71df91d0bec 100644 --- a/scripts/tools/zap/zap_execution.py +++ b/scripts/tools/zap/zap_execution.py @@ -23,7 +23,7 @@ # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many # files may need updating for versions # -MIN_ZAP_VERSION = '2023.1.19' +MIN_ZAP_VERSION = '2023.1.31' class ZapTool: diff --git a/scripts/zap.json b/scripts/zap.json index a130ca65df7c0d..9275eacb9ae7d3 100644 --- a/scripts/zap.json +++ b/scripts/zap.json @@ -3,7 +3,7 @@ { "path": "fuchsia/third_party/zap/${platform}", "platforms": ["linux-amd64", "mac-amd64", "windows-amd64"], - "tags": ["version:2@v2023.01.19-nightly.1"] + "tags": ["version:2@v2023.01.31-nightly.1"] } ] } diff --git a/src/app/CASESessionManager.cpp b/src/app/CASESessionManager.cpp index 9d4f3814943e42..3fca62d5cc37ed 100644 --- a/src/app/CASESessionManager.cpp +++ b/src/app/CASESessionManager.cpp @@ -30,7 +30,12 @@ CHIP_ERROR CASESessionManager::Init(chip::System::Layer * systemLayer, const CAS } void CASESessionManager::FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback * onConnection, - Callback::Callback * onFailure) + Callback::Callback * onFailure +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + , + uint8_t attemptCount +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES +) { ChipLogDetail(CASESessionManager, "FindOrEstablishSession: PeerId = [%d:" ChipLogFormatX64 "]", peerId.GetFabricIndex(), ChipLogValueX64(peerId.GetNodeId())); @@ -53,6 +58,10 @@ void CASESessionManager::FindOrEstablishSession(const ScopedNodeId & peerId, Cal } } +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + session->UpdateAttemptCount(attemptCount); +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + session->Connect(onConnection, onFailure); } diff --git a/src/app/CASESessionManager.h b/src/app/CASESessionManager.h index 1e901478aaf6b7..455ca0b3b36fe1 100644 --- a/src/app/CASESessionManager.h +++ b/src/app/CASESessionManager.h @@ -77,9 +77,17 @@ class CASESessionManager : public OperationalSessionReleaseDelegate, public Sess * * The `onFailure` callback may be called before the FindOrEstablishSession * call returns, for error cases that are detected synchronously. + * + * attemptCount can be used to automatically retry multiple times if session + * setup is not successful. */ void FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback * onConnection, - Callback::Callback * onFailure); + Callback::Callback * onFailure +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + , + uint8_t attemptCount = 1 +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + ); void ReleaseSessionsForFabric(FabricIndex fabricIndex); diff --git a/src/app/OperationalSessionSetup.cpp b/src/app/OperationalSessionSetup.cpp index f4e76ed700a370..a87741ea3a246b 100644 --- a/src/app/OperationalSessionSetup.cpp +++ b/src/app/OperationalSessionSetup.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include using namespace chip::Callback; @@ -49,7 +50,7 @@ void OperationalSessionSetup::MoveToState(State aTargetState) { if (mState != aTargetState) { - ChipLogDetail(Controller, "OperationalSessionSetup[%u:" ChipLogFormatX64 "]: State change %d --> %d", + ChipLogDetail(Discovery, "OperationalSessionSetup[%u:" ChipLogFormatX64 "]: State change %d --> %d", mPeerId.GetFabricIndex(), ChipLogValueX64(mPeerId.GetNodeId()), to_underlying(mState), to_underlying(aTargetState)); mState = aTargetState; @@ -70,7 +71,7 @@ bool OperationalSessionSetup::AttachToExistingSecureSession() if (!sessionHandle.HasValue()) return false; - ChipLogProgress(Controller, "Found an existing secure session to [%u:" ChipLogFormatX64 "]!", mPeerId.GetFabricIndex(), + ChipLogProgress(Discovery, "Found an existing secure session to [%u:" ChipLogFormatX64 "]!", mPeerId.GetFabricIndex(), ChipLogValueX64(mPeerId.GetNodeId())); mDeviceAddress = sessionHandle.Value()->AsSecureSession()->GetPeerAddress(); @@ -214,7 +215,7 @@ void OperationalSessionSetup::UpdateDeviceData(const Transport::PeerAddress & ad return; } - ChipLogError(Controller, "Received UpdateDeviceData in incorrect state"); + ChipLogError(Discovery, "Received UpdateDeviceData in incorrect state"); DequeueConnectionCallbacks(CHIP_ERROR_INCORRECT_STATE); // Do not touch `this` instance anymore; it has been destroyed in DequeueConnectionCallbacks. } @@ -304,7 +305,7 @@ void OperationalSessionSetup::DequeueConnectionCallbacks(CHIP_ERROR error) void OperationalSessionSetup::OnSessionEstablishmentError(CHIP_ERROR error) { VerifyOrReturn(mState != State::Uninitialized && mState != State::NeedsAddress, - ChipLogError(Controller, "HandleCASEConnectionFailure was called while the device was not initialized")); + ChipLogError(Discovery, "HandleCASEConnectionFailure was called while the device was not initialized")); if (CHIP_ERROR_TIMEOUT == error) { @@ -313,6 +314,17 @@ void OperationalSessionSetup::OnSessionEstablishmentError(CHIP_ERROR error) MoveToState(State::ResolvingAddress); return; } + +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + if (mRemainingAttempts > 0) + { + CHIP_ERROR err = ScheduleSessionSetupReattempt(); + if (err == CHIP_NO_ERROR) + { + return; + } + } +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES } DequeueConnectionCallbacks(error); @@ -322,7 +334,7 @@ void OperationalSessionSetup::OnSessionEstablishmentError(CHIP_ERROR error) void OperationalSessionSetup::OnSessionEstablished(const SessionHandle & session) { VerifyOrReturn(mState != State::Uninitialized, - ChipLogError(Controller, "HandleCASEConnected was called while the device was not initialized")); + ChipLogError(Discovery, "HandleCASEConnected was called while the device was not initialized")); if (!mSecureSession.Grab(session)) return; // Got an invalid session, do not change any state @@ -377,6 +389,17 @@ OperationalSessionSetup::~OperationalSessionSetup() CHIP_ERROR OperationalSessionSetup::LookupPeerAddress() { +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + if (mRemainingAttempts > 0) + { + --mRemainingAttempts; + } + if (mAttemptsDone < UINT8_MAX) + { + ++mAttemptsDone; + } +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + // NOTE: This is public API that can be used to update our stored peer // address even when we are in State::Connected, so we do not make any // MoveToState calls in this method. @@ -418,7 +441,7 @@ void OperationalSessionSetup::PerformAddressUpdate() CHIP_ERROR err = LookupPeerAddress(); if (err != CHIP_NO_ERROR) { - ChipLogError(Controller, "Failed to look up peer address: %" CHIP_ERROR_FORMAT, err.Format()); + ChipLogError(Discovery, "Failed to look up peer address: %" CHIP_ERROR_FORMAT, err.Format()); DequeueConnectionCallbacks(err); // Do not touch `this` instance anymore; it has been destroyed in DequeueConnectionCallbacks. return; @@ -435,9 +458,93 @@ void OperationalSessionSetup::OnNodeAddressResolutionFailed(const PeerId & peerI ChipLogError(Discovery, "OperationalSessionSetup[%u:" ChipLogFormatX64 "]: operational discovery failed: %" CHIP_ERROR_FORMAT, mPeerId.GetFabricIndex(), ChipLogValueX64(mPeerId.GetNodeId()), reason.Format()); + // Does it make sense to ScheduleSessionSetupReattempt() here? DNS-SD + // resolution has its own retry/backoff mechanisms, so if it's failed we + // have already done a lot of that. + // No need to modify any variables in `this` since call below releases `this`. DequeueConnectionCallbacks(reason); // Do not touch `this` instance anymore; it has been destroyed in DequeueConnectionCallbacks. } +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES +void OperationalSessionSetup::UpdateAttemptCount(uint8_t attemptCount) +{ + if (attemptCount == 0) + { + // Nothing to do. + return; + } + + if (mState != State::NeedsAddress) + { + // We're in the middle of an attempt already, so decrement attemptCount + // by 1 to account for that. + --attemptCount; + } + + if (attemptCount > mRemainingAttempts) + { + mRemainingAttempts = attemptCount; + } +} + +CHIP_ERROR OperationalSessionSetup::ScheduleSessionSetupReattempt() +{ + VerifyOrDie(mRemainingAttempts > 0); + // Try again, but not if things are in shutdown such that we can't get + // to a system layer, and not if we've run out of attempts. + if (!mInitParams.exchangeMgr->GetSessionManager() || !mInitParams.exchangeMgr->GetSessionManager()->SystemLayer()) + { + return CHIP_ERROR_INCORRECT_STATE; + } + + MoveToState(State::NeedsAddress); + System::Clock::Seconds16 timerDelay; + // Stop exponential backoff before our delays get too large. + // + // Note that mAttemptsDone is always > 0 here, because we have + // just finished one attempt. + VerifyOrDie(mAttemptsDone > 0); + static_assert(UINT16_MAX / CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_INITIAL_DELAY_SECONDS >= + (1 << CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_MAX_BACKOFF), + "Our backoff calculation will overflow."); + timerDelay = System::Clock::Seconds16( + static_cast(CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_INITIAL_DELAY_SECONDS + << min((mAttemptsDone - 1), CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_MAX_BACKOFF))); + CHIP_ERROR err = mInitParams.exchangeMgr->GetSessionManager()->SystemLayer()->StartTimer(timerDelay, TrySetupAgain, this); + // The cast on count() is needed because the type count() returns might not + // actually be uint16_t; on some platforms it's int. + ChipLogProgress(Discovery, + "OperationalSessionSetup:attempts done: %u, attempts left: %u, retry delay %us, status %" CHIP_ERROR_FORMAT, + mAttemptsDone, mRemainingAttempts, static_cast(timerDelay.count()), err.Format()); + return err; +} + +void OperationalSessionSetup::TrySetupAgain(System::Layer * systemLayer, void * state) +{ + auto * self = static_cast(state); + + CHIP_ERROR err = CHIP_NO_ERROR; + + if (self->mState != State::NeedsAddress) + { + err = CHIP_ERROR_INCORRECT_STATE; + } + else + { + self->MoveToState(State::ResolvingAddress); + err = self->LookupPeerAddress(); + if (err == CHIP_NO_ERROR) + { + return; + } + } + + // Give up; we're either in a bad state or could not start a lookup. + self->DequeueConnectionCallbacks(err); + // Do not touch `self` instance anymore; it has been destroyed in DequeueConnectionCallbacks. +} +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + } // namespace chip diff --git a/src/app/OperationalSessionSetup.h b/src/app/OperationalSessionSetup.h index 2eb86c25f6c1f4..029d355e25ef21 100644 --- a/src/app/OperationalSessionSetup.h +++ b/src/app/OperationalSessionSetup.h @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -158,7 +159,6 @@ class DLL_EXPORT OperationalSessionSetup : public SessionDelegate, } mClientPool = clientPool; - mSystemLayer = params.exchangeMgr->GetSessionManager()->SystemLayer(); mPeerId = peerId; mReleaseDelegate = releaseDelegate; mState = State::NeedsAddress; @@ -224,8 +224,13 @@ class DLL_EXPORT OperationalSessionSetup : public SessionDelegate, void OnNodeAddressResolved(const PeerId & peerId, const AddressResolve::ResolveResult & result) override; void OnNodeAddressResolutionFailed(const PeerId & peerId, CHIP_ERROR reason) override; +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + // Update our remaining attempt count to be at least the given value. + void UpdateAttemptCount(uint8_t attemptCount); +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + private: - enum class State + enum class State : uint8_t { Uninitialized, // Error state: OperationalSessionSetup is useless NeedsAddress, // No address known, lookup not started yet. @@ -237,7 +242,6 @@ class DLL_EXPORT OperationalSessionSetup : public SessionDelegate, CASEClientInitParams mInitParams; CASEClientPoolDelegate * mClientPool = nullptr; - System::Layer * mSystemLayer; // mCASEClient is only non-null if we are in State::Connecting or just // allocated it as part of an attempt to enter State::Connecting. @@ -247,10 +251,6 @@ class DLL_EXPORT OperationalSessionSetup : public SessionDelegate, Transport::PeerAddress mDeviceAddress = Transport::PeerAddress::UDP(Inet::IPAddress::Any); - void MoveToState(State aTargetState); - - State mState = State::Uninitialized; - SessionHolderWithDelegate mSecureSession; Callback::CallbackDeque mConnectionSuccess; @@ -261,8 +261,17 @@ class DLL_EXPORT OperationalSessionSetup : public SessionDelegate, /// This is used when a node address is required. chip::AddressResolve::NodeLookupHandle mAddressLookupHandle; + State mState = State::Uninitialized; + bool mPerformingAddressUpdate = false; +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + uint8_t mRemainingAttempts = 0; + uint8_t mAttemptsDone = 0; +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + + void MoveToState(State aTargetState); + CHIP_ERROR EstablishConnection(const ReliableMessageProtocolConfig & config); /* @@ -301,6 +310,18 @@ class DLL_EXPORT OperationalSessionSetup : public SessionDelegate, * This function will set new IP address, port and MRP retransmission intervals of the device. */ void UpdateDeviceData(const Transport::PeerAddress & addr, const ReliableMessageProtocolConfig & config); + +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + /** + * Schedule a setup reattempt, if possible. + */ + CHIP_ERROR ScheduleSessionSetupReattempt(); + + /** + * Helper for our backoff retry timer. + */ + static void TrySetupAgain(System::Layer * systemLayer, void * state); +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES }; } // namespace chip diff --git a/src/app/clusters/door-lock-server/door-lock-server-callback.cpp b/src/app/clusters/door-lock-server/door-lock-server-callback.cpp index 0259f6100516b4..3a319ab5d494f2 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-callback.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-callback.cpp @@ -195,3 +195,39 @@ emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayInd void __attribute__((weak)) emberAfPluginDoorLockLockoutStarted(chip::EndpointId endpointId, chip::System::Clock::Timestamp lockoutEndTime) {} + +bool __attribute__((weak)) +emberAfPluginDoorLockGetNumberOfFingerprintCredentialsSupported(chip::EndpointId endpointId, uint16_t & maxNumberOfCredentials) +{ + return false; +} + +bool __attribute__((weak)) +emberAfPluginDoorLockGetNumberOfFingerVeinCredentialsSupported(chip::EndpointId endpointId, uint16_t & maxNumberOfCredentials) +{ + return false; +} + +bool __attribute__((weak)) +emberAfPluginDoorLockGetNumberOfFaceCredentialsSupported(chip::EndpointId endpointId, uint16_t & maxNumberOfCredentials) +{ + return false; +} + +bool __attribute__((weak)) +emberAfPluginDoorLockGetFingerprintCredentialLengthConstraints(chip::EndpointId endpointId, uint8_t & minLen, uint8_t & maxLen) +{ + return false; +} + +bool __attribute__((weak)) +emberAfPluginDoorLockGetFingerVeinCredentialLengthConstraints(chip::EndpointId endpointId, uint8_t & minLen, uint8_t & maxLen) +{ + return false; +} + +bool __attribute__((weak)) +emberAfPluginDoorLockGetFaceCredentialLengthConstraints(chip::EndpointId endpointId, uint8_t & minLen, uint8_t & maxLen) +{ + return false; +} diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp index 35fc3c954dc40d..6fb25e34e3d02c 100644 --- a/src/app/clusters/door-lock-server/door-lock-server.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server.cpp @@ -1457,6 +1457,15 @@ DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId statusMin = GetAttribute(endpointId, Attributes::MinRFIDCodeLength::Id, Attributes::MinRFIDCodeLength::Get, minLen); statusMax = GetAttribute(endpointId, Attributes::MaxRFIDCodeLength::Id, Attributes::MaxRFIDCodeLength::Get, maxLen); break; + case CredentialTypeEnum::kFingerprint: + statusMin = statusMax = emberAfPluginDoorLockGetFingerprintCredentialLengthConstraints(endpointId, minLen, maxLen); + break; + case CredentialTypeEnum::kFingerVein: + statusMin = statusMax = emberAfPluginDoorLockGetFingerVeinCredentialLengthConstraints(endpointId, minLen, maxLen); + break; + case CredentialTypeEnum::kFace: + statusMin = statusMax = emberAfPluginDoorLockGetFaceCredentialLengthConstraints(endpointId, minLen, maxLen); + break; default: return DlStatus::kFailure; } @@ -1496,6 +1505,15 @@ bool DoorLockServer::getMaxNumberOfCredentials(chip::EndpointId endpointId, Cred case CredentialTypeEnum::kRfid: status = GetNumberOfRFIDCredentialsSupported(endpointId, maxNumberOfCredentials); break; + case CredentialTypeEnum::kFingerprint: + status = emberAfPluginDoorLockGetNumberOfFingerprintCredentialsSupported(endpointId, maxNumberOfCredentials); + break; + case CredentialTypeEnum::kFingerVein: + status = emberAfPluginDoorLockGetNumberOfFingerVeinCredentialsSupported(endpointId, maxNumberOfCredentials); + break; + case CredentialTypeEnum::kFace: + status = emberAfPluginDoorLockGetNumberOfFaceCredentialsSupported(endpointId, maxNumberOfCredentials); + break; default: return false; } @@ -2391,6 +2409,11 @@ bool DoorLockServer::credentialTypeSupported(chip::EndpointId endpointId, Creden return SupportsPIN(endpointId); case CredentialTypeEnum::kRfid: return SupportsRFID(endpointId); + case CredentialTypeEnum::kFingerprint: + case CredentialTypeEnum::kFingerVein: + return SupportsFingers(endpointId); + case CredentialTypeEnum::kFace: + return SupportsFace(endpointId); default: return false; } @@ -3778,8 +3801,19 @@ void MatterDoorLockClusterServerAttributeChangedCallback(const app::ConcreteAttr void DoorLockServer::DoorLockOnAutoRelockCallback(chip::EndpointId endpointId) { - emberAfDoorLockClusterPrintln("Door Auto relock timer expired. Locking..."); emberEventControlSetInactive(&DoorLockServer::Instance().AutolockEvent); - DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, OperationSourceEnum::kAuto); - emberAfPluginDoorLockOnAutoRelock(endpointId); + + Nullable lockState; + if (Attributes::LockState::Get(endpointId, lockState) != EMBER_ZCL_STATUS_SUCCESS || lockState.IsNull() || + lockState.Value() != DlLockState::kLocked) + { + emberAfDoorLockClusterPrintln("Door Auto relock timer expired. %s", "Locking..."); + + DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, OperationSourceEnum::kAuto); + emberAfPluginDoorLockOnAutoRelock(endpointId); + } + else + { + emberAfDoorLockClusterPrintln("Door Auto relock timer expired. %s", "Already locked."); + } } diff --git a/src/app/clusters/door-lock-server/door-lock-server.h b/src/app/clusters/door-lock-server/door-lock-server.h index edf6a439e7042a..3f8fab53e8cd62 100644 --- a/src/app/clusters/door-lock-server/door-lock-server.h +++ b/src/app/clusters/door-lock-server/door-lock-server.h @@ -992,3 +992,83 @@ bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t cr * @param lockoutEndTime Monotonic time of when lockout ends. */ void emberAfPluginDoorLockLockoutStarted(chip::EndpointId endpointId, chip::System::Clock::Timestamp lockoutEndTime); + +/** + * @brief This callback is called when the Door Lock server needs to find out + * the number of Fingerprint credentials supported, since there is no attribute + * that represents that value. + * + * @param[in] endpointId ID of the endpoint that contains the door lock. + * @param[out] maxNumberOfCredentials the number of Fingerprint credentials supported by the lock. + * + * @return false on failure, true on success. On failure, the cluster + * implementation will assume that 0 Fingerprint credentials are supported. + */ +bool emberAfPluginDoorLockGetNumberOfFingerprintCredentialsSupported(chip::EndpointId endpointId, + uint16_t & maxNumberOfCredentials); + +/** + * @brief This callback is called when the Door Lock server needs to find out + * the number of FingerVein credentials supported, since there is no attribute + * that represents that value. + * + * @param[in] endpointId ID of the endpoint that contains the door lock. + * @param[out] maxNumberOfCredentials the number of FingerVein credentials supported by the lock. + * + * @return false on failure, true on success. On failure, the cluster + * implementation will assume that 0 FingerVein credentials are supported. + */ +bool emberAfPluginDoorLockGetNumberOfFingerVeinCredentialsSupported(chip::EndpointId endpointId, uint16_t & maxNumberOfCredentials); + +/** + * @brief This callback is called when the Door Lock server needs to find out + * the number of Face credentials supported, since there is no attribute + * that represents that value. + * + * @param[in] endpointId ID of the endpoint that contains the door lock. + * @param[out] maxNumberOfCredentials the number of Face credentials supported by the lock. + * + * @return false on failure, true on success. On failure, the cluster + * implementation will assume that 0 Face credentials are supported. + */ +bool emberAfPluginDoorLockGetNumberOfFaceCredentialsSupported(chip::EndpointId endpointId, uint16_t & maxNumberOfCredentials); + +/** + * @brief This callback is called when the Door Lock server needs to find out + * the min and max lengths of Fingerprint credentials supported, since there are no + * attributes that represents those values. + * + * @param[in] endpointId ID of the endpoint that contains the door lock. + * @param[out] minLen the minimal length, in bytes, of a Fingerprint credential supported by the lock. + * @param[out] maxLen the minimal length, in bytes, of a Fingerprint credential supported by the lock. + * + * @return false on failure, true on success. + */ +bool emberAfPluginDoorLockGetFingerprintCredentialLengthConstraints(chip::EndpointId endpointId, uint8_t & minLen, + uint8_t & maxLen); + +/** + * @brief This callback is called when the Door Lock server needs to find out + * the min and max lengths of FingerVein credentials supported, since there are no + * attributes that represents those values. + * + * @param[in] endpointId ID of the endpoint that contains the door lock. + * @param[out] minLen the minimal length, in bytes, of a FingerVein credential supported by the lock. + * @param[out] maxLen the minimal length, in bytes, of a FingerVein credential supported by the lock. + * + * @return false on failure, true on success. + */ +bool emberAfPluginDoorLockGetFingerVeinCredentialLengthConstraints(chip::EndpointId endpointId, uint8_t & minLen, uint8_t & maxLen); + +/** + * @brief This callback is called when the Door Lock server needs to find out + * the min and max lengths of Face credentials supported, since there are no + * attributes that represents those values. + * + * @param[in] endpointId ID of the endpoint that contains the door lock. + * @param[out] minLen the minimal length, in bytes, of a Face credential supported by the lock. + * @param[out] maxLen the minimal length, in bytes, of a Face credential supported by the lock. + * + * @return false on failure, true on success. + */ +bool emberAfPluginDoorLockGetFaceCredentialLengthConstraints(chip::EndpointId endpointId, uint8_t & minLen, uint8_t & maxLen); diff --git a/src/app/clusters/ias-zone-client/README.md b/src/app/clusters/ias-zone-client/README.md new file mode 100644 index 00000000000000..f012e706d8cc86 --- /dev/null +++ b/src/app/clusters/ias-zone-client/README.md @@ -0,0 +1 @@ +The code was removed pending a Matter spec. diff --git a/src/app/clusters/ias-zone-client/ias-zone-client.cpp b/src/app/clusters/ias-zone-client/ias-zone-client.cpp deleted file mode 100644 index 0945d5a836564d..00000000000000 --- a/src/app/clusters/ias-zone-client/ias-zone-client.cpp +++ /dev/null @@ -1,567 +0,0 @@ -/** - * - * Copyright (c) 2020 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "ias-zone-client.h" -#include -#include -#include -#include -#include - -using namespace chip; -using namespace chip::app::Clusters::IasZone; -using namespace chip::app::Clusters::IasZone::Commands; - -//----------------------------------------------------------------------------- -// Globals - -IasZoneDevice emberAfIasZoneClientKnownServers[EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES]; - -typedef enum -{ - IAS_ZONE_CLIENT_STATE_NONE, - IAS_ZONE_CLIENT_STATE_DISCOVER_ENDPOINT, - IAS_ZONE_CLIENT_STATE_SET_CIE_ADDRESS, - IAS_ZONE_CLIENT_STATE_READ_CIE_ADDRESS, - IAS_ZONE_CLIENT_STATE_READ_ATTRIBUTES, -} IasZoneClientState; - -static IasZoneClientState iasZoneClientState = IAS_ZONE_CLIENT_STATE_NONE; -static uint8_t currentIndex = NO_INDEX; -static uint8_t myEndpoint = 0; - -EmberEventControl emberAfPluginIasZoneClientStateMachineEventControl; - -//----------------------------------------------------------------------------- -// Forward Declarations - -void readIasZoneServerAttributes(EmberNodeId nodeId); -static void iasClientSaveCommand(void); -static void iasClientLoadCommand(void); - -//----------------------------------------------------------------------------- -// Functions - -void emberAfIasZoneClusterClientInitCallback(EndpointId endpoint) -{ - emAfClearServers(); - myEndpoint = endpoint; - iasClientLoadCommand(); -} - -void emAfClearServers(void) -{ - MEMSET(emberAfIasZoneClientKnownServers, 0xFF, sizeof(IasZoneDevice) * EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES); -} - -static void clearState(void) -{ - currentIndex = 0; - iasZoneClientState = IAS_ZONE_CLIENT_STATE_NONE; -} - -static void setServerZoneStatus(uint8_t serverIndex, uint16_t zoneStatus) -{ - emberAfIasZoneClientKnownServers[serverIndex].zoneStatus = zoneStatus; - iasClientSaveCommand(); -} - -static void setServerIeee(uint8_t serverIndex, uint8_t * ieeeAddress) -{ - MEMCOPY(emberAfIasZoneClientKnownServers[serverIndex].ieeeAddress, ieeeAddress, EUI64_SIZE); - iasClientSaveCommand(); -} - -static void clearServerIeee(uint8_t serverIndex) -{ - MEMSET(emberAfIasZoneClientKnownServers[serverIndex].ieeeAddress, 0xFF, sizeof(IasZoneDevice)); - iasClientSaveCommand(); -} - -static void setServerNodeId(uint8_t serverIndex, EmberNodeId nodeId) -{ - emberAfIasZoneClientKnownServers[serverIndex].nodeId = nodeId; -} - -static void clearServerNodeId(uint8_t serverIndex) -{ - emberAfIasZoneClientKnownServers[serverIndex].nodeId = EMBER_NULL_NODE_ID; -} - -static void setServerZoneState(uint8_t serverIndex, uint8_t zoneState) -{ - emberAfIasZoneClientKnownServers[serverIndex].zoneState = zoneState; - iasClientSaveCommand(); -} - -static void setServerEndpoint(uint8_t serverIndex, EndpointId endpoint) -{ - emberAfIasZoneClientKnownServers[serverIndex].endpoint = endpoint; - iasClientSaveCommand(); -} - -static void setServerZoneType(uint8_t serverIndex, uint16_t zoneType) -{ - emberAfIasZoneClientKnownServers[serverIndex].zoneType = zoneType; - iasClientSaveCommand(); -} - -static void setServerZoneId(uint8_t serverIndex, uint16_t zoneId) -{ - emberAfIasZoneClientKnownServers[serverIndex].zoneId = zoneId; - iasClientSaveCommand(); -} - -static void setCurrentIndex(uint8_t serverIndex) -{ - currentIndex = serverIndex; - iasClientSaveCommand(); -} - -static void setIasZoneClientState(uint8_t clientState) -{ - iasZoneClientState = clientState; - iasClientSaveCommand(); -} - -static void iasClientSaveCommand(void) -{ -#if defined(EZSP_HOST) && !defined(EMBER_TEST) && defined(UNIX_HOST) - FILE * fp; - uint16_t i, j; - - // save zone server list - fp = fopen("iaszone.txt", "w"); - - for (i = 0; i < EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES; i++) - { - if (emberAfIasZoneClientKnownServers[i].zoneId != 0xFF) - { - fprintf(fp, "%x %x %x %x %x ", emberAfIasZoneClientKnownServers[i].zoneId, - emberAfIasZoneClientKnownServers[i].zoneStatus, emberAfIasZoneClientKnownServers[i].zoneState, - emberAfIasZoneClientKnownServers[i].endpoint, emberAfIasZoneClientKnownServers[i].zoneType); - for (j = 0; j < 8; j++) - { - fprintf(fp, "%x ", emberAfIasZoneClientKnownServers[i].ieeeAddress[j]); - } - } - } - // Write something to mark the end of the file. - fprintf(fp, "ff"); - int res = fclose(fp); - assert(res == 0); -#endif //#if defined(EZSP_HOST) && !defined(EMBER_TEST) && defined(UNIX_HOST) -} - -static void iasClientLoadCommand(void) -{ -#if defined(EZSP_HOST) && !defined(EMBER_TEST) && defined(UNIX_HOST) - FILE * fp; - uint16_t i, j; - - unsigned int data1, data2, data3, data4, data5; - - fp = fopen("iaszone.txt", "r"); - - if (!fp) - { - return; - } - - for (i = 0; i < EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES; i++) - { - if (feof(fp)) - { - break; - } - fscanf(fp, "%x ", &data1); - if (data1 == 0xff) - { - break; - } - fscanf(fp, "%x %x %x %x ", &data2, &data3, &data4, &data5); - - emberAfIasZoneClientKnownServers[i].zoneId = (uint8_t) data1; - emberAfIasZoneClientKnownServers[i].zoneStatus = (uint16_t) data2; - emberAfIasZoneClientKnownServers[i].zoneState = (uint8_t) data3; - emberAfIasZoneClientKnownServers[i].endpoint = (uint8_t) data4; - emberAfIasZoneClientKnownServers[i].zoneType = (uint16_t) data5; - - for (j = 0; j < 8; j++) - { - fscanf(fp, "%x ", &data1); - emberAfIasZoneClientKnownServers[i].ieeeAddress[j] = (uint8_t) data1; - } - } - int res = fclose(fp); - assert(res == 0); -#endif // #if defined(EZSP_HOST) && !defined(EMBER_TEST) && defined(UNIX_HOST) -} - -static uint8_t findIasZoneServerByIeee(uint8_t * ieeeAddress) -{ - uint8_t i; - for (i = 0; i < EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES; i++) - { - if (0 == memcmp(ieeeAddress, emberAfIasZoneClientKnownServers[i].ieeeAddress, EUI64_SIZE)) - { - return i; - } - } - return NO_INDEX; -} - -static uint8_t findIasZoneServerByNodeId(EmberNodeId nodeId) -{ - uint8_t i; - for (i = 0; i < EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES; i++) - { - if (nodeId == emberAfIasZoneClientKnownServers[i].nodeId) - { - return i; - } - } - - // If we didn't find the node ID in the table, see if the stack knows about - // it. - EmberEUI64 eui64; - if (emberLookupEui64ByNodeId(nodeId, eui64) == EMBER_SUCCESS) - { - i = findIasZoneServerByIeee(eui64); - if (i != NO_INDEX) - { - setServerNodeId(i, nodeId); - } - } - - return i; -} - -bool emberAfIasZoneClusterZoneStatusChangeNotificationCallback(app::CommandHandler * commandObj, uint16_t zoneStatus, - uint8_t extendedStatus, uint8_t zoneId, uint16_t delay) -{ - uint8_t serverIndex = findIasZoneServerByNodeId(emberAfCurrentCommand()->source); - uint8_t status = EMBER_ZCL_STATUS_NOT_FOUND; - if (serverIndex != NO_INDEX) - { - status = EMBER_ZCL_STATUS_SUCCESS; - setServerZoneStatus(serverIndex, zoneStatus); - - emberAfIasZoneClusterPrintln("Zone %d status change, 0x%2X from 0x%2X", zoneId, zoneStatus, - emberAfCurrentCommand()->source); - - // The Test case calls for readding attributes after status change. - // that is silly for the production device. - // readIasZoneServerAttributes(emberAfCurrentCommand()->source); - } - emberAfSendDefaultResponse(emberAfCurrentCommand(), status); - return true; -} - -bool emberAfIasZoneClusterZoneEnrollRequestCallback(app::CommandHandler * commandObj, uint16_t zoneType, uint16_t manufacturerCode) -{ - EmberAfIasEnrollResponseCode responseCode = EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT; - uint8_t zoneId = UNKNOWN_ZONE_ID; - uint8_t serverIndex = findIasZoneServerByNodeId(emberAfCurrentCommand()->source); - EmberStatus status; - - if (serverIndex != NO_INDEX) - { - responseCode = EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS; - zoneId = serverIndex; - setServerZoneId(serverIndex, zoneId); - } - emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_CLIENT_TO_SERVER), app::Clusters::IasZone::Id, - ZoneEnrollResponse::Id, "uu", responseCode, zoneId); - // Need to send this command with our source EUI because the server will - // check our EUI64 against his CIE Address to see if we're his CIE. - emberAfGetCommandApsFrame()->options |= EMBER_APS_OPTION_SOURCE_EUI64; - status = emberAfSendResponse(); - emberAfCorePrintln("Sent enroll response with responseCode: 0x%X, zoneId: 0x%X, status: 0x%X", responseCode, zoneId, status); - return true; -} - -void emberAfPluginIasZoneClientStateMachineEventHandler(void) -{ - emberAfIasZoneClusterPrintln("IAS Zone Client Timeout waiting for message response."); - emberEventControlSetInactive(emberAfPluginIasZoneClientStateMachineEventControl); - clearState(); -} - -static uint8_t addServer(EmberNodeId nodeId, uint8_t * ieeeAddress) -{ - uint8_t i = findIasZoneServerByIeee(ieeeAddress); - if (i != NO_INDEX) - { - return i; - } - - for (i = 0; i < EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES; i++) - { - const uint8_t unsetEui64[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; - if (0 == memcmp(emberAfIasZoneClientKnownServers[i].ieeeAddress, unsetEui64, EUI64_SIZE)) - { - setServerIeee(i, ieeeAddress); - setServerNodeId(i, nodeId); - setServerEndpoint(i, UNKNOWN_ENDPOINT); - return i; - } - } - return NO_INDEX; -} - -static void removeServer(uint8_t * ieeeAddress) -{ - uint8_t index = findIasZoneServerByIeee(ieeeAddress); - clearServerIeee(index); - clearServerNodeId(index); -} - -static EmberStatus sendCommand(EmberNodeId destAddress) -{ - emberAfSetCommandEndpoints(myEndpoint, emberAfIasZoneClientKnownServers[currentIndex].endpoint); - EmberStatus status = emberAfSendCommandUnicast(MessageSendDestination::Direct(destAddress)); - emberAfIasZoneClusterPrintln("Sent IAS Zone Client Command to 0x%2X (%d -> %d) status: 0x%X", destAddress, myEndpoint, - emberAfIasZoneClientKnownServers[currentIndex].endpoint, status); - if (status != EMBER_SUCCESS) - { - clearState(); - } - return status; -} - -static void setCieAddress(EmberNodeId destAddress) -{ -#error "This needs to be fixed to handle 4-byte attribute ids" - - uint8_t writeAttributes[] = { - EMBER_LOW_BYTE(Attributes::IasCieAddress::Id), - EMBER_HIGH_BYTE(Attributes::IasCieAddress::Id), - ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, // ieee (filled in later) - }; - emberAfGetEui64(&writeAttributes[3]); - emberAfFillExternalBuffer((ZCL_GLOBAL_COMMAND | ZCL_FRAME_CONTROL_CLIENT_TO_SERVER), app::Clusters::IasZone::Id, - ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributes, sizeof(writeAttributes)); - emberAfIasZoneClusterPrintln("Writing CIE Address to IAS Zone Server"); - if (EMBER_SUCCESS == sendCommand(destAddress)) - { - setIasZoneClientState(IAS_ZONE_CLIENT_STATE_SET_CIE_ADDRESS); - } -} - -static void iasZoneClientServiceDiscoveryCallback(const EmberAfServiceDiscoveryResult * result) -{ - if (result->status == EMBER_AF_UNICAST_SERVICE_DISCOVERY_COMPLETE_WITH_RESPONSE && - result->zdoRequestClusterId == MATCH_DESCRIPTORS_REQUEST) - { - const EmberAfEndpointList * endpointList = (const EmberAfEndpointList *) result->responseData; - if (endpointList->count > 0) - { - setServerEndpoint(currentIndex, endpointList->list[0]); - emberAfIasZoneClusterPrintln("Device 0x%2X supports IAS Zone Server", result->matchAddress); - setCieAddress(result->matchAddress); - return; - } - } - clearState(); -} - -static void checkForIasZoneServer(EmberNodeId emberNodeId, uint8_t * ieeeAddress) -{ - uint8_t endpointIndex = emberAfIndexFromEndpoint(myEndpoint); - uint8_t serverIndex = addServer(emberNodeId, ieeeAddress); - - if (serverIndex == NO_INDEX) - { - emberAfIasZoneClusterPrintln("Error: Could not add IAS Zone server."); - return; - } - - setCurrentIndex(serverIndex); - - if (emberAfIasZoneClientKnownServers[serverIndex].endpoint != UNKNOWN_ENDPOINT) - { - // If a remote endpoint that you have already seen announces itself, - // write your IEEE in them just in case they left and are rejoining. --agkeesle - // Bug: EMAPPFWKV2-1078 - setCieAddress(emberNodeId); - emberAfIasZoneClusterPrintln("Node 0x%2X already known to IAS client", emberNodeId); - return; - } - - EmberStatus status = emberAfFindDevicesByCluster(emberNodeId, app::Clusters::IasZone::Id, - true, // server cluster? - iasZoneClientServiceDiscoveryCallback); - - if (status != EMBER_SUCCESS) - { - emberAfIasZoneClusterPrintln("Error: Failed to initiate service discovery for IAS Zone Server 0x%2X", emberNodeId); - clearState(); - } -} - -void emberAfPluginIasZoneClientZdoMessageReceivedCallback(EmberNodeId emberNodeId, EmberApsFrame * apsFrame, uint8_t * message, - uint16_t length) -{ - emberAfIasZoneClusterPrintln("Incoming ZDO, Cluster: 0x%2X", apsFrame->clusterId); - if (apsFrame->clusterId == END_DEVICE_ANNOUNCE) - { - checkForIasZoneServer(emberNodeId, &(message[3])); - } -} - -void readIasZoneServerAttributes(EmberNodeId nodeId) -{ -#error "This needs to be fixed to handle 4-byte attribute ids" - - uint8_t iasZoneAttributeIds[] = { - EMBER_LOW_BYTE(Attributes::ZoneState::Id), EMBER_HIGH_BYTE(Attributes::ZoneState::Id), - - EMBER_LOW_BYTE(Attributes::ZoneType::Id), EMBER_HIGH_BYTE(Attributes::ZoneType::Id), - - EMBER_LOW_BYTE(Attributes::ZoneStatus::Id), EMBER_HIGH_BYTE(Attributes::ZoneStatus::Id), - }; - emberAfFillExternalBuffer((ZCL_GLOBAL_COMMAND | ZCL_FRAME_CONTROL_CLIENT_TO_SERVER), app::Clusters::IasZone::Id, - ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", iasZoneAttributeIds, sizeof(iasZoneAttributeIds)); - if (EMBER_SUCCESS == sendCommand(nodeId)) - { - setIasZoneClientState(IAS_ZONE_CLIENT_STATE_READ_ATTRIBUTES); - } -} - -void readIasZoneServerCieAddress(EmberNodeId nodeId) -{ -#error "This needs to be fixed to handle 4-byte attribute ids" - - uint8_t iasZoneAttributeIds[] = { - EMBER_LOW_BYTE(Attributes::IasCieAddress::Id), - EMBER_HIGH_BYTE(Attributes::IasCieAddress::Id), - }; - emberAfFillExternalBuffer((ZCL_GLOBAL_COMMAND | ZCL_FRAME_CONTROL_CLIENT_TO_SERVER), app::Clusters::IasZone::Id, - ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", iasZoneAttributeIds, sizeof(iasZoneAttributeIds)); - if (EMBER_SUCCESS == sendCommand(nodeId)) - { - setIasZoneClientState(IAS_ZONE_CLIENT_STATE_READ_CIE_ADDRESS); - } -} - -void emberAfPluginIasZoneClientWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) -{ - if (clusterId == app::Clusters::IasZone::Id && iasZoneClientState == IAS_ZONE_CLIENT_STATE_SET_CIE_ADDRESS && - buffer[0] == EMBER_ZCL_STATUS_SUCCESS) - { - readIasZoneServerCieAddress(emberAfCurrentCommand()->source); - return; - } - return; -} - -void emberAfPluginIasZoneClientReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) -{ - uint8_t zoneStatus, zoneType, zoneState; - if (clusterId == app::Clusters::IasZone::Id && - (iasZoneClientState == IAS_ZONE_CLIENT_STATE_READ_ATTRIBUTES || - iasZoneClientState == IAS_ZONE_CLIENT_STATE_READ_CIE_ADDRESS)) - { - uint16_t i = 0; - while ((i + 3) <= bufLen) - { // 3 to insure we can read at least the attribute ID - // and the status - AttributeId attributeId = buffer[i] + (buffer[i + 1] << 8); - uint8_t status = buffer[i + 2]; - i += 3; - // emberAfIasZoneClusterPrintln("Parsing Attribute 0x%2X, Status: 0x%X", attributeId, status); - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - if ((i + 1) > bufLen) - { - // Too short, dump the message. - return; - } - i++; // skip the type of the attribute. We already know what it should be. - switch (attributeId) - { - case Attributes::ZoneStatus::Id: - if ((i + 2) > bufLen) - { - // Too short, dump the message. - return; - } - zoneStatus = (buffer[i] + (buffer[i + 1] << 8)); - setServerZoneStatus(currentIndex, zoneStatus); - i += 2; - break; - case Attributes::ZoneType::Id: - if ((i + 2) > bufLen) - { - // Too short, dump the message. - return; - } - zoneType = (buffer[i] + (buffer[i + 1] << 8)); - setServerZoneType(currentIndex, zoneType); - i += 2; - break; - case Attributes::ZoneState::Id: - if ((i + 1) > bufLen) - { - // Too short, dump the message - return; - } - zoneState = buffer[i]; - setServerZoneState(currentIndex, zoneState); - i++; - break; - case Attributes::IasCieAddress::Id: { - uint8_t myIeee[EUI64_SIZE]; - emberAfGetEui64(myIeee); - if ((i + 8) > bufLen) - { - // Too short, dump the message - } - else if (0 != memcmp(&(buffer[i]), myIeee, EUI64_SIZE)) - { - emberAfIasZoneClusterPrintln("CIE Address not set to mine, removing IAS zone server."); - removeServer(&(buffer[i])); - clearState(); - } - else - { - readIasZoneServerAttributes(emberAfCurrentCommand()->source); - } - return; - } - } - } - } - emberAfIasZoneClusterPrintln("Retrieved IAS Zone Server attributes from 0x%2X", emberAfCurrentCommand()->source); - clearState(); - } -} - -void emberAfPluginIasZoneClientZdoCallback(EmberNodeId emberNodeId, EmberApsFrame * apsFrame, uint8_t * message, uint16_t length) {} - -void emberAfPluginIasZoneClientWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) {} - -void emberAfPluginIasZoneClientReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen) {} diff --git a/src/app/clusters/ias-zone-client/ias-zone-client.h b/src/app/clusters/ias-zone-client/ias-zone-client.h deleted file mode 100644 index f509b6378df6e6..00000000000000 --- a/src/app/clusters/ias-zone-client/ias-zone-client.h +++ /dev/null @@ -1,47 +0,0 @@ -/** - * - * Copyright (c) 2020 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include - -typedef struct -{ - EmberEUI64 ieeeAddress; - chip::NodeId nodeId; - uint16_t zoneType; - uint16_t zoneStatus; - uint8_t zoneState; - chip::EndpointId endpoint; - uint8_t zoneId; -} IasZoneDevice; - -extern IasZoneDevice emberAfIasZoneClientKnownServers[]; - -#define NO_INDEX 0xFF -#define UNKNOWN_ENDPOINT 0 - -#define UNKNOWN_ZONE_ID 0xFF - -void emAfClearServers(void); - -void emberAfPluginIasZoneClientZdoCallback(EmberNodeId emberNodeId, EmberApsFrame * apsFrame, uint8_t * message, uint16_t length); - -void emberAfPluginIasZoneClientWriteAttributesResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen); - -void emberAfPluginIasZoneClientReadAttributesResponseCallback(chip::ClusterId clusterId, uint8_t * buffer, uint16_t bufLen); diff --git a/src/app/clusters/ias-zone-server/README.md b/src/app/clusters/ias-zone-server/README.md new file mode 100644 index 00000000000000..f012e706d8cc86 --- /dev/null +++ b/src/app/clusters/ias-zone-server/README.md @@ -0,0 +1 @@ +The code was removed pending a Matter spec. diff --git a/src/app/clusters/ias-zone-server/ias-zone-server-tokens.h b/src/app/clusters/ias-zone-server/ias-zone-server-tokens.h deleted file mode 100644 index 9a1c6ab3ea770f..00000000000000 --- a/src/app/clusters/ias-zone-server/ias-zone-server-tokens.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * - * Copyright (c) 2020 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -/** - * Custom Application Tokens - */ -#define CREATOR_PLUGIN_IAS_ZONE_SERVER_ENROLLMENT_METHOD (0x0020) -#define NVM3KEY_PLUGIN_IAS_ZONE_SERVER_ENROLLMENT_METHOD (NVM3KEY_DOMAIN_USER | 0x0020) - -#ifdef DEFINETYPES -// Include or define any typedef for tokens here -#endif // DEFINETYPES - -#ifdef DEFINETOKENS -// Define the actual token storage information here -DEFINE_BASIC_TOKEN(PLUGIN_IAS_ZONE_SERVER_ENROLLMENT_METHOD, uint8_t, 0xFF) - -#endif // DEFINETOKENS diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.cpp b/src/app/clusters/ias-zone-server/ias-zone-server.cpp deleted file mode 100644 index df593f67bfe470..00000000000000 --- a/src/app/clusters/ias-zone-server/ias-zone-server.cpp +++ /dev/null @@ -1,860 +0,0 @@ -/** - * - * Copyright (c) 2020 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "ias-zone-server.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace chip; -using namespace chip::app::Clusters; -using namespace chip::app::Clusters::IasZone; -using namespace chip::app::Clusters::IasZone::Commands; - -#define UNDEFINED_ZONE_ID 0xFF -#define DELAY_TIMER_MS (1 * MILLISECOND_TICKS_PER_SECOND) -#define IAS_ZONE_SERVER_PAYLOAD_COMMAND_IDX 0x02 -#define ZCL_FRAME_CONTROL_IDX 0x00 - -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) -#if defined(EMBER_AF_PLUGIN_WWAH_APP_EVENT_RETRY_MANAGER) -#define NUM_QUEUE_ENTRIES EMBER_AF_PLUGIN_WWAH_APP_EVENT_RETRY_MANAGER_QUEUE_SIZE -#else -#define NUM_QUEUE_ENTRIES EMBER_AF_PLUGIN_IAS_ZONE_SERVER_QUEUE_DEPTH -#endif -#else -#define NUM_QUEUE_ENTRIES 0 -#endif - -#define DEFAULT_ENROLLMENT_METHOD EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_REQUEST - -// TODO: Need to figure out what needs to happen wrt HAL tokens here, but for -// now define ESZP_HOST to disable it. See -// https://github.com/project-chip/connectedhomeip/issues/3275 -#define EZSP_HOST - -typedef struct -{ - EndpointId endpoint; - uint16_t status; - System::Clock::Timestamp eventTime; -} IasZoneStatusQueueEntry; - -typedef struct -{ - uint8_t entriesInQueue; - uint8_t startIdx; - uint8_t lastIdx; - IasZoneStatusQueueEntry buffer[NUM_QUEUE_ENTRIES]; -} IasZoneStatusQueue; - -//----------------------------------------------------------------------------- -// Globals - -EmberEventControl emberAfPluginIasZoneServerManageQueueEventControl; -static EmberAfIasZoneEnrollmentMode enrollmentMethod; - -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) -IasZoneStatusQueue messageQueue; - -// Status queue retry parameters -typedef struct -{ - IasZoneStatusQueueRetryConfig config; - uint32_t currentBackoffTimeSec; - uint8_t currentRetryCount; -} IasZoneStatusQueueRetryParameters; - -// Set up status queue retry parameters. -IasZoneStatusQueueRetryParameters queueRetryParams = { - .config = { .firstBackoffTimeSec = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_FIRST_BACKOFF_TIME_SEC, - .backoffSeqCommonRatio = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_BACKOFF_SEQUENCE_COMMON_RATIO, - .maxBackoffTimeSec = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_MAX_BACKOFF_TIME_SEC, -#ifdef EMBER_AF_PLUGIN_IAS_ZONE_SERVER_UNLIMITED_RETRIES - .unlimitedRetries = true, -#else - .unlimitedRetries = false, -#endif - .maxRetryAttempts = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_MAX_RETRY_ATTEMPTS }, - .currentBackoffTimeSec = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_FIRST_BACKOFF_TIME_SEC, - .currentRetryCount = 0, -}; - -static void resetCurrentQueueRetryParams(void) -{ - queueRetryParams.currentRetryCount = 0; - queueRetryParams.currentBackoffTimeSec = queueRetryParams.config.firstBackoffTimeSec; -} - -#endif // EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE - -//----------------------------------------------------------------------------- -// Forward declarations - -static void setZoneId(EndpointId endpoint, uint8_t zoneId); -static bool areZoneServerAttributesNonVolatile(EndpointId endpoint); -static bool isValidEnrollmentMode(EmberAfIasZoneEnrollmentMode method); -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) -static uint16_t computeElapsedTimeQs(IasZoneStatusQueueEntry * entry); -static void bufferInit(IasZoneStatusQueue * ring); -static int16_t copyToBuffer(IasZoneStatusQueue * ring, const IasZoneStatusQueueEntry * entry); -static int16_t popFromBuffer(IasZoneStatusQueue * ring, IasZoneStatusQueueEntry * entry); -#endif - -// TODO: https://github.com/project-chip/connectedhomeip/issues/3276 needs to be -// fixed to implement this for real. -EmberNetworkStatus emberAfNetworkState(void) -{ - return EMBER_JOINED_NETWORK; -} - -//----------------------------------------------------------------------------- -// Functions - -static EmberStatus sendToClient(EndpointId endpoint) -{ - EmberStatus status; - - // If the device is not a network, there is no one to send to, so do nothing - if (emberAfNetworkState() != EMBER_JOINED_NETWORK) - { - return EMBER_NETWORK_DOWN; - } - - // Remote endpoint need not be set, since it will be provided by the call to - // emberAfSendCommandUnicastToBindings() - emberAfSetCommandEndpoints(endpoint, 0); - - // TODO: Figure out how this sending should actually work in Matter. -#if 0 - // A binding table entry is created on Zone Enrollment for each endpoint, so - // a simple call to SendCommandUnicastToBinding will handle determining the - // destination endpoint, address, etc for us. - status = emberAfSendCommandUnicastToBindings(); -#else - status = EMBER_ERR_FATAL; -#endif - - if (EMBER_SUCCESS != status) - { - return status; - } - - return status; -} - -static void enrollWithClient(EndpointId endpoint) -{ - EmberStatus status; - emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), IasZone::Id, - ZoneEnrollRequest::Id, "vv", EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE, EMBER_AF_MANUFACTURER_CODE); - status = sendToClient(endpoint); - if (status == EMBER_SUCCESS) - { - emberAfIasZoneClusterPrintln("Sent enroll request to IAS Zone client."); - } - else - { - emberAfIasZoneClusterPrintln("Error sending enroll request: 0x%x\n", status); - } -} - -Protocols::InteractionModel::Status -MatterIasZoneClusterServerPreAttributeChangedCallback(const app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value) -{ - uint8_t i; - bool zeroAddress; - EmberBindingTableEntry bindingEntry; - NodeId destNodeId; - EndpointId endpoint = attributePath.mEndpointId; - uint8_t ieeeAddress[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; - - // If this is not a CIE Address write, the CIE address has already been - // written, or the IAS Zone server is already enrolled, do nothing. - if (attributePath.mAttributeId != Attributes::IasCieAddress::Id || emberAfCurrentCommand() == nullptr) - { - return Protocols::InteractionModel::Status::Success; - } - - memcpy(&destNodeId, value, sizeof(NodeId)); - - // Create the binding table entry - - // This code assumes that the endpoint and device that is setting the CIE - // address is the CIE device itself, and as such the remote endpoint to bind - // to is the endpoint that generated the attribute change. This - // assumption is made based on analysis of the behavior of CIE devices - // currently existing in the field. - bindingEntry.type = EMBER_UNICAST_BINDING; - bindingEntry.local = endpoint; - bindingEntry.clusterId = MakeOptional(IasZone::Id); - bindingEntry.remote = emberAfCurrentCommand()->apsFrame->sourceEndpoint; - bindingEntry.nodeId = destNodeId; - - bool foundSameEntry = false; - // Cycle through the binding table until we find a valid entry that is not - // being used, then use the created entry to make the bind. - for (const auto & currentBind : BindingTable::GetInstance()) - { - // If the binding table entry created based on the response already exists - // do nothing. - if ((currentBind.local == bindingEntry.local) && (currentBind.clusterId == bindingEntry.clusterId) && - (currentBind.remote == bindingEntry.remote) && (currentBind.type == bindingEntry.type)) - { - foundSameEntry = true; - break; - } - } - - if (!foundSameEntry) - { - BindingTable::GetInstance().Add(bindingEntry); - } - - zeroAddress = true; - emberAfReadServerAttribute(endpoint, IasZone::Id, Attributes::IasCieAddress::Id, (uint8_t *) ieeeAddress, 8); - for (i = 0; i < 8; i++) - { - if (ieeeAddress[i] != 0) - { - zeroAddress = false; - } - } - emberAfAppPrint("\nzero address: %d\n", zeroAddress); - - if ((zeroAddress == true) && (enrollmentMethod == EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_REQUEST)) - { - // Only send the enrollment request if the mode is AUTO-ENROLL-REQUEST. - // We need to delay to get around a bug where we can't send a command - // at this point because then the Write Attributes response will not - // be sent. But we also delay to give the client time to configure us. - emberAfIasZoneClusterPrintln("Sending enrollment after %d ms", DELAY_TIMER_MS); - emberAfScheduleServerTickExtended(endpoint, IasZone::Id, DELAY_TIMER_MS, EMBER_AF_SHORT_POLL, EMBER_AF_STAY_AWAKE); - } - - return Protocols::InteractionModel::Status::Success; -} - -EmberAfStatus emberAfPluginIasZoneClusterSetEnrollmentMethod(EndpointId endpoint, EmberAfIasZoneEnrollmentMode method) -{ - EmberAfStatus status; - - if (emberAfIasZoneClusterAmIEnrolled(endpoint)) - { - emberAfIasZoneClusterPrintln("Error: Already enrolled"); - status = EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS; - } - else if (!isValidEnrollmentMode(method)) - { - emberAfIasZoneClusterPrintln("Invalid IAS Zone Server Enrollment Mode: %d", method); - status = EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - else - { - enrollmentMethod = method; -#ifndef EZSP_HOST - halCommonSetToken(TOKEN_PLUGIN_IAS_ZONE_SERVER_ENROLLMENT_METHOD, &enrollmentMethod); -#endif - emberAfIasZoneClusterPrintln("IAS Zone Server Enrollment Mode: %d", method); - status = EMBER_ZCL_STATUS_SUCCESS; - } - return status; -} - -static bool isValidEnrollmentMode(EmberAfIasZoneEnrollmentMode method) -{ - return ((method == EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR) || - (method == EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE) || - (method == EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_REQUEST)); -} - -bool emberAfIasZoneClusterAmIEnrolled(EndpointId endpoint) -{ - EmberAfIasZoneState zoneState = EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED; // Clear this out completely. - EmberAfStatus status; - status = emberAfReadServerAttribute(endpoint, IasZone::Id, Attributes::ZoneState::Id, (unsigned char *) &zoneState, - 1); // uint8_t size - - return (status == EMBER_ZCL_STATUS_SUCCESS && zoneState == EMBER_ZCL_IAS_ZONE_STATE_ENROLLED); -} - -static void updateEnrollState(EndpointId endpoint, bool enrolled) -{ - EmberAfIasZoneState zoneState = (enrolled ? EMBER_ZCL_IAS_ZONE_STATE_ENROLLED : EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED); - - emberAfWriteServerAttribute(endpoint, IasZone::Id, Attributes::ZoneState::Id, (uint8_t *) &zoneState, ZCL_INT8U_ATTRIBUTE_TYPE); - emberAfIasZoneClusterPrintln("IAS Zone Server State: %pEnrolled", (enrolled ? "" : "NOT ")); -} - -bool emberAfIasZoneClusterZoneEnrollResponseCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::ZoneEnrollResponse::DecodableType & commandData) -{ - auto & enrollResponseCode = commandData.enrollResponseCode; - auto & zoneId = commandData.zoneId; - - EndpointId endpoint; - uint8_t epZoneId; - EmberAfStatus status; - - endpoint = emberAfCurrentEndpoint(); - status = emberAfReadServerAttribute(endpoint, IasZone::Id, Attributes::ZoneId::Id, &epZoneId, sizeof(uint8_t)); - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - if (enrollResponseCode == EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS) - { - updateEnrollState(endpoint, true); - setZoneId(endpoint, zoneId); - } - else - { - updateEnrollState(endpoint, false); - setZoneId(endpoint, UNDEFINED_ZONE_ID); - } - - return true; - } - - emberAfAppPrintln("ERROR: IAS Zone Server unable to read zone ID attribute"); - return true; -} - -static EmberStatus sendZoneUpdate(uint16_t zoneStatus, uint16_t timeSinceStatusOccurredQs, EndpointId endpoint) -{ - EmberStatus status; - - if (!emberAfIasZoneClusterAmIEnrolled(endpoint)) - { - return EMBER_INVALID_CALL; - } - emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), IasZone::Id, - ZoneStatusChangeNotification::Id, "vuuv", zoneStatus, 0 /*extended status, must be zero per spec*/, - emberAfPluginIasZoneServerGetZoneId(endpoint), - timeSinceStatusOccurredQs /* called "delay" in the spec */); - status = sendToClient(endpoint); - - return status; -} - -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) -static void addNewEntryToQueue(const IasZoneStatusQueueEntry * newEntry) -{ - emberAfIasZoneClusterPrintln("Adding new entry to queue"); - copyToBuffer(&messageQueue, newEntry); -} -#endif - -EmberStatus emberAfPluginIasZoneServerUpdateZoneStatus(EndpointId endpoint, uint16_t newStatus, uint16_t timeSinceStatusOccurredQs) -{ -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - IasZoneStatusQueueEntry newBufferEntry; - newBufferEntry.endpoint = endpoint; - newBufferEntry.status = newStatus; - newBufferEntry.eventTime = System::SystemClock().GetMonotonicTimestamp(); -#endif - EmberStatus sendStatus = EMBER_SUCCESS; - - emberAfWriteServerAttribute(endpoint, IasZone::Id, Attributes::ZoneStatus::Id, (uint8_t *) &newStatus, - ZCL_INT16U_ATTRIBUTE_TYPE); - - if (enrollmentMethod == EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR) - { - // If unenrolled, send Zone Enroll Request command. - if (!emberAfIasZoneClusterAmIEnrolled(endpoint)) - { - emberAfScheduleServerTick(endpoint, IasZone::Id, DELAY_TIMER_MS); - // Don't send the zone status update since not enrolled. - return EMBER_SUCCESS; - } - } - -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - // If there are items in the queue waiting to send, this event should not - // be transmitted, as that could cause the client to receive the events out - // of order. Instead, just add the device to the queue - if (messageQueue.entriesInQueue == 0) - { - sendStatus = sendZoneUpdate(newStatus, timeSinceStatusOccurredQs, endpoint); - } - else - { - // Add a new element to the status queue and depending on the network state - // either try to resend the first element in the queue immediately or try to - // restart the parent research pattern. - addNewEntryToQueue(&newBufferEntry); - - EmberNetworkStatus networkState = emberAfNetworkState(); - - if (networkState == EMBER_JOINED_NETWORK_NO_PARENT) - { - emberAfStartMoveCallback(); - } - else if (networkState == EMBER_JOINED_NETWORK) - { - resetCurrentQueueRetryParams(); - emberEventControlSetActive(&emberAfPluginIasZoneServerManageQueueEventControl); - } - - return EMBER_SUCCESS; - } - -#else - sendStatus = sendZoneUpdate(newStatus, timeSinceStatusOccurredQs, endpoint); -#endif - - if (sendStatus == EMBER_SUCCESS) - { -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - // Add a new entry to the zoneUpdate buffer - addNewEntryToQueue(&newBufferEntry); -#endif - } - else - { - // If we're not on a network and never were, we don't need to do anything. - // If we used to be on a network and can't talk to our parent, we should - // try to rejoin the network and add the message to the queue - if (emberAfNetworkState() == EMBER_JOINED_NETWORK_NO_PARENT) - { - emberAfStartMoveCallback(); -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - // Add a new entry to the zoneUpdate buffer - addNewEntryToQueue(&newBufferEntry); -#endif - } - emberAfIasZoneClusterPrintln("Failed to send IAS Zone update. Err 0x%x", sendStatus); - } - return sendStatus; -} - -void emberAfPluginIasZoneServerManageQueueEventHandler(void) -{ -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - IasZoneStatusQueueEntry * bufferStart; - uint16_t status; - uint16_t elapsedTimeQs; - uint16_t airTimeRemainingMs; - - // If the queue was emptied without our interaction, do nothing - if (messageQueue.entriesInQueue == 0) - { - emberEventControlSetInactive(&emberAfPluginIasZoneServerManageQueueEventControl); - return; - } - - // Otherwise, pull out the first item and attempt to retransmit it. The - // message complete callback will handle removing items from the queue - - // To prevent an activity storm from flooding with retry requests, only - // re-send a message if it's been at least - // EMBER_AF_PLUGIN_IAS_ZONE_SERVER_MIN_OTA_TIME_MS since it was sent. - bufferStart = &(messageQueue.buffer[messageQueue.startIdx]); - elapsedTimeQs = computeElapsedTimeQs(bufferStart); - - if (elapsedTimeQs < (EMBER_AF_PLUGIN_IAS_ZONE_SERVER_MIN_OTA_TIME_MS / (MILLISECOND_TICKS_PER_SECOND / 4))) - { - airTimeRemainingMs = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_MIN_OTA_TIME_MS - (elapsedTimeQs * MILLISECOND_TICKS_PER_SECOND / 4); - emberAfIasZoneClusterPrintln("Not enough time passed for a retry, sleeping %d more mS", airTimeRemainingMs); - emberEventControlSetDelayMS(emberAfPluginIasZoneServerManageQueueEventControl, airTimeRemainingMs); - } - else - { - status = bufferStart->status; - emberAfIasZoneClusterPrintln("Attempting to resend a queued zone status update (status: 0x%02X, " - "event time (s): %d) with time of %d. Retry count: %d", - bufferStart->status, bufferStart->eventTime / MILLISECOND_TICKS_PER_SECOND, elapsedTimeQs, - queueRetryParams.currentRetryCount); - sendZoneUpdate(status, elapsedTimeQs, bufferStart->endpoint); - emberEventControlSetInactive(&emberAfPluginIasZoneServerManageQueueEventControl); - } -#else - emberEventControlSetInactive(&emberAfPluginIasZoneServerManageQueueEventControl); -#endif -} - -void emberAfIasZoneClusterServerInitCallback(EndpointId endpoint) -{ - EmberAfIasZoneType zoneType; - if (!areZoneServerAttributesNonVolatile(endpoint)) - { - emberAfAppPrint("WARNING: ATTRIBUTES ARE NOT BEING STORED IN FLASH! "); - emberAfAppPrintln("DEVICE WILL NOT FUNCTION PROPERLY AFTER REBOOTING!!"); - } - -#ifndef EZSP_HOST - halCommonGetToken(&enrollmentMethod, TOKEN_PLUGIN_IAS_ZONE_SERVER_ENROLLMENT_METHOD); -#else - enrollmentMethod = DEFAULT_ENROLLMENT_METHOD; -#endif - if (!isValidEnrollmentMode(enrollmentMethod)) - { - // Default Enrollment Method to AUTO-ENROLL-REQUEST. - enrollmentMethod = DEFAULT_ENROLLMENT_METHOD; - } - -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - bufferInit(&messageQueue); -#endif - - zoneType = (EmberAfIasZoneType) EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE; - emberAfWriteAttribute(endpoint, IasZone::Id, Attributes::ZoneType::Id, (uint8_t *) &zoneType, ZCL_INT16U_ATTRIBUTE_TYPE); - - emberAfPluginIasZoneServerUpdateZoneStatus(endpoint, - 0, // status: All alarms cleared - 0); // time since status occurred -} - -void emberAfIasZoneClusterServerTickCallback(EndpointId endpoint) -{ - enrollWithClient(endpoint); -} - -uint8_t emberAfPluginIasZoneServerGetZoneId(EndpointId endpoint) -{ - uint8_t zoneId = UNDEFINED_ZONE_ID; - emberAfReadServerAttribute(endpoint, IasZone::Id, Attributes::ZoneId::Id, &zoneId, - emberAfGetDataSize(ZCL_INT8U_ATTRIBUTE_TYPE)); - return zoneId; -} - -//------------------------------------------------------------------------------ -// -// This function will verify that all attributes necessary for the IAS zone -// server to properly retain functionality through a power failure are -// non-volatile. -// -//------------------------------------------------------------------------------ -static bool areZoneServerAttributesNonVolatile(EndpointId endpoint) -{ - if (emberAfIsKnownVolatileAttribute(endpoint, IasZone::Id, Attributes::IasCieAddress::Id) || - emberAfIsKnownVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneState::Id) || - emberAfIsKnownVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneType::Id) || - emberAfIsKnownVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneId::Id)) - { - return false; - } - - return true; -} - -static void setZoneId(EndpointId endpoint, uint8_t zoneId) -{ - emberAfIasZoneClusterPrintln("IAS Zone Server Zone ID: 0x%X", zoneId); - emberAfWriteServerAttribute(endpoint, IasZone::Id, Attributes::ZoneId::Id, &zoneId, ZCL_INT8U_ATTRIBUTE_TYPE); -} - -static void unenrollSecurityDevice(EndpointId endpoint) -{ - uint8_t ieeeAddress[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; - uint16_t zoneType = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE; - - emberAfWriteServerAttribute(endpoint, IasZone::Id, Attributes::IasCieAddress::Id, (uint8_t *) ieeeAddress, - ZCL_NODE_ID_ATTRIBUTE_TYPE); - - emberAfWriteServerAttribute(endpoint, IasZone::Id, Attributes::ZoneType::Id, (uint8_t *) &zoneType, ZCL_INT16U_ATTRIBUTE_TYPE); - - setZoneId(endpoint, UNDEFINED_ZONE_ID); - // Restore the enrollment method back to its default value. - emberAfPluginIasZoneClusterSetEnrollmentMethod(endpoint, DEFAULT_ENROLLMENT_METHOD); - updateEnrollState(endpoint, false); // enrolled? -} - -// If you leave the network, unenroll yourself. -void emberAfPluginIasZoneServerStackStatusCallback(EmberStatus status) -{ - EndpointId endpoint; - - // If the device has left the network, unenroll all endpoints on the device - // that are servers of the IAS Zone Cluster - if (status == EMBER_NETWORK_DOWN && emberAfNetworkState() == EMBER_NO_NETWORK) - { - for (uint16_t i = 0; i < emberAfEndpointCount(); i++) - { - endpoint = emberAfEndpointFromIndex(i); - if (emberAfContainsServer(endpoint, IasZone::Id)) - { - unenrollSecurityDevice(endpoint); - } - } - } - else if (status == EMBER_NETWORK_UP) - { -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - // If we're reconnecting, send any items still in the queue - emberAfIasZoneClusterPrintln("Rejoined network, retransmiting any queued event"); - emberEventControlSetActive(&emberAfPluginIasZoneServerManageQueueEventControl); -#endif - } -} - -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) -EmberStatus emberAfIasZoneServerConfigStatusQueueRetryParams(IasZoneStatusQueueRetryConfig * retryConfig) -{ - if (!(retryConfig->firstBackoffTimeSec) || (!retryConfig->backoffSeqCommonRatio) || - (retryConfig->maxBackoffTimeSec < retryConfig->firstBackoffTimeSec) || - (retryConfig->maxBackoffTimeSec > IAS_ZONE_STATUS_QUEUE_RETRY_ABS_MAX_BACKOFF_TIME_SEC) || (!retryConfig->maxRetryAttempts)) - { - return EMBER_BAD_ARGUMENT; - } - - queueRetryParams.config.firstBackoffTimeSec = retryConfig->firstBackoffTimeSec; - queueRetryParams.config.backoffSeqCommonRatio = retryConfig->backoffSeqCommonRatio; - queueRetryParams.config.maxBackoffTimeSec = retryConfig->maxBackoffTimeSec; - queueRetryParams.config.unlimitedRetries = retryConfig->unlimitedRetries; - queueRetryParams.config.maxRetryAttempts = retryConfig->maxRetryAttempts; - - queueRetryParams.currentBackoffTimeSec = retryConfig->firstBackoffTimeSec; - queueRetryParams.currentRetryCount = 0; - - return EMBER_SUCCESS; -} - -void emberAfIasZoneServerSetStatusQueueRetryParamsToDefault(void) -{ - queueRetryParams.config.firstBackoffTimeSec = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_FIRST_BACKOFF_TIME_SEC; - queueRetryParams.config.backoffSeqCommonRatio = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_BACKOFF_SEQUENCE_COMMON_RATIO; - queueRetryParams.config.maxBackoffTimeSec = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_MAX_BACKOFF_TIME_SEC; -#ifdef EMBER_AF_PLUGIN_IAS_ZONE_SERVER_UNLIMITED_RETRIES - queueRetryParams.config.unlimitedRetries = true; -#else - queueRetryParams.config.unlimitedRetries = false; -#endif - queueRetryParams.config.maxRetryAttempts = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_MAX_RETRY_ATTEMPTS; - - queueRetryParams.currentBackoffTimeSec = EMBER_AF_PLUGIN_IAS_ZONE_SERVER_FIRST_BACKOFF_TIME_SEC; - queueRetryParams.currentRetryCount = 0; -} - -void emberAfIasZoneServerDiscardPendingEventsInStatusQueue(void) -{ - emberEventControlSetInactive(&emberAfPluginIasZoneServerManageQueueEventControl); - bufferInit(&messageQueue); - resetCurrentQueueRetryParams(); -} - -#if defined(EMBER_AF_PLUGIN_WWAH_APP_EVENT_RETRY_MANAGER) -EmberStatus emberAfWwahAppEventRetryManagerConfigBackoffParamsCallback(uint8_t firstBackoffTimeSeconds, - uint8_t backoffSeqCommonRatio, - uint32_t maxBackoffTimeSeconds, - uint8_t maxRedeliveryAttempts) -{ - IasZoneStatusQueueRetryConfig retryConfig = { firstBackoffTimeSeconds, backoffSeqCommonRatio, maxBackoffTimeSeconds, - (maxRedeliveryAttempts == 0xFF), maxRedeliveryAttempts }; - - // Setting up retry parameters - return emberAfIasZoneServerConfigStatusQueueRetryParams(&retryConfig); -} - -void emberAfWwahAppEventRetryManagerSetBackoffParamsToDefault(void) -{ - emberAfIasZoneServerSetStatusQueueRetryParamsToDefault(); -} -#endif // defined(EMBER_AF_PLUGIN_WWAH_APP_EVENT_RETRY_MANAGER) - -void emberAfPluginIasZoneServerPrintQueue(void) -{ - emberAfIasZoneClusterPrintln("%d/%d entries", messageQueue.entriesInQueue, NUM_QUEUE_ENTRIES); - for (int i = 0; i < messageQueue.entriesInQueue; i++) - { - emberAfIasZoneClusterPrintln("Entry %d: Endpoint: %d Status: %d EventTimeMs: %d", i, messageQueue.buffer[i].endpoint, - messageQueue.buffer[i].status, messageQueue.buffer[i].eventTime); - } -} - -void emberAfPluginIasZoneServerPrintQueueConfig(void) -{ - emberAfCorePrintln("First backoff time (sec): %d", queueRetryParams.config.firstBackoffTimeSec); - emberAfCorePrintln("Backoff sequence common ratio: %d", queueRetryParams.config.backoffSeqCommonRatio); - emberAfCorePrintln("Max backoff time (sec): %d", queueRetryParams.config.maxBackoffTimeSec); - emberAfCorePrintln("Max redelivery attempts: %d", queueRetryParams.config.maxRetryAttempts); -} - -#endif // defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - -// This callback will be generated any time the node receives an ACK or a NAK -// for a message transmitted for the IAS Zone Cluster Server. Note that this -// will not be called in the case that the message was not delivered to the -// destination when the destination is the only router the node is joined to. -// In that case, the command will never have been sent, as the device will have -// had no router by which to send the command. -void emberAfIasZoneClusterServerMessageSentCallback(const MessageSendDestination & destination, EmberApsFrame * apsFrame, - uint16_t msgLen, uint8_t * message, EmberStatus status) -{ -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) - uint8_t frameControl; - CommandId commandId; - - IasZoneStatusQueueEntry dummyEntry; - - // Verify that this response is for a ZoneStatusChangeNotification command - // by checking the message length, the command and direction bits of the - // Frame Control byte, and the command ID - if (msgLen < IAS_ZONE_SERVER_PAYLOAD_COMMAND_IDX) - { - return; - } - - frameControl = message[ZCL_FRAME_CONTROL_IDX]; - if (!(frameControl & ZCL_CLUSTER_SPECIFIC_COMMAND) || !(frameControl & ZCL_FRAME_CONTROL_SERVER_TO_CLIENT)) - { - return; - } - - commandId = message[IAS_ZONE_SERVER_PAYLOAD_COMMAND_IDX]; - if (commandId != ZoneStatusChangeNotification::Id) - { - return; - } - - // If a change status change notification command is not received by the - // client, delay the option specified amount of time and try to resend it. - // The event handler will perform the retransmit per the preset queue retry - // parameters, and the original send request will handle populating the buffer. - // Do not try to retransmit again if the maximum number of retries attempts - // is reached, this is however discarded if configured for unlimited retries. - if ((status == EMBER_DELIVERY_FAILED) && - (queueRetryParams.config.unlimitedRetries || - (queueRetryParams.currentRetryCount < queueRetryParams.config.maxRetryAttempts))) - { - queueRetryParams.currentRetryCount++; - - emberAfIasZoneClusterPrintln("Status command update failed to send... Retrying in %d seconds...", - queueRetryParams.currentBackoffTimeSec); - - // Delay according to the current retransmit backoff time. - emberEventControlSetDelayMS(emberAfPluginIasZoneServerManageQueueEventControl, - queueRetryParams.currentBackoffTimeSec * MILLISECOND_TICKS_PER_SECOND); - - // The backoff time needs to be increased if the maximum backoff time is not reached yet. - if ((queueRetryParams.currentBackoffTimeSec * queueRetryParams.config.backoffSeqCommonRatio) <= - queueRetryParams.config.maxBackoffTimeSec) - { - queueRetryParams.currentBackoffTimeSec *= queueRetryParams.config.backoffSeqCommonRatio; - } - } - else - { - // If a command message was sent or max redelivery attempts were reached, - // remove it from the queue and move on to the next queued message until the queue is empty. - if (status == EMBER_SUCCESS) - { - emberAfIasZoneClusterPrintln("\nZone update successful, remove entry from queue"); - } - else - { - emberAfIasZoneClusterPrintln("\nZone update unsuccessful, max retry attempts reached, remove entry from queue"); - } - popFromBuffer(&messageQueue, &dummyEntry); - - // Reset queue retry parameters. - resetCurrentQueueRetryParams(); - - if (messageQueue.entriesInQueue) - { - emberEventControlSetActive(&emberAfPluginIasZoneServerManageQueueEventControl); - } - } -#endif -} - -#if defined(EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ENABLE_QUEUE) -static void bufferInit(IasZoneStatusQueue * ring) -{ - ring->entriesInQueue = 0; - ring->startIdx = 0; - ring->lastIdx = NUM_QUEUE_ENTRIES - 1; -} - -// Add the entry to the buffer by copying, returning the index at which it was -// added. If the buffer is full, return -1, but still copy the entry over the -// last item of the buffer, to ensure that the last item in the buffer is -// always representative of the last known device state. -static int16_t copyToBuffer(IasZoneStatusQueue * ring, const IasZoneStatusQueueEntry * entry) -{ - if (ring->entriesInQueue == NUM_QUEUE_ENTRIES) - { - ring->buffer[ring->lastIdx] = *entry; - return -1; - } - - // Increment the last pointer. If it rolls over the size, circle it back to - // zero. - ring->lastIdx++; - if (ring->lastIdx >= NUM_QUEUE_ENTRIES) - { - ring->lastIdx = 0; - } - - ring->buffer[ring->lastIdx].endpoint = entry->endpoint; - ring->buffer[ring->lastIdx].status = entry->status; - ring->buffer[ring->lastIdx].eventTime = entry->eventTime; - - ring->entriesInQueue++; - return ring->lastIdx; -} - -// Return the idx of the popped entry, or -1 if the buffer was empty. -static int16_t popFromBuffer(IasZoneStatusQueue * ring, IasZoneStatusQueueEntry * entry) -{ - int16_t retVal; - - if (ring->entriesInQueue == 0) - { - return -1; - } - - // Copy out the first entry, then increment the start pointer. If it rolls - // over, circle it back to zero. - *entry = ring->buffer[ring->startIdx]; - retVal = ring->startIdx; - - ring->startIdx++; - if (ring->startIdx >= NUM_QUEUE_ENTRIES) - { - ring->startIdx = 0; - } - - ring->entriesInQueue--; - - return retVal; -} - -uint16_t computeElapsedTimeQs(IasZoneStatusQueueEntry * entry) -{ - System::Clock::Milliseconds64 currentTimeMs = System::SystemClock().GetMonotonicMilliseconds64(); - int64_t deltaTimeMs = currentTimeMs.count() - entry->eventTime.count(); - - if (deltaTimeMs < 0) - { - deltaTimeMs = -deltaTimeMs + (0xFFFFFFFF - currentTimeMs); - } - - return deltaTimeMs / MILLISECOND_TICKS_PER_QUARTERSECOND; -} -#endif - -void MatterIasZonePluginServerInitCallback() {} diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.h b/src/app/clusters/ias-zone-server/ias-zone-server.h deleted file mode 100644 index 0630e96dff3ebf..00000000000000 --- a/src/app/clusters/ias-zone-server/ias-zone-server.h +++ /dev/null @@ -1,122 +0,0 @@ -/** - * - * Copyright (c) 2020 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -#define EM_AF_UNKNOWN_ENDPOINT 0 -// Absolute max backoff time, at least one retry a day -// (ie. 24 hours * 60 minutes * 60 seconds). -#define IAS_ZONE_STATUS_QUEUE_RETRY_ABS_MAX_BACKOFF_TIME_SEC (24 * 60 * 60) - -// Definitions for the IAS Zone enrollment mode. -typedef enum -{ - EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0x00, - EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 0x01, - EMBER_ZCL_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 0x02 -} EmberAfIasZoneEnrollmentMode; - -// Status queue retry parameters -typedef struct -{ - uint8_t firstBackoffTimeSec; - uint8_t backoffSeqCommonRatio; - uint32_t maxBackoffTimeSec; - bool unlimitedRetries; - uint8_t maxRetryAttempts; -} IasZoneStatusQueueRetryConfig; - -/** @brief Updates the zone status for an endpoint. - * - * This function will update the zone status attribute of the specified endpoint - * using the specified new zone status. It will then notify the CIE of the - * updated status. - * - * @param endpoint The endpoint whose zone status attribute is to be updated. - * @param newStatus The new status to write to the attribute. - * @param timeSinceStatusOccurredQs The amount of time (in quarter seconds) that - * has passed since the status change occurred. - * - * @return EMBER_SUCCESS if the attribute update and notify succeeded, error - * code otherwise. - */ -EmberStatus emberAfPluginIasZoneServerUpdateZoneStatus(chip::EndpointId endpoint, uint16_t newStatus, - uint16_t timeSinceStatusOccurredQs); - -/** @brief Gets the CIE assigned zone id of a given endpoint. - * - * This function will return the zone ID that was assigned to the given - * endpoint by the CIE at time of enrollment. - * - * @param endpoint The endpoint whose ID is to be queried. - * - * @return The zone ID assigned by the CIE at time of enrollment. - */ -uint8_t emberAfPluginIasZoneServerGetZoneId(chip::EndpointId endpoint); - -/** @brief Determines the enrollment status of a given endpoint. - * - * This function will return true or false depending on whether the specified - * endpoint has undergone IAS Zone Enrollment. - * - * @param endpoint The endpoint whose enrollment status is to be queried. - * - * @return True if enrolled, false otherwise. - */ -bool emberAfIasZoneClusterAmIEnrolled(chip::EndpointId endpoint); - -/** @brief Set the enrollment status. - * - * This function will return the status of the set enrollment method attempt. - * - * @param endpoint The endpoint whose enrollment method is to be set - * @param method The enrollment method that should be set - * - * @return An ::EmberAfStatus value indicating the status of the set action. - */ -EmberAfStatus emberAfPluginIasZoneClusterSetEnrollmentMethod(chip::EndpointId endpoint, EmberAfIasZoneEnrollmentMode method); - -/** @brief Configure the retry parameters of the status queue. - * - * This function will configure the status queue retry parameters. - * - * @param retryConfig Status queue retry configuration. - */ -EmberStatus emberAfIasZoneServerConfigStatusQueueRetryParams(IasZoneStatusQueueRetryConfig * retryConfig); - -/** @brief Set the retry parameters of the status queue to default. - * - * This function will set the status queue retry parameters to their default values. - */ -void emberAfIasZoneServerSetStatusQueueRetryParamsToDefault(void); - -/** @brief Discards any pendint events in the status queue and sets it inactive. - * - * This function will discard any pending event pending in the status queue. - * Also, the status queue event control manager will be inactivated. - */ -void emberAfIasZoneServerDiscardPendingEventsInStatusQueue(void); - -/** @brief Prints information on the satus queue. - */ -void emberAfPluginIasZoneServerPrintQueue(void); - -/** @brief Prints the satus queue config. - */ -void emberAfPluginIasZoneServerPrintQueueConfig(void); diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index c97fad07a2fae3..497d3cb718f085 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -761,15 +761,14 @@ static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId schedule(endpoint, computeCallbackWaitTimeMs(state->callbackSchedule, state->eventDurationMs)); status = EMBER_ZCL_STATUS_SUCCESS; - if (commandId == Commands::MoveToLevelWithOnOff::Id) +#ifdef EMBER_AF_PLUGIN_ON_OFF + // Check that the received MoveToLevelWithOnOff produces a On action and that the onoff support the lighting featuremap + if (commandId == Commands::MoveToLevelWithOnOff::Id && state->moveToLevel != state->minLevel && + OnOffServer::Instance().SupportsLightingApplications(endpoint)) { - uint32_t featureMap; - if (Attributes::FeatureMap::Get(endpoint, &featureMap) == EMBER_ZCL_STATUS_SUCCESS && - READBITS(featureMap, EMBER_AF_LEVEL_CONTROL_FEATURE_LIGHTING)) - { - OnOff::Attributes::GlobalSceneControl::Set(endpoint, true); - } + OnOff::Attributes::GlobalSceneControl::Set(endpoint, true); } +#endif // EMBER_AF_PLUGIN_ON_OFF return status; } diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestor.h b/src/app/clusters/ota-requestor/DefaultOTARequestor.h index 6cbe1629b96d24..e0e45c2709af2e 100644 --- a/src/app/clusters/ota-requestor/DefaultOTARequestor.h +++ b/src/app/clusters/ota-requestor/DefaultOTARequestor.h @@ -173,6 +173,12 @@ class DefaultOTARequestor : public OTARequestorInterface, public BDXDownloader:: void OnResponseTimeout(chip::Messaging::ExchangeContext * ec) override { ChipLogError(BDX, "exchange timed out"); + // Null out mExchangeCtx before calling OnDownloadTimeout, in case + // the downloader decides to call Reset() on us. If we don't, we + // will end up closing the exchange from Reset and then the caller + // will close it _again_ (see API documentation for + // OnResponseTimeout), which will lead to refcount underflow. + mExchangeCtx = nullptr; if (mDownloader != nullptr) { mDownloader->OnDownloadTimeout(); diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json index af56353de4c8c1..cf2a68d67af563 100644 --- a/src/app/common/templates/templates.json +++ b/src/app/common/templates/templates.json @@ -42,11 +42,6 @@ "name": "ZCL att-storage header", "output": "att-storage.h" }, - { - "path": "../../zap-templates/templates/app/attribute-id.zapt", - "name": "ZCL attribute-id header", - "output": "attribute-id.h" - }, { "path": "../../zap-templates/templates/app/attribute-size.zapt", "name": "ZCL attribute-size header", diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp index d7f76abe19a0aa..c41f5c3bb47fb4 100644 --- a/src/app/server/Server.cpp +++ b/src/app/server/Server.cpp @@ -353,12 +353,12 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams) } } -#if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS - ResumeSubscriptions(); -#endif - + PlatformMgr().AddEventHandler(OnPlatformEventWrapper, reinterpret_cast(this)); PlatformMgr().HandleServerStarted(); + mIsDnssdReady = Dnssd::Resolver::Instance().IsInitialized(); + CheckServerReadyEvent(); + exit: if (err != CHIP_NO_ERROR) { @@ -372,6 +372,44 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams) return err; } +void Server::OnPlatformEvent(const DeviceLayer::ChipDeviceEvent & event) +{ + switch (event.Type) + { + case DeviceEventType::kDnssdPlatformInitialized: + // Platform DNS-SD implementation uses kPlatformDnssdInitialized event to signal that it's ready. + if (!mIsDnssdReady) + { + mIsDnssdReady = true; + CheckServerReadyEvent(); + } + break; + case DeviceEventType::kServerReady: +#if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS + ResumeSubscriptions(); +#endif + break; + default: + break; + } +} + +void Server::CheckServerReadyEvent() +{ + // Check if all asynchronously initialized server components (currently, only DNS-SD) + // are ready, and emit the 'server ready' event if so. + if (mIsDnssdReady) + { + ChipDeviceEvent event = { .Type = DeviceEventType::kServerReady }; + PlatformMgr().PostEventOrDie(&event); + } +} + +void Server::OnPlatformEventWrapper(const DeviceLayer::ChipDeviceEvent * event, intptr_t server) +{ + reinterpret_cast(server)->OnPlatformEvent(*event); +} + void Server::RejoinExistingMulticastGroups() { ChipLogProgress(AppServer, "Joining Multicast groups"); @@ -423,6 +461,7 @@ void Server::ScheduleFactoryReset() void Server::Shutdown() { + PlatformMgr().RemoveEventHandler(OnPlatformEventWrapper, 0); mCASEServer.Shutdown(); mCASESessionManager.Shutdown(); app::DnssdServer::Instance().SetCommissioningModeProvider(nullptr); diff --git a/src/app/server/Server.h b/src/app/server/Server.h index 6fcf79f01bf2af..9318ae71232dc2 100644 --- a/src/app/server/Server.h +++ b/src/app/server/Server.h @@ -377,6 +377,10 @@ class Server static Server sServer; void InitFailSafe(); + void OnPlatformEvent(const DeviceLayer::ChipDeviceEvent & event); + void CheckServerReadyEvent(); + + static void OnPlatformEventWrapper(const DeviceLayer::ChipDeviceEvent * event, intptr_t); #if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS /** @@ -558,6 +562,7 @@ class Server Credentials::OperationalCertificateStore * mOpCertStore; app::FailSafeContext mFailSafeContext; + bool mIsDnssdReady = false; uint16_t mOperationalServicePort; uint16_t mUserDirectedCommissioningPort; Inet::InterfaceId mInterfaceId; diff --git a/src/app/tests/suites/TestCommissionerNodeId.yaml b/src/app/tests/suites/TestCommissionerNodeId.yaml index 39e1103d72007d..ff7537da5f5cf8 100644 --- a/src/app/tests/suites/TestCommissionerNodeId.yaml +++ b/src/app/tests/suites/TestCommissionerNodeId.yaml @@ -97,6 +97,15 @@ tests: response: saveAs: alphaIndex + - label: "Read the commissioner node ID from the alpha fabric" + identity: "alpha" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdAlpha + - label: "Read the fabric ID from the beta fabric" identity: "beta" cluster: "Operational Credentials" @@ -105,6 +114,15 @@ tests: response: saveAs: betaIndex + - label: "Read the commissioner node ID from the beta fabric" + identity: "beta" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdBeta + - label: "Read the fabric ID from the gamma fabric" identity: "gamma" cluster: "Operational Credentials" @@ -113,6 +131,15 @@ tests: response: saveAs: gammaIndex + - label: "Read the commissioner node ID from the gamma fabric" + identity: "gamma" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdGamma + - label: "Read the ACL from alpha and check commissioner node id" identity: "alpha" command: "readAttribute" @@ -123,7 +150,7 @@ tests: FabricIndex: alphaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdAlpha], Targets: null, }, ] @@ -138,7 +165,7 @@ tests: FabricIndex: betaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdBeta], Targets: null, }, ] @@ -153,7 +180,7 @@ tests: FabricIndex: gammaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdGamma], Targets: null, }, ] @@ -168,7 +195,7 @@ tests: FabricIndex: betaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdBeta], Targets: null, }, ] @@ -183,7 +210,7 @@ tests: FabricIndex: gammaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdGamma], Targets: null, }, ] @@ -198,7 +225,7 @@ tests: FabricIndex: betaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdBeta], Targets: null, }, ] @@ -213,7 +240,7 @@ tests: FabricIndex: gammaIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdGamma], Targets: null, }, ] diff --git a/src/app/tests/suites/TestDiscovery.yaml b/src/app/tests/suites/TestDiscovery.yaml index fc01f5c1cfef8b..474bfb02945884 100644 --- a/src/app/tests/suites/TestDiscovery.yaml +++ b/src/app/tests/suites/TestDiscovery.yaml @@ -20,6 +20,9 @@ config: discriminator: type: int16u defaultValue: 3840 + shortDiscriminator: + type: int16u + defaultValue: 15 vendorId: type: int16u defaultValue: 65521 @@ -146,7 +149,7 @@ tests: arguments: values: - name: "value" - value: discriminator + value: shortDiscriminator - label: "Check Commissioning Mode (_CM)" cluster: "DiscoveryCommands" diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml index 76236844056a67..fc4c2212dbb5f5 100644 --- a/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml @@ -32,6 +32,14 @@ tests: - name: "nodeId" value: nodeId + - label: "Read the commissioner node ID" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeId + - label: "TP2 - Write ACL giving admin privilege on all EP0" command: "writeAttribute" attribute: "ACL" diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml index f013471c0f6386..7f71142d39b160 100644 --- a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml @@ -76,6 +76,15 @@ tests: response: saveAs: th2FabricIndex + - label: "Read the commissioner node ID from the alpha fabric" + identity: "alpha" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdAlpha + - label: "TH1 writes ACL giving view privilege for descriptor cluster" command: "writeAttribute" attribute: "ACL" @@ -85,7 +94,7 @@ tests: FabricIndex: th1FabricIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdAlpha], Targets: [{ Cluster: 0x001f, Endpoint: 0, DeviceType: null }], }, @@ -99,6 +108,15 @@ tests: }, ] + - label: "Read the commissioner node ID from the beta fabric" + identity: "beta" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeIdBeta + - label: "TH2 writes ACL giving view privilge for basic cluster" identity: beta command: "writeAttribute" @@ -109,7 +127,7 @@ tests: FabricIndex: th2FabricIndex, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdBeta], Targets: [{ Cluster: 0x001f, Endpoint: 0, DeviceType: null }], }, @@ -158,7 +176,7 @@ tests: FabricIndex: 1, Privilege: 5, # administer AuthMode: 2, # case - Subjects: [commissionerNodeId], + Subjects: [commissionerNodeIdAlpha], Targets: null, }, ] diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml index b340eaad4a8280..4a1891a97f549f 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml @@ -112,15 +112,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId, 1111], Targets: null, FabricIndex: TH1FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [3333], Targets: null, FabricIndex: TH1FabricIndex, @@ -137,15 +137,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId, 2222], Targets: null, FabricIndex: TH2FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [4444], Targets: null, FabricIndex: TH2FabricIndex, @@ -217,15 +217,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId, 1111], Targets: null, FabricIndex: TH1FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [3333], Targets: null, FabricIndex: TH1FabricIndex, @@ -252,15 +252,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId, 2222], Targets: null, FabricIndex: TH2FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [4444], Targets: null, FabricIndex: TH2FabricIndex, @@ -311,15 +311,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId, 1111], Targets: null, FabricIndex: TH1FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [3333], Targets: null, FabricIndex: TH1FabricIndex, diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml index 10388d8833bda9..08ae87141f2185 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml @@ -144,16 +144,14 @@ tests: event: "AccessControlExtensionChanged" response: value: - [ - { - AdminNodeID: TH1CommissionerNodeId, - AdminPasscodeID: null, - ChangeType: 1, - LatestValue: - { Data: D_OK_EMPTY, FabricIndex: TH1FabricIndex }, - }, + { + AdminNodeID: TH1CommissionerNodeId, + AdminPasscodeID: null, + ChangeType: 1, + LatestValue: + { Data: D_OK_EMPTY, FabricIndex: TH1FabricIndex }, FabricIndex: TH1FabricIndex, - ] + } - label: "Step 11:TH2 reads DUT Endpoint 0 AccessControl cluster @@ -164,13 +162,11 @@ tests: event: "AccessControlExtensionChanged" response: value: - [ - { - AdminNodeID: TH2CommissionerNodeId, - AdminPasscodeID: null, - ChangeType: 1, - LatestValue: - { Data: D_OK_SINGLE, FabricIndex: TH2FabricIndex }, - }, + { + AdminNodeID: TH2CommissionerNodeId, + AdminPasscodeID: null, + ChangeType: 1, + LatestValue: + { Data: D_OK_SINGLE, FabricIndex: TH2FabricIndex }, FabricIndex: TH2FabricIndex, - ] + } diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml index 2df5382e156e70..77fe085a0d0fc2 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml @@ -172,8 +172,8 @@ tests: ChangeType: 1, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId], Targets: null, FabricIndex: TH1FabricIndex, @@ -188,8 +188,8 @@ tests: ChangeType: 2, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId], Targets: null, FabricIndex: TH1FabricIndex, @@ -204,8 +204,8 @@ tests: ChangeType: 1, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId, 1111], Targets: null, FabricIndex: TH1FabricIndex, @@ -229,8 +229,8 @@ tests: ChangeType: 1, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId], Targets: null, FabricIndex: TH2FabricIndex, @@ -245,8 +245,8 @@ tests: ChangeType: 2, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId], Targets: null, FabricIndex: TH2FabricIndex, @@ -261,8 +261,8 @@ tests: ChangeType: 1, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId, 2222], Targets: null, FabricIndex: TH2FabricIndex, diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml index 26f4b70bb74a59..b73e9ec9966514 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml @@ -156,8 +156,6 @@ tests: PICS: DRLK.S.C00.Rsp command: "LockDoor" timedInteractionTimeoutMs: 1000 - response: - error: 0x00 - label: "TH sends Lock Door Command to the DUT with valid PINCode" PICS: DRLK.S.C00.Rsp diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_3.yaml index 2fafc34e861911..764d81265c365e 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_3.yaml @@ -157,8 +157,6 @@ tests: PICS: DRLK.S.C01.Rsp command: "UnlockDoor" timedInteractionTimeoutMs: 1000 - response: - error: 0x00 - label: "TH sends the unlock Door command to the DUT with valid PINCode" PICS: DRLK.S.C01.Rsp diff --git a/src/app/tests/suites/certification/Test_TC_LOWPOWER_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LOWPOWER_2_1.yaml index a8cafbac8e0db1..e393a262991ed8 100644 --- a/src/app/tests/suites/certification/Test_TC_LOWPOWER_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LOWPOWER_2_1.yaml @@ -34,5 +34,3 @@ tests: - label: "TH sends Sleep command to DUT" PICS: LOWPOWER.S.C00.Rsp command: "Sleep" - response: - error: 0 diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_3_12.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_3_12.yaml index 6b6482d3494950..a3b848be39ff29 100644 --- a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_3_12.yaml +++ b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_3_12.yaml @@ -47,11 +47,7 @@ tests: - label: "Show Input Status Command" PICS: MEDIAINPUT.S.C01.Rsp command: "ShowInputStatus" - response: - error: 0 - label: "Hide Input Status Command" PICS: MEDIAINPUT.S.C02.Rsp command: "HideInputStatus" - response: - error: 0 diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml index 9220ee7158dc51..8084dc23bb3a60 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml @@ -33,6 +33,14 @@ tests: - name: "nodeId" value: nodeId + - label: "Read the commissioner node ID" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeId + - label: "TH adds ACL Operate privileges for Group 0x0103" cluster: "Access Control" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml index fea8bac4965bae..9ecfb9df8ee8d4 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml @@ -33,6 +33,14 @@ tests: - name: "nodeId" value: nodeId + - label: "Read the commissioner node ID" + cluster: "CommissionerCommands" + command: "GetCommissionerNodeId" + response: + values: + - name: "nodeId" + saveAs: commissionerNodeId + - label: "TH adds ACL Operate privileges for Group 0x0103" cluster: "Access Control" endpoint: 0 diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml index 239d37a942c742..39bc0e7ab388e9 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml @@ -53,7 +53,7 @@ tests: PICS: TSUIC.S.A0000 command: "readAttribute" attribute: "TemperatureDisplayMode" - arguments: + response: value: 0 - label: "Writes a value of 1 to TemperatureDisplayMode attribute of DUT" diff --git a/src/app/tests/suites/certification/Test_TC_WAKEONLAN_4_1.yaml b/src/app/tests/suites/certification/Test_TC_WAKEONLAN_4_1.yaml index ade30fa0aa5996..357c617211c3fc 100644 --- a/src/app/tests/suites/certification/Test_TC_WAKEONLAN_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WAKEONLAN_4_1.yaml @@ -44,8 +44,6 @@ tests: PICS: LOWPOWER.S.C00.Rsp cluster: "Low Power" command: "Sleep" - response: - error: 0 - label: "TH sends a Wake-On LAN magic packet containing the MAC address from diff --git a/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp b/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp index 1d402e76e09e97..74545a47e95d5b 100644 --- a/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp +++ b/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp @@ -45,6 +45,46 @@ CHIP_ERROR CommissionerCommands::Unpair(const char * identity, return GetCommissioner(identity).UnpairDevice(value.nodeId); } +CHIP_ERROR CommissionerCommands::GetCommissionerNodeId( + const char * identity, const chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type & value) +{ + chip::GetCommissionerNodeIdResponse data; + data.nodeId = GetCommissioner(identity).GetNodeId(); + + chip::app::StatusIB status; + status.mStatus = chip::Protocols::InteractionModel::Status::Success; + + constexpr uint32_t kMaxDataLen = 128; + uint8_t * buffer = static_cast(chip::Platform::MemoryCalloc(sizeof(uint8_t), kMaxDataLen)); + if (buffer == nullptr) + { + ChipLogError(chipTool, "Can not allocate commissioner node id data: %s", chip::ErrorStr(CHIP_ERROR_NO_MEMORY)); + return CHIP_ERROR_NO_MEMORY; + } + + chip::TLV::TLVWriter writer; + writer.Init(buffer, kMaxDataLen); + CHIP_ERROR err = data.Encode(writer, chip::TLV::AnonymousTag()); + if (CHIP_NO_ERROR != err) + { + ChipLogError(chipTool, "Can not encode commissioner node id data: %s", chip::ErrorStr(err)); + return err; + } + + uint32_t dataLen = writer.GetLengthWritten(); + writer.Finalize(); + + chip::TLV::TLVReader reader; + reader.Init(buffer, dataLen); + reader.Next(); + + OnResponse(status, &reader); + + chip::Platform::MemoryFree(buffer); + + return CHIP_NO_ERROR; +} + chip::app::StatusIB ConvertToStatusIB(CHIP_ERROR err) { using chip::app::StatusIB; diff --git a/src/app/tests/suites/commands/commissioner/CommissionerCommands.h b/src/app/tests/suites/commands/commissioner/CommissionerCommands.h index 33148a19102da3..9056f3a53947e3 100644 --- a/src/app/tests/suites/commands/commissioner/CommissionerCommands.h +++ b/src/app/tests/suites/commands/commissioner/CommissionerCommands.h @@ -36,6 +36,9 @@ class CommissionerCommands : public chip::Controller::DevicePairingDelegate CHIP_ERROR PairWithCode(const char * identity, const chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type & value); CHIP_ERROR Unpair(const char * identity, const chip::app::Clusters::CommissionerCommands::Commands::Unpair::Type & value); + CHIP_ERROR + GetCommissionerNodeId(const char * identity, + const chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type & value); /////////// DevicePairingDelegate Interface ///////// void OnStatusUpdate(chip::Controller::DevicePairingDelegate::Status status) override; diff --git a/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp b/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp index 7cf0dde53f525e..c3ba7b4ca0e65e 100644 --- a/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp +++ b/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp @@ -37,8 +37,7 @@ CHIP_ERROR DiscoveryCommands::FindCommissionableByShortDiscriminator( { ReturnErrorOnFailure(SetupDiscoveryCommands()); - uint64_t shortDiscriminator = static_cast((value.value >> 8) & 0x0F); - chip::Dnssd::DiscoveryFilter filter(chip::Dnssd::DiscoveryFilterType::kShortDiscriminator, shortDiscriminator); + chip::Dnssd::DiscoveryFilter filter(chip::Dnssd::DiscoveryFilterType::kShortDiscriminator, value.value); return mDNSResolver.DiscoverCommissionableNodes(filter); } diff --git a/src/app/tests/suites/commands/system/scripts/CompareFiles.py b/src/app/tests/suites/commands/system/scripts/CompareFiles.py index 98cbf811662c44..fcb1c1506a2e4d 100755 --- a/src/app/tests/suites/commands/system/scripts/CompareFiles.py +++ b/src/app/tests/suites/commands/system/scripts/CompareFiles.py @@ -14,17 +14,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import filecmp import sys +import xmlrpc.client -file1 = sys.argv[1] -file2 = sys.argv[2] +IP = '127.0.0.1' +PORT = 9000 +if sys.platform == 'linux': + IP = '10.10.10.5' -def main(): - if filecmp.cmp(file1, file2, shallow=False) is False: - raise Exception('Files %s and %s do not match' % (file1, file2)) - - -if __name__ == "__main__": - main() +# Passing in sys.argv[2:] gets rid of the script name and key to the apps register. The remaining +# values in the list are key-value pairs, e.g. [option1, value1, option2, value2, ...] +with xmlrpc.client.ServerProxy('http://' + IP + ':' + str(PORT) + '/', allow_none=True) as proxy: + file1 = sys.argv[1] + file2 = sys.argv[2] + proxy.compareFiles(file1, file2) diff --git a/src/app/tests/suites/commands/system/scripts/CreateOtaImage.py b/src/app/tests/suites/commands/system/scripts/CreateOtaImage.py index 1317e212a99419..c0a343c8adf4f7 100755 --- a/src/app/tests/suites/commands/system/scripts/CreateOtaImage.py +++ b/src/app/tests/suites/commands/system/scripts/CreateOtaImage.py @@ -14,32 +14,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os -import subprocess import sys +import xmlrpc.client -DEFAULT_CHIP_ROOT = os.path.abspath( - os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', '..', '..', '..')) +IP = '127.0.0.1' +PORT = 9000 -otaImageFilePath = sys.argv[1] -rawImageFilePath = sys.argv[2] -rawImageContent = ' '.join(sys.argv[3:]) +if sys.platform == 'linux': + IP = '10.10.10.5' +# Passing in sys.argv[2:] gets rid of the script name and key to the apps register. The remaining +# values in the list are key-value pairs, e.g. [option1, value1, option2, value2, ...] +with xmlrpc.client.ServerProxy('http://' + IP + ':' + str(PORT) + '/', allow_none=True) as proxy: + otaImageFilePath = sys.argv[1] + rawImageFilePath = sys.argv[2] + rawImageContent = ' '.join(sys.argv[3:]) -def main(): - # Write the raw image content - with open(rawImageFilePath, 'w') as rawFile: - rawFile.write(rawImageContent) - - # Add an OTA header to the raw file - otaImageTool = DEFAULT_CHIP_ROOT + '/src/app/ota_image_tool.py' - cmd = [otaImageTool, 'create', '-v', '0xDEAD', '-p', '0xBEEF', '-vn', '2', - '-vs', "2.0", '-da', 'sha256', rawImageFilePath, otaImageFilePath] - s = subprocess.Popen(cmd) - s.wait() - if s.returncode != 0: - raise Exception('Cannot create OTA image file') - - -if __name__ == "__main__": - main() + proxy.createOtaImage(otaImageFilePath, rawImageFilePath, rawImageContent) diff --git a/src/app/zap-templates/templates/app/attribute-id.zapt b/src/app/zap-templates/templates/app/attribute-id.zapt deleted file mode 100644 index ae7498e59fe8f3..00000000000000 --- a/src/app/zap-templates/templates/app/attribute-id.zapt +++ /dev/null @@ -1,30 +0,0 @@ -{{> header}} - -// Prevent multiple inclusion -#pragma once - -// Global cluster attribute ids -{{#zcl_attributes}} -{{#unless clusterRef}} -#define ZCL_{{asDelimitedMacro define}}_ATTRIBUTE_ID ({{asHex code 4}}) -{{/unless}} -{{/zcl_attributes}} - -{{#zcl_clusters}} -// Attribute ids for cluster: {{label}} - -// Client attributes -{{#zcl_attributes_client}} -{{#if clusterRef}} -#define ZCL_{{asDelimitedMacro define}}_ATTRIBUTE_ID ({{asHex code 4}}) -{{/if}} -{{/zcl_attributes_client}} - -// Server attributes -{{#zcl_attributes_server}} -{{#if clusterRef}} -#define ZCL_{{asDelimitedMacro define}}_ATTRIBUTE_ID ({{asHex code 4}}) -{{/if}} -{{/zcl_attributes_server}} - -{{/zcl_clusters}} diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml index 93e038eb8952bd..33c34f855a9994 100644 --- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml @@ -757,4 +757,71 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml b/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml new file mode 100644 index 00000000000000..c9037f350e1ca8 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/draft/types/door-lock.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml index 10b1e35686fca3..5d0be8324e2bd1 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml @@ -43,32 +43,6 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -175,89 +149,6 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -296,120 +187,6 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 27c798c91a1b94..80002a7e8b516c 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -93,6 +93,7 @@ "lo-devices.xml", "zll-devices.xml", "types/color-control.xml", + "types/door-lock.xml", "types/occupancy-sensing.xml", "types/thermostat-user-interface-configuration.xml" ], diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 41d08dc3c3afba..9e4d0a5384c028 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -91,6 +91,7 @@ "lo-devices.xml", "zll-devices.xml", "types/color-control.xml", + "types/door-lock.xml", "types/occupancy-sensing.xml", "types/thermostat-user-interface-configuration.xml" ], diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index a5bd64a78b98fa..f0caac0d738907 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -2441,7 +2441,12 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio // If there is an error, CommissioningStageComplete will be called from OnDeviceConnectionFailureFn. auto scopedPeerId = GetPeerScopedId(proxy->GetDeviceId()); mSystemState->CASESessionMgr()->FindOrEstablishSession(scopedPeerId, &mOnDeviceConnectedCallback, - &mOnDeviceConnectionFailureCallback); + &mOnDeviceConnectionFailureCallback +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + , + /* attemptCount = */ 3 +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + ); } break; case CommissioningStage::kSendComplete: { diff --git a/src/controller/ExampleOperationalCredentialsIssuer.cpp b/src/controller/ExampleOperationalCredentialsIssuer.cpp index a651c0d070d9a9..132f111a18c3e0 100644 --- a/src/controller/ExampleOperationalCredentialsIssuer.cpp +++ b/src/controller/ExampleOperationalCredentialsIssuer.cpp @@ -374,7 +374,7 @@ CHIP_ERROR ExampleOperationalCredentialsIssuer::GenerateNOCChain(const ByteSpan MutableByteSpan rcacSpan(rcac.Get(), kMaxDERCertLength); ReturnErrorOnFailure( - GenerateNOCChainAfterValidation(assignedId, mNextFabricId, chip::kUndefinedCATs, pubkey, rcacSpan, icacSpan, nocSpan)); + GenerateNOCChainAfterValidation(assignedId, mNextFabricId, mNextCATs, pubkey, rcacSpan, icacSpan, nocSpan)); // TODO(#13825): Should always generate some IPK. Using a temporary fixed value until APIs are plumbed in to set it end-to-end // TODO: Force callers to set IPK if used before GenerateNOCChain will succeed. diff --git a/src/controller/ExampleOperationalCredentialsIssuer.h b/src/controller/ExampleOperationalCredentialsIssuer.h index 6e3b1e554d4288..0f779f753dfaec 100644 --- a/src/controller/ExampleOperationalCredentialsIssuer.h +++ b/src/controller/ExampleOperationalCredentialsIssuer.h @@ -69,6 +69,8 @@ class DLL_EXPORT ExampleOperationalCredentialsIssuer : public OperationalCredent void SetFabricIdForNextNOCRequest(FabricId fabricId) override { mNextFabricId = fabricId; } + void SetCATValuesForNextNOCRequest(CATValues cats) { mNextCATs = cats; } + /** * @brief Initialize the issuer with the keypair in the storage. * If the storage doesn't have one, it'll create one, and it to the storage. @@ -123,6 +125,7 @@ class DLL_EXPORT ExampleOperationalCredentialsIssuer : public OperationalCredent NodeId mNextRequestedNodeId = 1; FabricId mNextFabricId = 1; + CATValues mNextCATs = kUndefinedCATs; bool mNodeIdRequested = false; uint64_t mIndex = 0; }; diff --git a/src/controller/python/chip/yaml/runner.py b/src/controller/python/chip/yaml/runner.py index 895fb79d10256c..8d8f6c970d8b7a 100644 --- a/src/controller/python/chip/yaml/runner.py +++ b/src/controller/python/chip/yaml/runner.py @@ -25,7 +25,7 @@ import chip.interaction_model import chip.yaml.format_converter as Converter import stringcase -from chip import ChipDeviceCtrl +from chip.ChipDeviceCtrl import ChipDeviceController, discovery from chip.clusters.Attribute import AttributeStatus, SubscriptionTransaction, TypedAttributePath, ValueDecodeFailure from chip.exceptions import ChipStackError from chip.yaml.errors import ParsingError, UnexpectedParsingError @@ -98,7 +98,7 @@ def pics_enabled(self): return self._pics_enabled @abstractmethod - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: pass @@ -109,7 +109,7 @@ def __init__(self, test_step): if not _PSEUDO_CLUSTERS.supports(test_step): raise ParsingError(f'Default cluster {test_step.cluster} {test_step.command}, not supported') - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: resp = asyncio.run(_PSEUDO_CLUSTERS.execute(self._test_step)) return _ActionResult(status=_ActionStatus.SUCCESS, response=None) @@ -118,7 +118,7 @@ class InvokeAction(BaseAction): '''Single invoke action to be executed.''' def __init__(self, test_step, cluster: str, context: _ExecutionContext): - '''Converts 'test_step' to invoke command action that can execute with ChipDeviceCtrl. + '''Converts 'test_step' to invoke command action that can execute with ChipDeviceController. Args: 'test_step': Step containing information required to run invoke command action. @@ -162,7 +162,7 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext): else: self._request_object = command_object - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: try: resp = asyncio.run(dev_ctrl.SendCommand( self._node_id, self._endpoint, self._request_object, @@ -179,7 +179,7 @@ class ReadAttributeAction(BaseAction): '''Single read attribute action to be executed.''' def __init__(self, test_step, cluster: str, context: _ExecutionContext): - '''Converts 'test_step' to read attribute action that can execute with ChipDeviceCtrl. + '''Converts 'test_step' to read attribute action that can execute with ChipDeviceController. Args: 'test_step': Step containing information required to run read attribute action. @@ -224,7 +224,7 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext): raise UnexpectedParsingError( f'ReadAttribute doesnt have valid attribute_type. {self.label}') - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: try: raw_resp = asyncio.run(dev_ctrl.ReadAttribute(self._node_id, [(self._endpoint, self._request_object)], @@ -289,7 +289,7 @@ def __init__(self, test_step): # Timeout is provided in seconds we need to conver to milliseconds. self._timeout_ms = request_data_as_dict['timeout'] * 1000 - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: try: if self._expire_existing_session: dev_ctrl.ExpireSessions(self._node_id) @@ -326,7 +326,7 @@ class SubscribeAttributeAction(ReadAttributeAction): '''Single subscribe attribute action to be executed.''' def __init__(self, test_step, cluster: str, context: _ExecutionContext): - '''Converts 'test_step' to subscribe attribute action that can execute with ChipDeviceCtrl. + '''Converts 'test_step' to subscribe attribute action that can execute with ChipDeviceController. Args: 'test_step': Step containing information required to run write attribute action. @@ -349,7 +349,7 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext): f'SubscribeAttribute action does not have max_interval {self.label}') self._max_interval = test_step.max_interval - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: try: subscription = asyncio.run( dev_ctrl.ReadAttribute(self._node_id, [(self._endpoint, self._request_object)], @@ -381,7 +381,7 @@ class WriteAttributeAction(BaseAction): '''Single write attribute action to be executed.''' def __init__(self, test_step, cluster: str, context: _ExecutionContext): - '''Converts 'test_step' to write attribute action that can execute with ChipDeviceCtrl. + '''Converts 'test_step' to write attribute action that can execute with ChipDeviceController. Args: 'test_step': Step containing information required to run write attribute action. @@ -425,7 +425,7 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext): # Create a cluster object for the request from the provided YAML data. self._request_object = attribute(request_data) - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: try: resp = asyncio.run( dev_ctrl.WriteAttribute(self._node_id, [(self._endpoint, self._request_object)], @@ -463,7 +463,7 @@ def __init__(self, test_step, context: _ExecutionContext): if self._output_queue is None: raise UnexpectedParsingError(f'Could not find output queue') - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: try: # While there should be a timeout here provided by the test, the current codegen version # of YAML tests doesn't have a per test step timeout, only a global timeout for the @@ -495,7 +495,7 @@ def __init__(self, test_step): self._setup_payload = request_data_as_dict['payload'] self._node_id = request_data_as_dict['nodeId'] - def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: resp = dev_ctrl.CommissionWithCode(self._setup_payload, self._node_id) if resp: @@ -504,10 +504,78 @@ def run_action(self, dev_ctrl: ChipDeviceCtrl) -> _ActionResult: return _ActionResult(status=_ActionStatus.ERROR, response=None) +class DiscoveryCommandAction(BaseAction): + """DiscoveryCommand implementation (FindCommissionable* methods).""" + + @staticmethod + def _filter_for_step(test_step) -> (discovery.FilterType, any): + """Given a test step, figure out the correct filters to give to + DiscoverCommissionableNodes. + """ + + if test_step.command == 'FindCommissionable': + return discovery.FilterType.NONE, None + + if test_step.command == 'FindCommissionableByCommissioningMode': + # this is just a "_CM" subtype + return discovery.FilterType.COMMISSIONING_MODE, None + + # all the items below require a "value" to use for filtering + args = test_step.arguments['values'] + request_data_as_dict = Converter.convert_list_of_name_value_pair_to_dict(args) + + filter = request_data_as_dict['value'] + + if test_step.command == 'FindCommissionableByDeviceType': + return discovery.FilterType.DEVICE_TYPE, filter + + if test_step.command == 'FindCommissionableByLongDiscriminator': + return discovery.FilterType.LONG_DISCRIMINATOR, filter + + if test_step.command == 'FindCommissionableByShortDiscriminator': + return discovery.FilterType.SHORT_DISCRIMINATOR, filter + + if test_step.command == 'FindCommissionableByVendorId': + return discovery.FilterType.VENDOR_ID, filter + + raise UnexpectedParsingError(f'Invalid command: {test_step.command}') + + def __init__(self, test_step): + super().__init__(test_step) + self.filterType, self.filter = DiscoveryCommandAction._filter_for_step(test_step) + + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: + devices = dev_ctrl.DiscoverCommissionableNodes( + filterType=self.filterType, filter=self.filter, stopOnFirst=True, timeoutSecond=5) + + # Devices will be a list: [CommissionableNode(), ...] + logging.info("Discovered devices: %r" % devices) + + if not devices: + logging.error("No devices found") + return _ActionResult(status=_ActionStatus.ERROR, response="NO DEVICES FOUND") + elif len(devices) > 1: + logging.warning("Commissionable discovery found multiple results!") + + return _ActionResult(status=_ActionStatus.SUCCESS, response=devices[0]) + + +class NotImplementedAction(BaseAction): + """Raises a "NOT YET IMPLEMENTED" exception when run.""" + + def __init__(self, test_step, cluster, command): + super().__init__(test_step) + self.cluster = cluster + self.command = command + + def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: + raise Exception(f"NOT YET IMPLEMENTED: {self.cluster}::{self.command}") + + class ReplTestRunner: '''Test runner to encode/decode values from YAML test Parser for executing the TestStep. - Uses ChipDeviceCtrl from chip-repl to execute parsed YAML TestSteps. + Uses ChipDeviceController from chip-repl to execute parsed YAML TestSteps. ''' def __init__(self, test_spec_definition, certificate_authority_manager, alpha_dev_ctrl): @@ -624,7 +692,9 @@ def encode(self, request) -> BaseAction: # Some of the tests contain 'cluster over-rides' that refer to a different # cluster than that specified in 'config'. - if cluster == 'DelayCommands' and command == 'WaitForCommissionee': + elif cluster == 'DiscoveryCommands': + return DiscoveryCommandAction(request) + elif cluster == 'DelayCommands' and command == 'WaitForCommissionee': action = self._wait_for_commissionee_action_factory(request) elif command == 'writeAttribute': action = self._attribute_write_action_factory(request, cluster) @@ -654,8 +724,8 @@ def decode(self, result: _ActionResult): if result.response is None: # TODO Once yamltest and idl python packages are properly packaged as a single module # the type we are returning will be formalized. For now TestStep.post_process_response - # expects this particular case to be sent as a string. - return 'success' if result.status == _ActionStatus.SUCCESS else 'failure' + # expects this particular case to be sent an empty dict or a dict with an error. + return {} if result.status == _ActionStatus.SUCCESS else {'error': 'FAILURE'} response = result.response @@ -668,6 +738,51 @@ def decode(self, result: _ActionResult): decoded_response['error'] = stringcase.snakecase(response.name).upper() return decoded_response + if isinstance(response, chip.discovery.CommissionableNode): + # CommissionableNode( + # instanceName='04DD55352DD2AC53', + # hostName='E6A32C6DBA8D0000', + # port=5540, + # longDiscriminator=3840, + # vendorId=65521, + # productId=32769, + # commissioningMode=1, + # deviceType=0, + # deviceName='', + # pairingInstruction='', + # pairingHint=36, + # mrpRetryIntervalIdle=None, + # mrpRetryIntervalActive=None, + # supportsTcp=True, + # addresses=['fd00:0:1:1::3', '10.10.10.1'] + # ), ... + decoded_response['value'] = { + 'instanceName': response.instanceName, + 'hostName': response.hostName, + 'port': response.port, + 'longDiscriminator': response.longDiscriminator, + 'vendorId': response.vendorId, + 'productId': response.productId, + 'commissioningMode': response.commissioningMode, + 'deviceType': response.deviceType, + 'deviceName': response.deviceName, + 'pairingInstruction': response.pairingInstruction, + 'pairingHint': response.pairingHint, + 'mrpRetryIntervalIdle': response.mrpRetryIntervalIdle, + 'mrpRetryIntervalActive': response.mrpRetryIntervalActive, + 'supportsTcp': response.supportsTcp, + 'addresses': response.addresses, + + # TODO: NOT AVAILABLE + 'rotatingIdLen': 0, + + # derived values + 'numIPs': len(response.addresses), + + } + + return decoded_response + if isinstance(response, ChipStackError): decoded_response['error'] = 'FAILURE' return decoded_response diff --git a/src/controller/tests/TestCommissionableNodeController.cpp b/src/controller/tests/TestCommissionableNodeController.cpp index 6d0c04ea1f831b..d50a267172ec19 100644 --- a/src/controller/tests/TestCommissionableNodeController.cpp +++ b/src/controller/tests/TestCommissionableNodeController.cpp @@ -33,6 +33,7 @@ class MockResolver : public Resolver { public: CHIP_ERROR Init(chip::Inet::EndPointManager * udpEndPointManager) override { return InitStatus; } + bool IsInitialized() override { return true; } void Shutdown() override {} void SetOperationalDelegate(OperationalResolveDelegate * delegate) override {} void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override {} diff --git a/src/darwin/CHIPTool/CHIPTool/Framework Helpers/FabricKeys.m b/src/darwin/CHIPTool/CHIPTool/Framework Helpers/FabricKeys.m index b7ff690604fe6c..55f6655b053b63 100644 --- a/src/darwin/CHIPTool/CHIPTool/Framework Helpers/FabricKeys.m +++ b/src/darwin/CHIPTool/CHIPTool/Framework Helpers/FabricKeys.m @@ -110,7 +110,7 @@ + (NSDictionary *)privateKeyCreationParams return @{ (__bridge NSString *) kSecAttrKeyClass : (__bridge NSString *) kSecAttrKeyClassPrivate, - (__bridge NSString *) kSecAttrKeyType : (__bridge NSNumber *) kSecAttrKeyTypeECSECPrimeRandom, + (__bridge NSString *) kSecAttrKeyType : (__bridge NSString *) kSecAttrKeyTypeECSECPrimeRandom, (__bridge NSString *) kSecAttrKeySizeInBits : @(keySizeInBits), (__bridge NSString *) kSecAttrIsPermanent : @(NO) }; diff --git a/src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.mm b/src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.mm index edb2265dfc5db7..e97ee154022cf6 100644 --- a/src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.mm +++ b/src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.mm @@ -168,9 +168,23 @@ - (instancetype)initWithQueue:(dispatch_queue_t)queue return self; } +- (void)invalidate +{ + // Make sure we don't leak via handlers that close over us, as ours must. + // This is a bit odd, since these are supposed to be non-nullable + // properties, but it's the best we can do given our API surface, unless we + // assume that all consumers consistently use __weak refs to us inside their + // handlers. + // + // Setting the attributes to nil will not compile; set the ivars directly. + _readyHandler = nil; + _cancelHandler = nil; +} + - (void)endWork { [self.workQueue endWork:self]; + [self invalidate]; } - (void)retryWork @@ -182,8 +196,13 @@ - (void)retryWork - (void)callReadyHandlerWithContext:(id)context { dispatch_async(self.queue, ^{ - self.readyHandler(context, self.retryCount); - self.retryCount++; + if (self.readyHandler == nil) { + // Nothing to do here. + [self endWork]; + } else { + self.readyHandler(context, self.retryCount); + self.retryCount++; + } }); } @@ -191,7 +210,10 @@ - (void)callReadyHandlerWithContext:(id)context - (void)cancel { dispatch_async(self.queue, ^{ - self.cancelHandler(); + if (self.cancelHandler != nil) { + self.cancelHandler(); + } + [self invalidate]; }); } @end diff --git a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h index 4304f15cd52a34..6faa134a1e92a4 100644 --- a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h +++ b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h @@ -35,6 +35,92 @@ NS_ASSUME_NONNULL_BEGIN * know. */ class MTRCallbackBridgeBase { +public: + /** + * Run the given MTRActionBlock on the Matter thread, after getting a CASE + * session (possibly pre-existing) to the given node ID on the fabric + * represented by the given MTRDeviceController. On success, convert the + * success value to whatever type it needs to be to call the callback type + * we're templated over. Once this function has been called, on a callback + * bridge allocated with `new`, the bridge object must not be accessed by + * the caller. The action block will handle deleting the bridge. + */ + void DispatchAction(chip::NodeId nodeID, MTRDeviceController * controller) && { ActionWithNodeID(nodeID, controller); } + + /** + * Run the given MTRActionBlock on the Matter thread after getting a secure + * session corresponding to the given MTRBaseDevice. On success, convert + * the success value to whatever type it needs to be to call the callback + * type we're templated over. Once this function has been called, on a callback + * bridge allocated with `new`, the bridge object must not be accessed by + * the caller. The action block will handle deleting the bridge. + */ + void DispatchAction(MTRBaseDevice * device) && + { + if (device.isPASEDevice) { + ActionWithPASEDevice(device); + } else { + ActionWithNodeID(device.nodeID, device.deviceController); + } + } + +protected: + MTRCallbackBridgeBase(dispatch_queue_t queue) + : mQueue(queue) + { + } + + virtual ~MTRCallbackBridgeBase() {}; + + virtual void MaybeDoAction(chip::Messaging::ExchangeManager * _Nullable exchangeManager, + const chip::Optional & session, NSError * _Nullable error) + = 0; + virtual void LogRequestStart() = 0; + + void ActionWithPASEDevice(MTRBaseDevice * device) + { + LogRequestStart(); + + [device.deviceController getSessionForCommissioneeDevice:device.nodeID + completion:^(chip::Messaging::ExchangeManager * exchangeManager, + const chip::Optional & session, NSError * error) { + MaybeDoAction(exchangeManager, session, error); + }]; + } + + void ActionWithNodeID(chip::NodeId nodeID, MTRDeviceController * controller) + { + LogRequestStart(); + + [controller getSessionForNode:nodeID + completion:^(chip::Messaging::ExchangeManager * exchangeManager, + const chip::Optional & session, NSError * error) { + MaybeDoAction(exchangeManager, session, error); + }]; + } + + // OnDone and KeepAliveOnCallback really only make sense for subscription + // bridges, but we put them here to avoid many copies of this code in + // generated bits. + void OnDone() + { + if (!mQueue) { + delete this; + return; + } + + // Delete ourselves async, so that any error/data reports we + // queued up before getting OnDone have a chance to run. + auto * self = this; + dispatch_async(mQueue, ^{ + delete self; + }); + } + + void KeepAliveOnCallback() { mKeepAlive = true; } + + dispatch_queue_t mQueue; + bool mKeepAlive = false; }; typedef void (^MTRResponseHandler)(id _Nullable value, NSError * _Nullable error); @@ -72,7 +158,7 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { * on it. */ MTRCallbackBridge(dispatch_queue_t queue, MTRResponseHandler handler, T OnSuccessFn) - : mQueue(queue) + : MTRCallbackBridgeBase(queue) , mHandler(handler) , mSuccess(OnSuccessFn) , mFailure(OnFailureFn) @@ -84,7 +170,7 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { * on it. */ MTRCallbackBridge(dispatch_queue_t queue, MTRResponseHandler handler, MTRActionBlock _Nonnull action, T OnSuccessFn) - : mQueue(queue) + : MTRCallbackBridgeBase(queue) , mHandler(handler) , mAction(action) , mSuccess(OnSuccessFn) @@ -92,34 +178,6 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { { } - /** - * Run the given MTRActionBlock on the Matter thread, after getting a CASE - * session (possibly pre-existing) to the given node ID on the fabric - * represented by the given MTRDeviceController. On success, convert the - * success value to whatever type it needs to be to call the callback type - * we're templated over. Once this function has been called, on a callback - * bridge allocated with `new`, the bridge object must not be accessed by - * the caller. The action block will handle deleting the bridge. - */ - void DispatchAction(chip::NodeId nodeID, MTRDeviceController * controller) && { ActionWithNodeID(nodeID, controller); } - - /** - * Run the given MTRActionBlock on the Matter thread after getting a secure - * session corresponding to the given MTRBaseDevice. On success, convert - * the success value to whatever type it needs to be to call the callback - * type we're templated over. Once this function has been called, on a callback - * bridge allocated with `new`, the bridge object must not be accessed by - * the caller. The action block will handle deleting the bridge. - */ - void DispatchAction(MTRBaseDevice * device) && - { - if (device.isPASEDevice) { - ActionWithPASEDevice(device); - } else { - ActionWithNodeID(device.nodeID, device.deviceController); - } - } - /** * Try to run the given MTRLocalActionBlock on the Matter thread, if we have * a device and it's attached to a running controller, then handle @@ -142,8 +200,8 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { asyncDispatchToMatterQueue:^() { CHIP_ERROR err = action(mSuccess, mFailure); if (err != CHIP_NO_ERROR) { - NSLog(@"Failure performing action. C++-mangled success callback type: '%s', error: %s", typeid(T).name(), - chip::ErrorStr(err)); + ChipLogError(Controller, "Failure performing action. C++-mangled success callback type: '%s', error: %s", + typeid(T).name(), chip::ErrorStr(err)); // Take the normal async error-reporting codepath. This will also // handle cleaning us up properly. @@ -155,29 +213,7 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { }]; } - void ActionWithPASEDevice(MTRBaseDevice * device) - { - LogRequestStart(); - - [device.deviceController getSessionForCommissioneeDevice:device.nodeID - completion:^(chip::Messaging::ExchangeManager * exchangeManager, - const chip::Optional & session, NSError * error) { - MaybeDoAction(exchangeManager, session, error); - }]; - } - - void ActionWithNodeID(chip::NodeId nodeID, MTRDeviceController * controller) - { - LogRequestStart(); - - [controller getSessionForNode:nodeID - completion:^(chip::Messaging::ExchangeManager * exchangeManager, - const chip::Optional & session, NSError * error) { - MaybeDoAction(exchangeManager, session, error); - }]; - } - - void LogRequestStart() + void LogRequestStart() override { mRequestTime = [NSDate date]; // Generate a unique cookie to track this operation @@ -186,7 +222,7 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { } void MaybeDoAction(chip::Messaging::ExchangeManager * _Nullable exchangeManager, - const chip::Optional & session, NSError * _Nullable error) + const chip::Optional & session, NSError * _Nullable error) override { // Make sure we don't hold on to our action longer than we have to. auto action = mAction; @@ -198,8 +234,8 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { CHIP_ERROR err = action(*exchangeManager, session.Value(), mSuccess, mFailure, this); if (err != CHIP_NO_ERROR) { - NSLog(@"Failure performing action. C++-mangled success callback type: '%s', error: %s", typeid(T).name(), - chip::ErrorStr(err)); + ChipLogError(Controller, "Failure performing action. C++-mangled success callback type: '%s', error: %s", + typeid(T).name(), chip::ErrorStr(err)); // Take the normal async error-reporting codepath. This will also // handle cleaning us up properly. @@ -209,35 +245,13 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { virtual ~MTRCallbackBridge() {}; +protected: static void OnFailureFn(void * context, CHIP_ERROR error) { DispatchFailure(context, [MTRError errorForCHIPErrorCode:error]); } static void DispatchSuccess(void * context, id _Nullable value) { DispatchCallbackResult(context, nil, value); } static void DispatchFailure(void * context, NSError * error) { DispatchCallbackResult(context, error, nil); } -protected: - // OnDone and KeepAliveOnCallback really only make sense for subscription - // bridges, but we put them here to avoid many copies of this code in - // generated bits. - void OnDone() - { - if (!mQueue) { - delete this; - return; - } - - // Delete ourselves async, so that any error/data reports we - // queued up before getting OnDone have a chance to run. - auto * self = this; - dispatch_async(mQueue, ^{ - delete self; - }); - } - - void KeepAliveOnCallback() { mKeepAlive = true; } - - dispatch_queue_t mQueue; - private: static void DispatchCallbackResult(void * context, NSError * _Nullable error, id _Nullable value) { @@ -266,7 +280,9 @@ template class MTRCallbackBridge : public MTRCallbackBridgeBase { MTRResponseHandler mHandler; MTRActionBlock _Nullable mAction; - bool mKeepAlive = false; + // Keep our subclasses from accessing mKeepAlive directly, by putting this + // "using" in our private section. + using MTRCallbackBridgeBase::mKeepAlive; T mSuccess; MTRErrorCallback mFailure; diff --git a/src/darwin/Framework/CHIPTests/MTRAsyncCallbackQueueTests.m b/src/darwin/Framework/CHIPTests/MTRAsyncCallbackQueueTests.m index 7676d2051b9f5a..6612d8f2e3cebc 100644 --- a/src/darwin/Framework/CHIPTests/MTRAsyncCallbackQueueTests.m +++ b/src/darwin/Framework/CHIPTests/MTRAsyncCallbackQueueTests.m @@ -46,6 +46,12 @@ - (void)testRunItem }; [workQueue enqueueWorkItem:workItem1]; + // Check for leaks. + MTRAsyncCallbackQueueWorkItem * __weak weakItem = workItem1; + [self addTeardownBlock:^() { + XCTAssertNil(weakItem); + }]; + [self waitForExpectationsWithTimeout:5 handler:nil]; // see that it only ran once @@ -170,4 +176,84 @@ - (void)testRunItemsAfterDrain [self waitForExpectationsWithTimeout:5 handler:nil]; } +- (void)testRunItemNoHandlers +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Work item called"]; + + MTRAsyncCallbackWorkQueue * workQueue = [[MTRAsyncCallbackWorkQueue alloc] initWithContext:nil queue:dispatch_get_main_queue()]; + + MTRAsyncCallbackQueueWorkItem * workItem1 = + [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0)]; + MTRAsyncCallbackQueueWorkItem * workItem2 = + [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0)]; + + __block int counter = 0; + MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * _Nonnull device, NSUInteger retryCount) { + counter++; + [workItem2 endWork]; + [expectation fulfill]; + }; + workItem2.readyHandler = readyHandler; + workItem2.cancelHandler = ^{ + }; + + // Check that trying to run workItem1 does not crash. + [workQueue enqueueWorkItem:workItem1]; + [workQueue enqueueWorkItem:workItem2]; + + [self waitForExpectationsWithTimeout:5 handler:nil]; + + // see that it only ran once + XCTAssertEqual(counter, 1); +} + +- (void)testInvalidation +{ + XCTestExpectation * expectation = [self expectationWithDescription:@"Work item called"]; + XCTestExpectation * cancelExpectation = [self expectationWithDescription:@"Work item canceled"]; + + MTRAsyncCallbackWorkQueue * workQueue = [[MTRAsyncCallbackWorkQueue alloc] initWithContext:nil queue:dispatch_get_main_queue()]; + + MTRAsyncCallbackQueueWorkItem * workItem1 = + [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0)]; + MTRAsyncCallbackReadyHandler readyHandler1 = ^(MTRDevice * _Nonnull device, NSUInteger retryCount) { + // Give the code enqueing the other items a chance to run, so they can + // actually get canceled. + sleep(1); + [workQueue invalidate]; + [workItem1 endWork]; + [expectation fulfill]; + }; + workItem1.readyHandler = readyHandler1; + // No cancel handler on purpose. + [workQueue enqueueWorkItem:workItem1]; + + MTRAsyncCallbackQueueWorkItem * workItem2 = + [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0)]; + MTRAsyncCallbackReadyHandler readyHandler2 = ^(MTRDevice * _Nonnull device, NSUInteger retryCount) { + // This should never get called. + XCTAssertFalse(YES); + [workItem2 endWork]; + }; + workItem2.readyHandler = readyHandler2; + // No cancel handler on purpose. + [workQueue enqueueWorkItem:workItem2]; + + MTRAsyncCallbackQueueWorkItem * workItem3 = + [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0)]; + MTRAsyncCallbackReadyHandler readyHandler3 = ^(MTRDevice * _Nonnull device, NSUInteger retryCount) { + // This should never get called. + XCTAssertFalse(YES); + [workItem3 endWork]; + }; + dispatch_block_t cancelHandler3 = ^() { + [cancelExpectation fulfill]; + }; + workItem3.readyHandler = readyHandler3; + workItem3.cancelHandler = cancelHandler3; + [workQueue enqueueWorkItem:workItem3]; + + [self waitForExpectations:@[ expectation, cancelExpectation ] timeout:5]; +} + @end diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h index 4b2d93013988b0..72cdf6e36c620d 100755 --- a/src/include/platform/CHIPDeviceConfig.h +++ b/src/include/platform/CHIPDeviceConfig.h @@ -1282,6 +1282,38 @@ #define CHIP_DEVICE_CONFIG_PAIRING_SECONDARY_INSTRUCTION "" #endif +/** + * CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + * + * If 1, enable support for automatic CASE establishment retries. + */ +#ifndef CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES +#define CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES 1 +#endif + +#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + +/** + * CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_INITIAL_DELAY_SECONDS + * + * The initial retry delay, in seconds, for our automatic CASE retries. + */ +#ifndef CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_INITIAL_DELAY_SECONDS +#define CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_INITIAL_DELAY_SECONDS 1 +#endif + +/** + * CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_MAX_BACKOFF + * + * The maximum number of times we back off, by a factor of 2 each time, from our + * initial CASE retry interval before we plateau. + */ +#ifndef CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_MAX_BACKOFF +#define CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_MAX_BACKOFF 5 +#endif + +#endif // CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES + // -------------------- App Platform Configuration -------------------- /** diff --git a/src/include/platform/CHIPDeviceEvent.h b/src/include/platform/CHIPDeviceEvent.h index 845751eae020e3..5d9dd5ee312f35 100644 --- a/src/include/platform/CHIPDeviceEvent.h +++ b/src/include/platform/CHIPDeviceEvent.h @@ -230,6 +230,15 @@ enum PublicEventTypes * Signals that the state of the OTA engine changed. */ kOtaStateChanged, + + /** + * Server initialization has completed. + * + * Signals that all server components have been initialized and the node is ready to establish + * connections with other nodes. This event can be used to trigger on-boot actions that require + * sending messages to other nodes. + */ + kServerReady, }; /** diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp index 8068a9babf47a3..5d8ef3eeaaf7f8 100644 --- a/src/lib/dnssd/Discovery_ImplPlatform.cpp +++ b/src/lib/dnssd/Discovery_ImplPlatform.cpp @@ -603,6 +603,11 @@ CHIP_ERROR DiscoveryImplPlatform::FinalizeServiceUpdate() return ChipDnssdFinalizeServiceUpdate(); } +bool DiscoveryImplPlatform::IsInitialized() +{ + return mState == State::kInitialized; +} + CHIP_ERROR DiscoveryImplPlatform::ResolveNodeId(const PeerId & peerId) { ReturnErrorOnFailure(InitImpl()); diff --git a/src/lib/dnssd/Discovery_ImplPlatform.h b/src/lib/dnssd/Discovery_ImplPlatform.h index 565d4afaf9b33f..43a70eaf334e6f 100644 --- a/src/lib/dnssd/Discovery_ImplPlatform.h +++ b/src/lib/dnssd/Discovery_ImplPlatform.h @@ -49,6 +49,7 @@ class DiscoveryImplPlatform : public ServiceAdvertiser, public Resolver CHIP_ERROR UpdateCommissionableInstanceName() override; // Members that implement Resolver interface. + bool IsInitialized() override; void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { mResolverProxy.SetOperationalDelegate(delegate); } void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override { diff --git a/src/lib/dnssd/Resolver.h b/src/lib/dnssd/Resolver.h index 22033b0f5c324a..9f4698a40db563 100644 --- a/src/lib/dnssd/Resolver.h +++ b/src/lib/dnssd/Resolver.h @@ -346,7 +346,14 @@ class Resolver * The method must be called before other methods of this class. * If the resolver has already been initialized, the method exits immediately with no error. */ - virtual CHIP_ERROR Init(chip::Inet::EndPointManager * endPointManager) = 0; + virtual CHIP_ERROR Init(Inet::EndPointManager * endPointManager) = 0; + + /** + * Returns whether the resolver has completed the initialization. + * + * Returns true if the resolver is ready to take node resolution and discovery requests. + */ + virtual bool IsInitialized() = 0; /** * Shuts down the resolver if it has been initialized before. diff --git a/src/lib/dnssd/ResolverProxy.h b/src/lib/dnssd/ResolverProxy.h index 58025bdd14ea72..feff0a6bb4da73 100644 --- a/src/lib/dnssd/ResolverProxy.h +++ b/src/lib/dnssd/ResolverProxy.h @@ -108,6 +108,8 @@ class ResolverProxy : public Resolver return mDelegate != nullptr ? CHIP_NO_ERROR : CHIP_ERROR_NO_MEMORY; } + bool IsInitialized() override { return Resolver::Instance().IsInitialized(); } + void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { if (mDelegate != nullptr) diff --git a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp index 5faacb025d9348..c8032cb4e63dba 100644 --- a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp +++ b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp @@ -275,6 +275,7 @@ class MinMdnsResolver : public Resolver, public MdnsPacketDelegate ///// Resolver implementation CHIP_ERROR Init(chip::Inet::EndPointManager * udpEndPointManager) override; + bool IsInitialized() override; void Shutdown() override; void SetOperationalDelegate(OperationalResolveDelegate * delegate) override { mOperationalDelegate = delegate; } void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override { mCommissioningDelegate = delegate; } @@ -440,6 +441,11 @@ CHIP_ERROR MinMdnsResolver::Init(chip::Inet::EndPointManager *) override { return CHIP_NO_ERROR; } + bool IsInitialized() override { return true; } void Shutdown() override {} void SetOperationalDelegate(OperationalResolveDelegate * delegate) override {} void SetCommissioningDelegate(CommissioningResolveDelegate * delegate) override {} diff --git a/src/platform/device.gni b/src/platform/device.gni index a17bf0b9c706b2..77ca207ebbe768 100755 --- a/src/platform/device.gni +++ b/src/platform/device.gni @@ -100,7 +100,7 @@ declare_args() { # Enable Subscription persistence / resumption for CI and supported platforms if (chip_device_platform == "darwin" || chip_device_platform == "linux" || - chip_device_platform == "fake") { + chip_device_platform == "esp32" || chip_device_platform == "fake") { chip_persist_subscriptions = true } else { chip_persist_subscriptions = false diff --git a/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp b/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp index effee8c67d71a5..deb2df49e1dbca 100644 --- a/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp +++ b/src/platform/silabs/ConnectivityManagerImpl_WIFI.cpp @@ -263,8 +263,10 @@ void ConnectivityManagerImpl::DriveStationState() // disconnect the station from the AP, unless the WiFi station mode is currently // under application control. #ifndef CHIP_ONNETWORK_PAIRING + // Incase of station interface disabled & provisioned, wifi_station should not be disconnected. + // Device will try to reconnect. if (mWiFiStationMode != kWiFiStationMode_ApplicationControlled && - (mWiFiStationMode != kWiFiStationMode_Enabled || !IsWiFiStationProvisioned())) + (mWiFiStationMode != kWiFiStationMode_Enabled && !IsWiFiStationProvisioned())) { ChipLogProgress(DeviceLayer, "Disconnecting WiFi station interface"); serr = wfx_sta_discon(); diff --git a/src/platform/silabs/EFR32/BUILD.gn b/src/platform/silabs/EFR32/BUILD.gn index bce4f104280e5e..e47ed30848a072 100644 --- a/src/platform/silabs/EFR32/BUILD.gn +++ b/src/platform/silabs/EFR32/BUILD.gn @@ -18,6 +18,7 @@ import("${chip_root}/src/platform/device.gni") import("${chip_root}/build/chip/buildconfig_header.gni") import("${chip_root}/src/crypto/crypto.gni") +import("${chip_root}/third_party/silabs/silabs_board.gni") silabs_platform_dir = "${chip_root}/src/platform/silabs" @@ -31,6 +32,19 @@ if (chip_crypto == "platform") { import("//build_overrides/mbedtls.gni") } +config("efr32-platform-wifi-config") { + include_dirs = [ "wifi" ] + defines = [] + + if (use_rs911x && use_rs911x_sockets) { + include_dirs += [ "wifi/rsi-sockets" ] + defines += [ + "RS911X_SOCKETS", + "RSI_IPV6_ENABLE", + ] + } +} + static_library("EFR32") { sources = [ "${silabs_platform_dir}/BLEManagerImpl.h", @@ -110,6 +124,21 @@ static_library("EFR32") { "${silabs_platform_dir}/ConnectivityManagerImpl_WIFI.cpp", "${silabs_platform_dir}/NetworkCommissioningWiFiDriver.cpp", "${silabs_platform_dir}/NetworkCommissioningWiFiDriver.h", + "wifi/wfx_host_events.h", + "wifi/wfx_msgs.h", + "wifi/wifi_config.h", ] + + if (use_wf200 || !use_rs911x_sockets) { + sources += [ + "wifi/dhcp_client.cpp", + "wifi/dhcp_client.h", + "wifi/ethernetif.cpp", + "wifi/ethernetif.h", + "wifi/lwip_netif.cpp", + ] + } + + public_configs = [ ":efr32-platform-wifi-config" ] } } diff --git a/src/platform/silabs/EFR32/wifi/wfx_host_events.h b/src/platform/silabs/EFR32/wifi/wfx_host_events.h index 40e4d8e7fca166..a787bdc5e08b84 100644 --- a/src/platform/silabs/EFR32/wifi/wfx_host_events.h +++ b/src/platform/silabs/EFR32/wifi/wfx_host_events.h @@ -141,6 +141,12 @@ typedef struct __attribute__((__packed__)) sl_wfx_mib_req_s #define MAX_JOIN_RETRIES_COUNT 5 #endif +// WLAN retry time intervals in milli seconds +#define WLAN_MAX_RETRY_TIMER_MS 30000 +#define WLAN_MIN_RETRY_TIMER_MS 1000 +#define WLAN_RETRY_TIMER_MS 5000 +#define CONVERT_MS_TO_SEC(TimeInMS) (TimeInMS / 1000) + // WLAN related Macros #define ETH_FRAME 0 #define CMP_SUCCESS 0 @@ -370,6 +376,9 @@ sl_status_t get_all_counters(void); void sl_wfx_host_gpio_init(void); sl_status_t sl_wfx_host_process_event(sl_wfx_generic_message_t * event_payload); #endif + +void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin); + #ifdef __cplusplus } #endif diff --git a/src/platform/silabs/EFR32/wifi/wfx_notify.cpp b/src/platform/silabs/EFR32/wifi/wfx_notify.cpp index 9f681e796c6d19..bbc7f91570de21 100644 --- a/src/platform/silabs/EFR32/wifi/wfx_notify.cpp +++ b/src/platform/silabs/EFR32/wifi/wfx_notify.cpp @@ -46,6 +46,8 @@ using namespace ::chip; using namespace ::chip::DeviceLayer; +extern uint32_t retryInterval; + /* * Notifications to the upper-layer * All done in the context of the RSI/WiFi task (rsi_if.c) @@ -187,3 +189,44 @@ void wfx_ip_changed_notify(int got_ip) chip::DeviceLayer::PlatformMgr().UnlockChipStack(); } } + +/************************************************************************************** + * @fn void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin) + * @brief + * Based on condition will delay for a certain period of time. + * @param[in] is_wifi_disconnection_event, retryJoin + * @return None + ********************************************************************************************/ +void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin) +{ + if (!is_wifi_disconnection_event) + { + /* After the reboot or a commissioning time device failed to connect with AP. + * Device will retry to connect with AP upto WFX_RSI_CONFIG_MAX_JOIN retries. + */ + if (retryJoin < MAX_JOIN_RETRIES_COUNT) + { + SILABS_LOG("%s: Next attempt after %d Seconds", __func__, CONVERT_MS_TO_SEC(WLAN_RETRY_TIMER_MS)); + vTaskDelay(pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS)); + } + else + { + SILABS_LOG("Connect failed after max %d tries", retryJoin); + } + } + else + { + /* After disconnection + * At the telescopic time interval device try to reconnect with AP, upto WLAN_MAX_RETRY_TIMER_MS intervals + * are telescopic. If interval exceed WLAN_MAX_RETRY_TIMER_MS then it will try to reconnect at + * WLAN_MAX_RETRY_TIMER_MS intervals. + */ + if (retryInterval > WLAN_MAX_RETRY_TIMER_MS) + { + retryInterval = WLAN_MAX_RETRY_TIMER_MS; + } + SILABS_LOG("%s: Next attempt after %d Seconds", __func__, CONVERT_MS_TO_SEC(retryInterval)); + vTaskDelay(pdMS_TO_TICKS(retryInterval)); + retryInterval += retryInterval; + } +} diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn index 5b9573ba9fa607..56f89dd3128390 100644 --- a/src/test_driver/efr32/BUILD.gn +++ b/src/test_driver/efr32/BUILD.gn @@ -56,7 +56,6 @@ efr32_sdk("sdk") { ] defines = [ - "BOARD_ID=${silabs_board}", "SILABS_LOG_ENABLED=1", "PW_RPC_ENABLED", diff --git a/third_party/java_deps/set_up_java_deps.sh b/third_party/java_deps/set_up_java_deps.sh index 61f0f6e9e465b3..e0210b3bfacdff 100755 --- a/third_party/java_deps/set_up_java_deps.sh +++ b/third_party/java_deps/set_up_java_deps.sh @@ -16,6 +16,6 @@ # limitations under the License. # -mkdir third_party/java_deps/artifacts +mkdir -p third_party/java_deps/artifacts curl --fail --location --silent --show-error https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar -o third_party/java_deps/artifacts/jsr305-3.0.2.jar curl --fail --location --silent --show-error https://repo1.maven.org/maven2/org/json/json/20220924/json-20220924.jar -o third_party/java_deps/artifacts/json-20220924.jar diff --git a/third_party/ot-br-posix/repo b/third_party/ot-br-posix/repo index 1813352247aa60..54170696d122bd 160000 --- a/third_party/ot-br-posix/repo +++ b/third_party/ot-br-posix/repo @@ -1 +1 @@ -Subproject commit 1813352247aa60fb8993773918f1e5b4af6f3b79 +Subproject commit 54170696d122bd4901fe0917417bfafe85c36041 diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni index f970ee3c67bc5d..c01bef488d55e1 100644 --- a/third_party/silabs/SiWx917_sdk.gni +++ b/third_party/silabs/SiWx917_sdk.gni @@ -34,7 +34,6 @@ declare_args() { enable_openthread_cli = true kvs_max_entries = 75 - use_external_flash = true # Use Silabs factory data provider example. # Users can implement their own. @@ -44,20 +43,6 @@ declare_args() { use_system_view = false } -# Explorer Kit and MGM240L do not have external flash -if (silabs_board == "BRD2703A" || silabs_board == "BRD4319A") { - use_external_flash = false -} - -# Enable LEDs by default -use_wstk_leds = true - -# Board does not support LEDs and Buttons at the same time -if (silabs_board == "BRD4317A" || silabs_board == "BRD4316A" || - silabs_board == "BRD4319A") { - use_wstk_leds = false -} - assert(efr32_sdk_root != "", "efr32_sdk_root must be specified") # Defines an efr32 SDK build target. diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni index 1807e5b97ee754..99cbca17994d9f 100644 --- a/third_party/silabs/efr32_sdk.gni +++ b/third_party/silabs/efr32_sdk.gni @@ -30,7 +30,6 @@ declare_args() { enable_openthread_cli = true kvs_max_entries = 75 - use_external_flash = true # Use Silabs factory data provider example. # Users can implement their own. @@ -39,31 +38,10 @@ declare_args() { # Enable Segger System View use_system_view = false - # Enable Buttons by default - use_wstk_buttons = true - - # Enable LEDs by default - use_wstk_leds = true - sleep_time_ms = 3300000 # 55 mins sleep -} - -# Explorer Kit and MGM240L do not have external flash -if (silabs_board == "BRD2703A" || silabs_board == "BRD4318A" || - silabs_board == "BRD4319A") { - use_external_flash = false -} - -# Board does not support LEDs and Buttons at the same time -if (silabs_board == "BRD4317A" || silabs_board == "BRD4316A" || - silabs_board == "BRD4319A" || silabs_board == "BRD4318A") { - use_wstk_leds = false -} -# Board does not support buttons -if (silabs_board == "BRD2704A") { - use_wstk_buttons = false - use_external_flash = false + # Enable Sleepy end device + enable_sleepy_device = false } assert(efr32_sdk_root != "", "efr32_sdk_root must be specified") @@ -79,12 +57,6 @@ template("efr32_sdk") { } assert(efr32_sdk_root != "", "efr32_sdk_root must be specified") - use_wf200 = false - if (defined(invoker.use_wf200)) { - if (invoker.use_wf200) { - use_wf200 = true - } - } sdk_target_name = target_name @@ -110,7 +82,6 @@ template("efr32_sdk") { "${efr32_sdk_root}/platform/CMSIS/Core/Include", "${efr32_sdk_root}/platform/CMSIS/RTOS2/Include", "${efr32_sdk_root}/platform/common/inc", - "${efr32_sdk_root}/platform/driver/button/inc", "${efr32_sdk_root}/platform/emdrv/common/inc", "${efr32_sdk_root}/platform/emdrv/gpiointerrupt/inc", "${efr32_sdk_root}/platform/emdrv/dmadrv/config", @@ -217,6 +188,57 @@ template("efr32_sdk") { #"__STACK_SIZE=0", ] + if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) { + if (use_rs911x) { + defines += [ + "SL_HEAP_SIZE=32768", + "SL_WIFI=1", + "SL_WFX_USE_SPI", + "EFX32_RS911X=1", + "RS911X_WIFI", + "RSI_WLAN_ENABLE", + "RSI_SPI_INTERFACE", + "RSI_WITH_OS", + ] + } else if (use_wf200) { + defines += [ + "SL_HEAP_SIZE=24576", + "WF200_WIFI=1", + "SL_WIFI=1", + "SL_WFX_USE_SPI", + "SL_WFX_DEBUG_MASK=0x0003", + ] + } + + if (use_wf200 || !use_rs911x_sockets) { + import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") + + defines += [ "LWIP_NETIF_API=1" ] + if (lwip_ipv4) { + defines += [ + "LWIP_IPV4=1", + + # adds following options to provide + # them to .cpp source files + # flags ported from lwipopts file + # TODO: move lwipopts to one location + "LWIP_ARP=1", + "LWIP_ICMP=1", + "LWIP_IGMP=1", + "LWIP_DHCP=1", + "LWIP_DNS=0", + ] + } else { + defines += [ "LWIP_IPV4=0" ] + } + if (lwip_ipv4) { + defines += [ "LWIP_IPV6=1" ] + } else { + defines += [ "LWIP_IPV6=0" ] + } + } + } + if (use_system_view) { _include_dirs += [ "${efr32_sdk_root}/util/third_party/segger/systemview/SEGGER", @@ -249,15 +271,13 @@ template("efr32_sdk") { _include_dirs += [ "${efr32_sdk_root}/platform/driver/button/inc" ] } - if (defined(invoker.enable_sleepy_device)) { - if (invoker.enable_sleepy_device) { - defines += [ - "CHIP_DEVICE_CONFIG_ENABLE_SED=1", - "SL_CATALOG_POWER_MANAGER_PRESENT", - "SL_CATALOG_SLEEPTIMER_PRESENT", - "SL_SLEEP_TIME_MS=${sleep_time_ms}", - ] - } + if (enable_sleepy_device) { + defines += [ + "CHIP_DEVICE_CONFIG_ENABLE_SED=1", + "SL_CATALOG_POWER_MANAGER_PRESENT", + "SL_CATALOG_SLEEPTIMER_PRESENT", + "SL_SLEEP_TIME_MS=${sleep_time_ms}", + ] } if (chip_build_libshell) { # matter shell @@ -276,12 +296,10 @@ template("efr32_sdk") { if ((defined(invoker.chip_enable_pw_rpc) && invoker.chip_enable_pw_rpc) || chip_build_libshell || enable_openthread_cli || (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) || - (defined(invoker.show_qr_code) && invoker.show_qr_code) || - (defined(invoker.disable_lcd) && !invoker.disable_lcd) || - (defined(invoker.use_external_flash) && use_external_flash)) { + show_qr_code || disable_lcd || use_external_flash) { defines += [ "CONFIG_ENABLE_UART" ] - if (defined(invoker.use_external_flash) && use_external_flash) { + if (use_external_flash) { defines += [ "CONFIG_USE_EXTERNAL_FLASH" ] _include_dirs += [ "${efr32_sdk_root}/hardware/driver/mx25_flash_shutdown/inc/sl_mx25_flash_shutdown_usart" ] @@ -425,13 +443,6 @@ template("efr32_sdk") { cflags += [ "-mcmse" ] } - if (defined(invoker.use_rs911x)) { - if (invoker.use_rs911x == true) { - #add compilation flags for rs991x build. This will be addressed directly in wiseconnect sdk in the next version release of that sdk - cflags += invoker.rs911x_cflags - } - } - if (defined(invoker.defines)) { defines += invoker.defines } @@ -667,10 +678,8 @@ template("efr32_sdk") { ] } - if (defined(invoker.enable_sleepy_device)) { - if (invoker.enable_sleepy_device) { - sources += [ "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/SiliconLabs/tick_power_manager.c" ] - } + if (enable_sleepy_device) { + sources += [ "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/SiliconLabs/tick_power_manager.c" ] } if (defined(enable_fem)) { @@ -683,9 +692,7 @@ template("efr32_sdk") { if ((defined(invoker.chip_enable_pw_rpc) && invoker.chip_enable_pw_rpc) || chip_build_libshell || enable_openthread_cli || (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) || - (defined(invoker.show_qr_code) && invoker.show_qr_code) || - (defined(invoker.disable_lcd) && !invoker.disable_lcd) || - (defined(invoker.use_external_flash) && use_external_flash)) { + show_qr_code || !disable_lcd || use_external_flash) { sources += [ "${efr32_sdk_root}/hardware/driver/memlcd/src/memlcd_usart/sl_memlcd_spi.c", "${efr32_sdk_root}/platform/emdrv/uartdrv/src/uartdrv.c", @@ -695,13 +702,12 @@ template("efr32_sdk") { "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_uartdrv_init.c", ] - if (defined(invoker.use_external_flash) && use_external_flash) { + if (use_external_flash) { sources += [ "${efr32_sdk_root}/hardware/driver/mx25_flash_shutdown/src/sl_mx25_flash_shutdown_usart/sl_mx25_flash_shutdown.c" ] } } - if ((defined(invoker.show_qr_code) && invoker.show_qr_code) || - (defined(invoker.disable_lcd) && !invoker.disable_lcd)) { + if (show_qr_code || !disable_lcd) { sources += [ "${efr32_sdk_root}/hardware/driver/memlcd/src/sl_memlcd.c", "${efr32_sdk_root}/hardware/driver/memlcd/src/sl_memlcd_display.c", diff --git a/third_party/silabs/silabs_board.gni b/third_party/silabs/silabs_board.gni index dd944c47f51039..eb6d674894b243 100644 --- a/third_party/silabs/silabs_board.gni +++ b/third_party/silabs/silabs_board.gni @@ -15,6 +15,30 @@ declare_args() { # EFR32 board used silabs_board = "" + + # LCD is enabled by default + # Boards BRD4166A, BRD2601B, BRD2703A and BRD4319A do not have a LCD so they disable it explicitly + disable_lcd = false + + # Enable Buttons by default + use_wstk_buttons = true + + # Enable LEDs on development board by default + # Boards BRD4317A, BRD4316A and BRD4319A disable this explicitly + use_wstk_leds = true + + # Boards BRD2703A and BRD4319A disable this explicitly + use_external_flash = true + + # WIFI rcp boards options for wifi apps. + use_wf200 = false + use_rs911x = false + use_rs911x_sockets = false +} + +declare_args() { + # Enables LCD Qr Code on supported devices + show_qr_code = !disable_lcd } if (silabs_board == "") { @@ -56,12 +80,18 @@ if (silabs_board == "BRD4304A") { } else if (silabs_board == "BRD4166A") { silabs_family = "efr32mg12" silabs_mcu = "EFR32MG12P332F1024GL125" + + # ThunderBoards don't have a LCD + show_qr_code = false + disable_lcd = true } else if (silabs_board == "BRD4170A") { silabs_family = "efr32mg12" silabs_mcu = "EFR32MG12P433F1024GM68" } else if (silabs_board == "BRD4325A") { silabs_family = "SiWx917" silabs_mcu = "EFR32MG12P432F1024GL125" + disable_lcd = true + show_qr_code = false } else if (silabs_board == "BRD4180A") { assert( false, @@ -81,26 +111,63 @@ if (silabs_board == "BRD4304A") { } else if (silabs_board == "BRD2601B") { silabs_family = "efr32mg24" silabs_mcu = "EFR32MG24B310F1536IM48" + + # ThunderBoards don't have a LCD, + show_qr_code = false + disable_lcd = true } else if (silabs_board == "BRD2703A") { silabs_family = "efr32mg24" silabs_mcu = "EFR32MG24B020F1536IM48" + + # Explorer Kits do not have an external flash nor a LCD + use_external_flash = false + show_qr_code = false + disable_lcd = true } else if (silabs_board == "BRD4316A") { silabs_family = "mgm24" silabs_mcu = "MGM240PB22VNA" + + # Board does not support LEDs and Buttons at the same time + use_wstk_leds = false } else if (silabs_board == "BRD4317A") { silabs_family = "mgm24" silabs_mcu = "MGM240PB32VNA" + + # Board does not support LEDs and Buttons at the same time + use_wstk_leds = false } else if (silabs_board == "BRD4319A") { silabs_family = "mgm24" silabs_mcu = "MGM240L022RNF" + + # Board does not support LEDs and Buttons at the same time + use_wstk_leds = false + + # MGM240L do not have an external flash or LCD + use_external_flash = false + show_qr_code = false + disable_lcd = true } else if (silabs_board == "BRD2704A") { silabs_family = "mgm24" silabs_mcu = "MGM240PB32VNA" + + # Explorer Kits do not have an external flash, buttons nor a LCD + use_wstk_buttons = false + use_external_flash = false + show_qr_code = false + disable_lcd = true } else if (silabs_board == "BRD4318A") { silabs_family = "mgm24" silabs_mcu = "MGM240SD22VNA" + + use_wstk_leds = false + use_external_flash = false + show_qr_code = false + disable_lcd = true } else { print( "Please provide a valid value for SILABS_BOARD env variable (currently supported BRD4304A, BRD4161A, BRD4163A, BRD4164A BRD4166A, BRD4170A, BRD4186C, BRD4187C, BRD2601B, BRD2703A, BRD4317A, BRD2704A)") assert(false, "The board ${silabs_board} is unsupported") } + +# qr code cannot be true if lcd is disabled +assert(!(disable_lcd && show_qr_code)) diff --git a/third_party/tizen/tizen_dev_certificate.py b/third_party/tizen/tizen_dev_certificate.py index 073561bad69ddd..9e43991fa51296 100755 --- a/third_party/tizen/tizen_dev_certificate.py +++ b/third_party/tizen/tizen_dev_certificate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2022 Project CHIP Authors # diff --git a/third_party/tizen/tizen_manifest_parser.py b/third_party/tizen/tizen_manifest_parser.py index 3266a4adcb858e..ddb41ed9da07e6 100755 --- a/third_party/tizen/tizen_manifest_parser.py +++ b/third_party/tizen/tizen_manifest_parser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2022 Project CHIP Authors # diff --git a/third_party/tizen/tizen_qemu.py b/third_party/tizen/tizen_qemu.py new file mode 100755 index 00000000000000..548cc7f85431f4 --- /dev/null +++ b/third_party/tizen/tizen_qemu.py @@ -0,0 +1,119 @@ +#!/usr/bin/env python3 + +# Copyright (c) 2022 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import argparse +import os +import re +import subprocess +import sys + +# Absolute path to Tizen Studio CLI tool. +tizen_sdk_root = os.environ["TIZEN_SDK_ROOT"] + +parser = argparse.ArgumentParser( + description="Run Tizen on QEMU.") +parser.add_argument( + '--smp', metavar='NUM', type=int, default=2, + help=("the number of CPUs available in QEMU; default: %(default)s")) +parser.add_argument( + '--memory', metavar='SIZE', type=int, default=512, + help=("the size of RAM assigned to QEMU; default: %(default)s")) +parser.add_argument( + '--virtio-net', action='store_true', + help="enable external network access via virtio-net") +parser.add_argument( + '--kernel', metavar='PATH', + default=os.path.join(tizen_sdk_root, "iot-qemu-virt-zImage"), + help=("path to the kernel image; " + "default: $TIZEN_SDK_ROOT/iot-qemu-virt-zImage")) +parser.add_argument( + '--image-root', metavar='IMAGE', + default=os.path.join(tizen_sdk_root, "iot-rootfs.img"), + help=("path to the root image; " + "default: $TIZEN_SDK_ROOT/iot-rootfs.img")) +parser.add_argument( + '--image-data', metavar='IMAGE', + default=os.path.join(tizen_sdk_root, "iot-sysdata.img"), + help=("path to the system data image; " + "default: $TIZEN_SDK_ROOT/iot-sysdata.img")) +parser.add_argument( + '--image-iso', metavar='IMAGE', + help=("path to the ISO image with the runner script; the ISO image " + "should have 'CHIP' label and a file named 'runner.sh' at the " + "root directory")) +parser.add_argument( + '--output', metavar='FILE', default="/dev/null", + help="store the QEMU output in a FILE") + +args = parser.parse_args() + +qemu_args = [ + 'qemu-system-arm', + '-monitor', 'null', + '-serial', 'stdio', + '-display', 'none', + '-M', 'virt', + '-smp', str(args.smp), + '-m', str(args.memory), +] + +if args.virtio_net: + # Add network support. + qemu_args += [ + '-device', 'virtio-net-device,netdev=virtio-net', + '-netdev', 'user,id=virtio-net', + ] + +if args.image_iso: + # Add a block device for the runner ISO image. + qemu_args += [ + '-device', 'virtio-blk-device,drive=virtio-blk3', + '-drive', 'file=%s,id=virtio-blk3,if=none,format=raw' % args.image_iso, + ] + +# Add Tizen image block devices. +qemu_args += [ + '-device', 'virtio-blk-device,drive=virtio-blk2', + '-drive', 'file=%s,id=virtio-blk2,if=none,format=raw,readonly=on' % args.image_data, + # XXX: Device for the root image has to be added as the last one so we can + # use /dev/vda as the root device in the kernel command line arguments. + '-device', 'virtio-blk-device,drive=virtio-blk1', + '-drive', 'file=%s,id=virtio-blk1,if=none,format=raw,readonly=on' % args.image_root, +] + +qemu_args += [ + '-kernel', args.kernel, + '-append', "console=ttyAMA0 earlyprintk earlycon root=/dev/vda", +] + +status = 0 +# Run QEMU. +with open(args.output, "wb") as output: + with subprocess.Popen(qemu_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) as proc: + for line in iter(proc.stdout.readline, b''): + + # Forward the output to the stdout and the log file. + sys.stdout.write(line.decode(sys.stdout.encoding)) + sys.stdout.flush() + output.write(line) + + # Check if the runner script has finished and save the status. + stop = re.match(rb'^### RUNNER STOP: (?P\d+)', line) + if stop: + status = int(stop.group('status')) + +# Return with the status of the runner script. +sys.exit(status) diff --git a/third_party/tizen/tizen_sdk.gni b/third_party/tizen/tizen_sdk.gni index b3d3d8bc40ecda..0ac79b3fb5ba3a 100644 --- a/third_party/tizen/tizen_sdk.gni +++ b/third_party/tizen/tizen_sdk.gni @@ -20,6 +20,7 @@ import("${build_root}/config/tizen/config.gni") tizen_dev_certificate = get_path_info("tizen_dev_certificate.py", "abspath") tizen_manifest_parser = get_path_info("tizen_manifest_parser.py", "abspath") +tizen_qemu = get_path_info("tizen_qemu.py", "abspath") # Run Tizen Studio CLI as a project builder. # @@ -161,3 +162,73 @@ template("tizen_sdk_package") { ] } } + +# Create ISO image for Tizen QEMU. +# +# Parameters: +# runner: Path to the Tizen QEMU runner script. +# assets: List of assets to copy to the ISO image. +template("tizen_qemu_mkisofs") { + # This target shall only be used for testing purposes. + testonly = true + + assert(defined(invoker.runner), "It is required to specify runner script.") + assert(get_path_info(invoker.runner, "file") == "runner.sh", + "Runner script must be named 'runner.sh'") + + image_file = "${target_gen_dir}/${target_name}.iso" + + action(target_name) { + forward_variables_from(invoker, [ "deps" ]) + inputs = [ invoker.runner ] + outputs = [ image_file ] + + args = [ + "mkisofs", + "-input-charset=default", + "-VCHIP", # Volume ID = CHIP + "-JRU", # Joliet + Rock Ridge with untranslated filenames + "-o", + rebase_path(image_file), + rebase_path(invoker.runner, root_build_dir), + ] + if (defined(invoker.assets)) { + args += invoker.assets + inputs += invoker.assets + } + + script = "${build_root}/gn_run_binary.py" + } +} + +# Run Tizen in QEMU. +# +# Parameters: +# iso_image: The path to ISO image with the runner script. +# virtio_net: Enable external network access. +template("tizen_qemu_run") { + # This target shall only be used for testing purposes. + testonly = true + + assert(defined(invoker.iso_image), + "It is required to specify ISO runner image.") + + # Store QEMU output in a dedicated log file. + output_log_file = "${root_build_dir}/tizen-qemu-" + target_name + ".log" + + action(target_name) { + forward_variables_from(invoker, [ "deps" ]) + inputs = [ invoker.iso_image ] + outputs = [ output_log_file ] + + args = [ + "--image-iso=" + invoker.iso_image, + "--output=" + rebase_path(output_log_file), + ] + if (defined(invoker.virtio_net)) { + args += [ "--virtio-net" ] + } + + script = tizen_qemu + } +} diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h deleted file mode 100644 index a0523bc6f43433..00000000000000 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ /dev/null @@ -1,1238 +0,0 @@ -/* - * - * Copyright (c) 2022 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// THIS FILE IS GENERATED BY ZAP - -// Prevent multiple inclusion -#pragma once - -// Global cluster attribute ids -#define ZCL_GENERATED_COMMAND_LIST_ATTRIBUTE_ID (0xFFF8) -#define ZCL_ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID (0xFFF9) -#define ZCL_ATTRIBUTE_LIST_SERVER_ATTRIBUTE_ID (0xFFFB) -#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC) -#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC) -#define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD) -#define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD) - -// Attribute ids for cluster: Identify - -// Client attributes - -// Server attributes -#define ZCL_IDENTIFY_TIME_ATTRIBUTE_ID (0x0000) -#define ZCL_IDENTIFY_TYPE_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Groups - -// Client attributes - -// Server attributes -#define ZCL_GROUP_NAME_SUPPORT_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Scenes - -// Client attributes - -// Server attributes -#define ZCL_SCENE_COUNT_ATTRIBUTE_ID (0x0000) -#define ZCL_CURRENT_SCENE_ATTRIBUTE_ID (0x0001) -#define ZCL_CURRENT_GROUP_ATTRIBUTE_ID (0x0002) -#define ZCL_SCENE_VALID_ATTRIBUTE_ID (0x0003) -#define ZCL_SCENE_NAME_SUPPORT_ATTRIBUTE_ID (0x0004) -#define ZCL_LAST_CONFIGURED_BY_ATTRIBUTE_ID (0x0005) - -// Attribute ids for cluster: On/Off - -// Client attributes - -// Server attributes -#define ZCL_ON_OFF_ATTRIBUTE_ID (0x0000) -#define ZCL_GLOBAL_SCENE_CONTROL_ATTRIBUTE_ID (0x4000) -#define ZCL_ON_TIME_ATTRIBUTE_ID (0x4001) -#define ZCL_OFF_WAIT_TIME_ATTRIBUTE_ID (0x4002) -#define ZCL_START_UP_ON_OFF_ATTRIBUTE_ID (0x4003) - -// Attribute ids for cluster: On/off Switch Configuration - -// Client attributes - -// Server attributes -#define ZCL_SWITCH_TYPE_ATTRIBUTE_ID (0x0000) -#define ZCL_SWITCH_ACTIONS_ATTRIBUTE_ID (0x0010) - -// Attribute ids for cluster: Level Control - -// Client attributes - -// Server attributes -#define ZCL_CURRENT_LEVEL_ATTRIBUTE_ID (0x0000) -#define ZCL_LEVEL_CONTROL_REMAINING_TIME_ATTRIBUTE_ID (0x0001) -#define ZCL_MINIMUM_LEVEL_ATTRIBUTE_ID (0x0002) -#define ZCL_MAXIMUM_LEVEL_ATTRIBUTE_ID (0x0003) -#define ZCL_CURRENT_FREQUENCY_ATTRIBUTE_ID (0x0004) -#define ZCL_MIN_FREQUENCY_ATTRIBUTE_ID (0x0005) -#define ZCL_MAX_FREQUENCY_ATTRIBUTE_ID (0x0006) -#define ZCL_OPTIONS_ATTRIBUTE_ID (0x000F) -#define ZCL_ON_OFF_TRANSITION_TIME_ATTRIBUTE_ID (0x0010) -#define ZCL_ON_LEVEL_ATTRIBUTE_ID (0x0011) -#define ZCL_ON_TRANSITION_TIME_ATTRIBUTE_ID (0x0012) -#define ZCL_OFF_TRANSITION_TIME_ATTRIBUTE_ID (0x0013) -#define ZCL_DEFAULT_MOVE_RATE_ATTRIBUTE_ID (0x0014) -#define ZCL_START_UP_CURRENT_LEVEL_ATTRIBUTE_ID (0x4000) - -// Attribute ids for cluster: Binary Input (Basic) - -// Client attributes - -// Server attributes -#define ZCL_ACTIVE_TEXT_ATTRIBUTE_ID (0x0004) -#define ZCL_DESCRIPTION_ATTRIBUTE_ID (0x001C) -#define ZCL_INACTIVE_TEXT_ATTRIBUTE_ID (0x002E) -#define ZCL_OUT_OF_SERVICE_ATTRIBUTE_ID (0x0051) -#define ZCL_POLARITY_ATTRIBUTE_ID (0x0054) -#define ZCL_PRESENT_VALUE_ATTRIBUTE_ID (0x0055) -#define ZCL_RELIABILITY_ATTRIBUTE_ID (0x0067) -#define ZCL_STATUS_FLAGS_ATTRIBUTE_ID (0x006F) -#define ZCL_APPLICATION_TYPE_ATTRIBUTE_ID (0x0100) - -// Attribute ids for cluster: Pulse Width Modulation - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Descriptor - -// Client attributes - -// Server attributes -#define ZCL_DEVICE_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_SERVER_LIST_ATTRIBUTE_ID (0x0001) -#define ZCL_CLIENT_LIST_ATTRIBUTE_ID (0x0002) -#define ZCL_PARTS_LIST_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Binding - -// Client attributes - -// Server attributes -#define ZCL_BINDING_LIST_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Access Control - -// Client attributes - -// Server attributes -#define ZCL_ACL_ATTRIBUTE_ID (0x0000) -#define ZCL_EXTENSION_ATTRIBUTE_ID (0x0001) -#define ZCL_SUBJECTS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID (0x0002) -#define ZCL_TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID (0x0003) -#define ZCL_ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID (0x0004) - -// Attribute ids for cluster: Actions - -// Client attributes - -// Server attributes -#define ZCL_ACTION_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_ENDPOINT_LIST_ATTRIBUTE_ID (0x0001) -#define ZCL_SETUP_URL_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Basic Information - -// Client attributes - -// Server attributes -#define ZCL_DATA_MODEL_REVISION_ATTRIBUTE_ID (0x0000) -#define ZCL_VENDOR_NAME_ATTRIBUTE_ID (0x0001) -#define ZCL_VENDOR_ID_ATTRIBUTE_ID (0x0002) -#define ZCL_PRODUCT_NAME_ATTRIBUTE_ID (0x0003) -#define ZCL_PRODUCT_ID_ATTRIBUTE_ID (0x0004) -#define ZCL_NODE_LABEL_ATTRIBUTE_ID (0x0005) -#define ZCL_LOCATION_ATTRIBUTE_ID (0x0006) -#define ZCL_HARDWARE_VERSION_ATTRIBUTE_ID (0x0007) -#define ZCL_HARDWARE_VERSION_STRING_ATTRIBUTE_ID (0x0008) -#define ZCL_SOFTWARE_VERSION_ATTRIBUTE_ID (0x0009) -#define ZCL_SOFTWARE_VERSION_STRING_ATTRIBUTE_ID (0x000A) -#define ZCL_MANUFACTURING_DATE_ATTRIBUTE_ID (0x000B) -#define ZCL_PART_NUMBER_ATTRIBUTE_ID (0x000C) -#define ZCL_PRODUCT_URL_ATTRIBUTE_ID (0x000D) -#define ZCL_PRODUCT_LABEL_ATTRIBUTE_ID (0x000E) -#define ZCL_SERIAL_NUMBER_ATTRIBUTE_ID (0x000F) -#define ZCL_LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID (0x0010) -#define ZCL_REACHABLE_ATTRIBUTE_ID (0x0011) -#define ZCL_UNIQUE_ID_ATTRIBUTE_ID (0x0012) -#define ZCL_CAPABILITY_MINIMA_ATTRIBUTE_ID (0x0013) - -// Attribute ids for cluster: OTA Software Update Provider - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: OTA Software Update Requestor - -// Client attributes - -// Server attributes -#define ZCL_DEFAULT_OTA_PROVIDERS_ATTRIBUTE_ID (0x0000) -#define ZCL_UPDATE_POSSIBLE_ATTRIBUTE_ID (0x0001) -#define ZCL_UPDATE_STATE_ATTRIBUTE_ID (0x0002) -#define ZCL_UPDATE_STATE_PROGRESS_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Localization Configuration - -// Client attributes - -// Server attributes -#define ZCL_ACTIVE_LOCALE_ATTRIBUTE_ID (0x0000) -#define ZCL_SUPPORTED_LOCALES_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Time Format Localization - -// Client attributes - -// Server attributes -#define ZCL_HOUR_FORMAT_ATTRIBUTE_ID (0x0000) -#define ZCL_ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID (0x0001) -#define ZCL_SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Unit Localization - -// Client attributes - -// Server attributes -#define ZCL_TEMPERATURE_UNIT_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Power Source Configuration - -// Client attributes - -// Server attributes -#define ZCL_SOURCES_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Power Source - -// Client attributes - -// Server attributes -#define ZCL_POWER_SOURCE_STATUS_ATTRIBUTE_ID (0x0000) -#define ZCL_POWER_SOURCE_ORDER_ATTRIBUTE_ID (0x0001) -#define ZCL_POWER_SOURCE_DESCRIPTION_ATTRIBUTE_ID (0x0002) -#define ZCL_POWER_SOURCE_WIRED_ASSESSED_INPUT_VOLTAGE_ATTRIBUTE_ID (0x0003) -#define ZCL_POWER_SOURCE_WIRED_ASSESSED_INPUT_FREQUENCY_ATTRIBUTE_ID (0x0004) -#define ZCL_POWER_SOURCE_WIRED_CURRENT_TYPE_ATTRIBUTE_ID (0x0005) -#define ZCL_POWER_SOURCE_WIRED_ASSESSED_CURRENT_ATTRIBUTE_ID (0x0006) -#define ZCL_POWER_SOURCE_WIRED_NOMINAL_VOLTAGE_ATTRIBUTE_ID (0x0007) -#define ZCL_POWER_SOURCE_WIRED_MAXIMUM_CURRENT_ATTRIBUTE_ID (0x0008) -#define ZCL_POWER_SOURCE_WIRED_PRESENT_ATTRIBUTE_ID (0x0009) -#define ZCL_POWER_SOURCE_ACTIVE_WIRED_FAULTS_ATTRIBUTE_ID (0x000A) -#define ZCL_POWER_SOURCE_BAT_VOLTAGE_ATTRIBUTE_ID (0x000B) -#define ZCL_POWER_SOURCE_BAT_PERCENT_REMAINING_ATTRIBUTE_ID (0x000C) -#define ZCL_POWER_SOURCE_BAT_TIME_REMAINING_ATTRIBUTE_ID (0x000D) -#define ZCL_POWER_SOURCE_BAT_CHARGE_LEVEL_ATTRIBUTE_ID (0x000E) -#define ZCL_POWER_SOURCE_BAT_REPLACEMENT_NEEDED_ATTRIBUTE_ID (0x000F) -#define ZCL_POWER_SOURCE_BAT_REPLACEABILITY_ATTRIBUTE_ID (0x0010) -#define ZCL_POWER_SOURCE_BAT_PRESENT_ATTRIBUTE_ID (0x0011) -#define ZCL_POWER_SOURCE_ACTIVE_BAT_FAULTS_ATTRIBUTE_ID (0x0012) -#define ZCL_POWER_SOURCE_BAT_REPLACEMENT_DESCRIPTION_ATTRIBUTE_ID (0x0013) -#define ZCL_POWER_SOURCE_BAT_COMMON_DESIGNATION_ATTRIBUTE_ID (0x0014) -#define ZCL_POWER_SOURCE_BAT_ANSI_DESIGNATION_ATTRIBUTE_ID (0x0015) -#define ZCL_POWER_SOURCE_BAT_IEC_DESIGNATION_ATTRIBUTE_ID (0x0016) -#define ZCL_POWER_SOURCE_BAT_APPROVED_CHEMISTRY_ATTRIBUTE_ID (0x0017) -#define ZCL_POWER_SOURCE_BAT_CAPACITY_ATTRIBUTE_ID (0x0018) -#define ZCL_POWER_SOURCE_BAT_QUANTITY_ATTRIBUTE_ID (0x0019) -#define ZCL_POWER_SOURCE_BAT_CHARGE_STATE_ATTRIBUTE_ID (0x001A) -#define ZCL_POWER_SOURCE_BAT_TIME_TO_FULL_CHARGE_ATTRIBUTE_ID (0x001B) -#define ZCL_POWER_SOURCE_BAT_FUNCTIONAL_WHILE_CHARGING_ATTRIBUTE_ID (0x001C) -#define ZCL_POWER_SOURCE_BAT_CHARGING_CURRENT_ATTRIBUTE_ID (0x001D) -#define ZCL_POWER_SOURCE_ACTIVE_BAT_CHARGE_FAULTS_ATTRIBUTE_ID (0x001E) - -// Attribute ids for cluster: General Commissioning - -// Client attributes - -// Server attributes -#define ZCL_BREADCRUMB_ATTRIBUTE_ID (0x0000) -#define ZCL_BASIC_COMMISSIONING_INFO_ATTRIBUTE_ID (0x0001) -#define ZCL_REGULATORY_CONFIG_ATTRIBUTE_ID (0x0002) -#define ZCL_LOCATION_CAPABILITY_ATTRIBUTE_ID (0x0003) -#define ZCL_SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID (0x0004) - -// Attribute ids for cluster: Network Commissioning - -// Client attributes - -// Server attributes -#define ZCL_MAX_NETWORKS_ATTRIBUTE_ID (0x0000) -#define ZCL_NETWORKS_ATTRIBUTE_ID (0x0001) -#define ZCL_SCAN_MAX_TIME_SECONDS_ATTRIBUTE_ID (0x0002) -#define ZCL_CONNECT_MAX_TIME_SECONDS_ATTRIBUTE_ID (0x0003) -#define ZCL_INTERFACE_ENABLED_ATTRIBUTE_ID (0x0004) -#define ZCL_LAST_NETWORKING_STATUS_ATTRIBUTE_ID (0x0005) -#define ZCL_LAST_NETWORK_ID_ATTRIBUTE_ID (0x0006) -#define ZCL_LAST_CONNECT_ERROR_VALUE_ATTRIBUTE_ID (0x0007) - -// Attribute ids for cluster: Diagnostic Logs - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: General Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_NETWORK_INTERFACES_ATTRIBUTE_ID (0x0000) -#define ZCL_REBOOT_COUNT_ATTRIBUTE_ID (0x0001) -#define ZCL_UP_TIME_ATTRIBUTE_ID (0x0002) -#define ZCL_TOTAL_OPERATIONAL_HOURS_ATTRIBUTE_ID (0x0003) -#define ZCL_BOOT_REASONS_ATTRIBUTE_ID (0x0004) -#define ZCL_ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID (0x0005) -#define ZCL_ACTIVE_RADIO_FAULTS_ATTRIBUTE_ID (0x0006) -#define ZCL_ACTIVE_NETWORK_FAULTS_ATTRIBUTE_ID (0x0007) -#define ZCL_TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE_ID (0x0008) - -// Attribute ids for cluster: Software Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_THREAD_METRICS_ATTRIBUTE_ID (0x0000) -#define ZCL_CURRENT_HEAP_FREE_ATTRIBUTE_ID (0x0001) -#define ZCL_CURRENT_HEAP_USED_ATTRIBUTE_ID (0x0002) -#define ZCL_CURRENT_HEAP_HIGH_WATERMARK_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Thread Network Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_CHANNEL_ATTRIBUTE_ID (0x0000) -#define ZCL_ROUTING_ROLE_ATTRIBUTE_ID (0x0001) -#define ZCL_NETWORK_NAME_ATTRIBUTE_ID (0x0002) -#define ZCL_DIAG_PAN_ID_ATTRIBUTE_ID (0x0003) -#define ZCL_DIAG_EXTENDED_PAN_ID_ATTRIBUTE_ID (0x0004) -#define ZCL_MESH_LOCAL_PREFIX_ATTRIBUTE_ID (0x0005) -#define ZCL_DIAG_OVERRUN_COUNT_ATTRIBUTE_ID (0x0006) -#define ZCL_NEIGHBOR_TABLE_ATTRIBUTE_ID (0x0007) -#define ZCL_ROUTE_TABLE_ATTRIBUTE_ID (0x0008) -#define ZCL_PARTITION_ID_ATTRIBUTE_ID (0x0009) -#define ZCL_WEIGHTING_ATTRIBUTE_ID (0x000A) -#define ZCL_DATA_VERSION_ATTRIBUTE_ID (0x000B) -#define ZCL_STABLE_DATA_VERSION_ATTRIBUTE_ID (0x000C) -#define ZCL_LEADER_ROUTER_ID_ATTRIBUTE_ID (0x000D) -#define ZCL_DETACHED_ROLE_COUNT_ATTRIBUTE_ID (0x000E) -#define ZCL_CHILD_ROLE_COUNT_ATTRIBUTE_ID (0x000F) -#define ZCL_ROUTER_ROLE_COUNT_ATTRIBUTE_ID (0x0010) -#define ZCL_LEADER_ROLE_COUNT_ATTRIBUTE_ID (0x0011) -#define ZCL_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID (0x0012) -#define ZCL_PARTITION_ID_CHANGE_COUNT_ATTRIBUTE_ID (0x0013) -#define ZCL_BETTER_PARTITION_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID (0x0014) -#define ZCL_PARENT_CHANGE_COUNT_ATTRIBUTE_ID (0x0015) -#define ZCL_TX_TOTAL_COUNT_ATTRIBUTE_ID (0x0016) -#define ZCL_TX_UNICAST_COUNT_ATTRIBUTE_ID (0x0017) -#define ZCL_TX_BROADCAST_COUNT_ATTRIBUTE_ID (0x0018) -#define ZCL_TX_ACK_REQUESTED_COUNT_ATTRIBUTE_ID (0x0019) -#define ZCL_TX_ACKED_COUNT_ATTRIBUTE_ID (0x001A) -#define ZCL_TX_NO_ACK_REQUESTED_COUNT_ATTRIBUTE_ID (0x001B) -#define ZCL_TX_DATA_COUNT_ATTRIBUTE_ID (0x001C) -#define ZCL_TX_DATA_POLL_COUNT_ATTRIBUTE_ID (0x001D) -#define ZCL_TX_BEACON_COUNT_ATTRIBUTE_ID (0x001E) -#define ZCL_TX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID (0x001F) -#define ZCL_TX_OTHER_COUNT_ATTRIBUTE_ID (0x0020) -#define ZCL_TX_RETRY_COUNT_ATTRIBUTE_ID (0x0021) -#define ZCL_TX_DIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID (0x0022) -#define ZCL_TX_INDIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID (0x0023) -#define ZCL_TX_ERR_CCA_COUNT_ATTRIBUTE_ID (0x0024) -#define ZCL_TX_ERR_ABORT_COUNT_ATTRIBUTE_ID (0x0025) -#define ZCL_TX_ERR_BUSY_CHANNEL_COUNT_ATTRIBUTE_ID (0x0026) -#define ZCL_RX_TOTAL_COUNT_ATTRIBUTE_ID (0x0027) -#define ZCL_RX_UNICAST_COUNT_ATTRIBUTE_ID (0x0028) -#define ZCL_RX_BROADCAST_COUNT_ATTRIBUTE_ID (0x0029) -#define ZCL_RX_DATA_COUNT_ATTRIBUTE_ID (0x002A) -#define ZCL_RX_DATA_POLL_COUNT_ATTRIBUTE_ID (0x002B) -#define ZCL_RX_BEACON_COUNT_ATTRIBUTE_ID (0x002C) -#define ZCL_RX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID (0x002D) -#define ZCL_RX_OTHER_COUNT_ATTRIBUTE_ID (0x002E) -#define ZCL_RX_ADDRESS_FILTERED_COUNT_ATTRIBUTE_ID (0x002F) -#define ZCL_RX_DESTADDR_FILTERED_COUNT_ATTRIBUTE_ID (0x0030) -#define ZCL_RX_DUPLICATED_COUNT_ATTRIBUTE_ID (0x0031) -#define ZCL_RX_ERR_NO_FRAME_COUNT_ATTRIBUTE_ID (0x0032) -#define ZCL_RX_ERR_UNKNOWN_NEIGHBOR_COUNT_ATTRIBUTE_ID (0x0033) -#define ZCL_RX_ERR_INVALID_SRC_ADDR_COUNT_ATTRIBUTE_ID (0x0034) -#define ZCL_RX_ERR_SEC_COUNT_ATTRIBUTE_ID (0x0035) -#define ZCL_RX_ERR_FCS_COUNT_ATTRIBUTE_ID (0x0036) -#define ZCL_RX_ERR_OTHER_COUNT_ATTRIBUTE_ID (0x0037) -#define ZCL_ACTIVE_TIMESTAMP_ATTRIBUTE_ID (0x0038) -#define ZCL_PENDING_TIMESTAMP_ATTRIBUTE_ID (0x0039) -#define ZCL_DELAY_ATTRIBUTE_ID (0x003A) -#define ZCL_SECURITY_POLICY_ATTRIBUTE_ID (0x003B) -#define ZCL_DIAG_CHANNEL_MASK_ATTRIBUTE_ID (0x003C) -#define ZCL_OPERATIONAL_DATASET_COMPONENTS_ATTRIBUTE_ID (0x003D) -#define ZCL_ACTIVE_THREAD_NETWORK_FAULTS_ATTRIBUTE_ID (0x003E) - -// Attribute ids for cluster: WiFi Network Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_BSSID_ATTRIBUTE_ID (0x0000) -#define ZCL_SECURITY_TYPE_ATTRIBUTE_ID (0x0001) -#define ZCL_WIFI_VERSION_ATTRIBUTE_ID (0x0002) -#define ZCL_CHANNEL_NUMBER_ATTRIBUTE_ID (0x0003) -#define ZCL_RSSI_ATTRIBUTE_ID (0x0004) -#define ZCL_BEACON_LOST_COUNT_ATTRIBUTE_ID (0x0005) -#define ZCL_BEACON_RX_COUNT_ATTRIBUTE_ID (0x0006) -#define ZCL_PACKET_MULTICAST_RX_COUNT_ATTRIBUTE_ID (0x0007) -#define ZCL_PACKET_MULTICAST_TX_COUNT_ATTRIBUTE_ID (0x0008) -#define ZCL_PACKET_UNICAST_RX_COUNT_ATTRIBUTE_ID (0x0009) -#define ZCL_PACKET_UNICAST_TX_COUNT_ATTRIBUTE_ID (0x000A) -#define ZCL_CURRENT_MAX_RATE_ATTRIBUTE_ID (0x000B) -#define ZCL_OVERRUN_COUNT_ATTRIBUTE_ID (0x000C) - -// Attribute ids for cluster: Ethernet Network Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_PHY_RATE_ATTRIBUTE_ID (0x0000) -#define ZCL_FULL_DUPLEX_ATTRIBUTE_ID (0x0001) -#define ZCL_PACKET_RX_COUNT_ATTRIBUTE_ID (0x0002) -#define ZCL_PACKET_TX_COUNT_ATTRIBUTE_ID (0x0003) -#define ZCL_TX_ERR_COUNT_ATTRIBUTE_ID (0x0004) -#define ZCL_COLLISION_COUNT_ATTRIBUTE_ID (0x0005) -#define ZCL_ETHERNET_OVERRUN_COUNT_ATTRIBUTE_ID (0x0006) -#define ZCL_CARRIER_DETECT_ATTRIBUTE_ID (0x0007) -#define ZCL_TIME_SINCE_RESET_ATTRIBUTE_ID (0x0008) - -// Attribute ids for cluster: Time Synchronization - -// Client attributes - -// Server attributes -#define ZCL_UTC_TIME_ATTRIBUTE_ID (0x0000) -#define ZCL_GRANULARITY_ATTRIBUTE_ID (0x0001) -#define ZCL_TIME_SOURCE_ATTRIBUTE_ID (0x0002) -#define ZCL_TRUSTED_TIME_NODE_ID_ATTRIBUTE_ID (0x0003) -#define ZCL_DEFAULT_NTP_ATTRIBUTE_ID (0x0004) -#define ZCL_TIME_ZONE_ATTRIBUTE_ID (0x0005) -#define ZCL_DST_OFFSET_ATTRIBUTE_ID (0x0006) -#define ZCL_LOCAL_TIME_ATTRIBUTE_ID (0x0007) -#define ZCL_TIME_ZONE_DATABASE_ATTRIBUTE_ID (0x0008) -#define ZCL_NTP_SERVER_PORT_ATTRIBUTE_ID (0x0009) - -// Attribute ids for cluster: Bridged Device Basic Information - -// Client attributes - -// Server attributes -#define ZCL_VENDOR_NAME_ATTRIBUTE_ID (0x0001) -#define ZCL_VENDOR_ID_ATTRIBUTE_ID (0x0002) -#define ZCL_PRODUCT_NAME_ATTRIBUTE_ID (0x0003) -#define ZCL_NODE_LABEL_ATTRIBUTE_ID (0x0005) -#define ZCL_HARDWARE_VERSION_ATTRIBUTE_ID (0x0007) -#define ZCL_HARDWARE_VERSION_STRING_ATTRIBUTE_ID (0x0008) -#define ZCL_SOFTWARE_VERSION_ATTRIBUTE_ID (0x0009) -#define ZCL_SOFTWARE_VERSION_STRING_ATTRIBUTE_ID (0x000A) -#define ZCL_MANUFACTURING_DATE_ATTRIBUTE_ID (0x000B) -#define ZCL_PART_NUMBER_ATTRIBUTE_ID (0x000C) -#define ZCL_PRODUCT_URL_ATTRIBUTE_ID (0x000D) -#define ZCL_PRODUCT_LABEL_ATTRIBUTE_ID (0x000E) -#define ZCL_SERIAL_NUMBER_ATTRIBUTE_ID (0x000F) -#define ZCL_REACHABLE_ATTRIBUTE_ID (0x0011) -#define ZCL_UNIQUE_ID_ATTRIBUTE_ID (0x0012) - -// Attribute ids for cluster: Switch - -// Client attributes - -// Server attributes -#define ZCL_NUMBER_OF_POSITIONS_ATTRIBUTE_ID (0x0000) -#define ZCL_CURRENT_POSITION_ATTRIBUTE_ID (0x0001) -#define ZCL_MULTI_PRESS_MAX_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Administrator Commissioning - -// Client attributes - -// Server attributes -#define ZCL_WINDOW_STATUS_ATTRIBUTE_ID (0x0000) -#define ZCL_ADMIN_FABRIC_INDEX_ATTRIBUTE_ID (0x0001) -#define ZCL_ADMIN_VENDOR_ID_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Operational Credentials - -// Client attributes - -// Server attributes -#define ZCL_NOCS_ATTRIBUTE_ID (0x0000) -#define ZCL_FABRICS_ATTRIBUTE_ID (0x0001) -#define ZCL_SUPPORTED_FABRICS_ATTRIBUTE_ID (0x0002) -#define ZCL_COMMISSIONED_FABRICS_ATTRIBUTE_ID (0x0003) -#define ZCL_TRUSTED_ROOT_CERTIFICATES_ATTRIBUTE_ID (0x0004) -#define ZCL_CURRENT_FABRIC_INDEX_ATTRIBUTE_ID (0x0005) - -// Attribute ids for cluster: Group Key Management - -// Client attributes - -// Server attributes -#define ZCL_GROUP_KEY_MAP_ATTRIBUTE_ID (0x0000) -#define ZCL_GROUP_TABLE_ATTRIBUTE_ID (0x0001) -#define ZCL_MAX_GROUPS_PER_FABRIC_ATTRIBUTE_ID (0x0002) -#define ZCL_MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Fixed Label - -// Client attributes - -// Server attributes -#define ZCL_LABEL_LIST_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: User Label - -// Client attributes - -// Server attributes -#define ZCL_LABEL_LIST_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Proxy Configuration - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Proxy Discovery - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Proxy Valid - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Boolean State - -// Client attributes - -// Server attributes -#define ZCL_STATE_VALUE_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Mode Select - -// Client attributes - -// Server attributes -#define ZCL_MODE_DESCRIPTION_ATTRIBUTE_ID (0x0000) -#define ZCL_STANDARD_NAMESPACE_ATTRIBUTE_ID (0x0001) -#define ZCL_SUPPORTED_MODES_ATTRIBUTE_ID (0x0002) -#define ZCL_CURRENT_MODE_ATTRIBUTE_ID (0x0003) -#define ZCL_START_UP_MODE_ATTRIBUTE_ID (0x0004) -#define ZCL_ON_MODE_ATTRIBUTE_ID (0x0005) - -// Attribute ids for cluster: Door Lock - -// Client attributes - -// Server attributes -#define ZCL_LOCK_STATE_ATTRIBUTE_ID (0x0000) -#define ZCL_LOCK_TYPE_ATTRIBUTE_ID (0x0001) -#define ZCL_ACTUATOR_ENABLED_ATTRIBUTE_ID (0x0002) -#define ZCL_DOOR_STATE_ATTRIBUTE_ID (0x0003) -#define ZCL_DOOR_OPEN_EVENTS_ATTRIBUTE_ID (0x0004) -#define ZCL_DOOR_CLOSED_EVENTS_ATTRIBUTE_ID (0x0005) -#define ZCL_OPEN_PERIOD_ATTRIBUTE_ID (0x0006) -#define ZCL_NUM_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID (0x0011) -#define ZCL_NUM_PIN_USERS_SUPPORTED_ATTRIBUTE_ID (0x0012) -#define ZCL_NUM_RFID_USERS_SUPPORTED_ATTRIBUTE_ID (0x0013) -#define ZCL_NUM_WEEKDAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x0014) -#define ZCL_NUM_YEARDAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x0015) -#define ZCL_NUM_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID (0x0016) -#define ZCL_MAX_PIN_LENGTH_ATTRIBUTE_ID (0x0017) -#define ZCL_MIN_PIN_LENGTH_ATTRIBUTE_ID (0x0018) -#define ZCL_MAX_RFID_CODE_LENGTH_ATTRIBUTE_ID (0x0019) -#define ZCL_MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID (0x001A) -#define ZCL_CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID (0x001B) -#define ZCL_NUM_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x001C) -#define ZCL_LANGUAGE_ATTRIBUTE_ID (0x0021) -#define ZCL_LED_SETTINGS_ATTRIBUTE_ID (0x0022) -#define ZCL_AUTO_RELOCK_TIME_ATTRIBUTE_ID (0x0023) -#define ZCL_SOUND_VOLUME_ATTRIBUTE_ID (0x0024) -#define ZCL_OPERATING_MODE_ATTRIBUTE_ID (0x0025) -#define ZCL_SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID (0x0026) -#define ZCL_DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID (0x0027) -#define ZCL_ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID (0x0028) -#define ZCL_ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID (0x0029) -#define ZCL_ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID (0x002A) -#define ZCL_ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID (0x002B) -#define ZCL_LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID (0x002C) -#define ZCL_WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID (0x0030) -#define ZCL_USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID (0x0031) -#define ZCL_SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID (0x0032) -#define ZCL_REQUIRE_PIN_FOR_REMOTE_OPERATION_ATTRIBUTE_ID (0x0033) -#define ZCL_EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID (0x0035) - -// Attribute ids for cluster: Window Covering - -// Client attributes - -// Server attributes -#define ZCL_WC_TYPE_ATTRIBUTE_ID (0x0000) -#define ZCL_WC_PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID (0x0001) -#define ZCL_WC_PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID (0x0002) -#define ZCL_WC_CURRENT_POSITION_LIFT_ATTRIBUTE_ID (0x0003) -#define ZCL_WC_CURRENT_POSITION_TILT_ATTRIBUTE_ID (0x0004) -#define ZCL_WC_NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID (0x0005) -#define ZCL_WC_NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID (0x0006) -#define ZCL_WC_CONFIG_STATUS_ATTRIBUTE_ID (0x0007) -#define ZCL_WC_CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID (0x0008) -#define ZCL_WC_CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID (0x0009) -#define ZCL_WC_OPERATIONAL_STATUS_ATTRIBUTE_ID (0x000A) -#define ZCL_WC_TARGET_POSITION_LIFT_PERCENT100_THS_ATTRIBUTE_ID (0x000B) -#define ZCL_WC_TARGET_POSITION_TILT_PERCENT100_THS_ATTRIBUTE_ID (0x000C) -#define ZCL_WC_END_PRODUCT_TYPE_ATTRIBUTE_ID (0x000D) -#define ZCL_WC_CURRENT_POSITION_LIFT_PERCENT100_THS_ATTRIBUTE_ID (0x000E) -#define ZCL_WC_CURRENT_POSITION_TILT_PERCENT100_THS_ATTRIBUTE_ID (0x000F) -#define ZCL_WC_INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID (0x0010) -#define ZCL_WC_INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID (0x0011) -#define ZCL_WC_INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID (0x0012) -#define ZCL_WC_INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID (0x0013) -#define ZCL_WC_MODE_ATTRIBUTE_ID (0x0017) -#define ZCL_WC_SAFETY_STATUS_ATTRIBUTE_ID (0x001A) - -// Attribute ids for cluster: Barrier Control - -// Client attributes - -// Server attributes -#define ZCL_BARRIER_MOVING_STATE_ATTRIBUTE_ID (0x0001) -#define ZCL_BARRIER_SAFETY_STATUS_ATTRIBUTE_ID (0x0002) -#define ZCL_BARRIER_CAPABILITIES_ATTRIBUTE_ID (0x0003) -#define ZCL_BARRIER_OPEN_EVENTS_ATTRIBUTE_ID (0x0004) -#define ZCL_BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID (0x0005) -#define ZCL_BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID (0x0006) -#define ZCL_BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID (0x0007) -#define ZCL_BARRIER_OPEN_PERIOD_ATTRIBUTE_ID (0x0008) -#define ZCL_BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID (0x0009) -#define ZCL_BARRIER_POSITION_ATTRIBUTE_ID (0x000A) - -// Attribute ids for cluster: Pump Configuration and Control - -// Client attributes - -// Server attributes -#define ZCL_MAX_PRESSURE_ATTRIBUTE_ID (0x0000) -#define ZCL_MAX_SPEED_ATTRIBUTE_ID (0x0001) -#define ZCL_MAX_FLOW_ATTRIBUTE_ID (0x0002) -#define ZCL_MIN_CONST_PRESSURE_ATTRIBUTE_ID (0x0003) -#define ZCL_MAX_CONST_PRESSURE_ATTRIBUTE_ID (0x0004) -#define ZCL_MIN_COMP_PRESSURE_ATTRIBUTE_ID (0x0005) -#define ZCL_MAX_COMP_PRESSURE_ATTRIBUTE_ID (0x0006) -#define ZCL_MIN_CONST_SPEED_ATTRIBUTE_ID (0x0007) -#define ZCL_MAX_CONST_SPEED_ATTRIBUTE_ID (0x0008) -#define ZCL_MIN_CONST_FLOW_ATTRIBUTE_ID (0x0009) -#define ZCL_MAX_CONST_FLOW_ATTRIBUTE_ID (0x000A) -#define ZCL_MIN_CONST_TEMP_ATTRIBUTE_ID (0x000B) -#define ZCL_MAX_CONST_TEMP_ATTRIBUTE_ID (0x000C) -#define ZCL_PUMP_STATUS_ATTRIBUTE_ID (0x0010) -#define ZCL_EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID (0x0011) -#define ZCL_EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID (0x0012) -#define ZCL_CAPACITY_ATTRIBUTE_ID (0x0013) -#define ZCL_SPEED_ATTRIBUTE_ID (0x0014) -#define ZCL_LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID (0x0015) -#define ZCL_PUMP_POWER_ATTRIBUTE_ID (0x0016) -#define ZCL_LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID (0x0017) -#define ZCL_OPERATION_MODE_ATTRIBUTE_ID (0x0020) -#define ZCL_CONTROL_MODE_ATTRIBUTE_ID (0x0021) - -// Attribute ids for cluster: Thermostat - -// Client attributes - -// Server attributes -#define ZCL_LOCAL_TEMPERATURE_ATTRIBUTE_ID (0x0000) -#define ZCL_OUTDOOR_TEMPERATURE_ATTRIBUTE_ID (0x0001) -#define ZCL_THERMOSTAT_OCCUPANCY_ATTRIBUTE_ID (0x0002) -#define ZCL_ABS_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0003) -#define ZCL_ABS_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0004) -#define ZCL_ABS_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0005) -#define ZCL_ABS_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0006) -#define ZCL_PI_COOLING_DEMAND_ATTRIBUTE_ID (0x0007) -#define ZCL_PI_HEATING_DEMAND_ATTRIBUTE_ID (0x0008) -#define ZCL_HVAC_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID (0x0009) -#define ZCL_LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID (0x0010) -#define ZCL_OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID (0x0011) -#define ZCL_OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID (0x0012) -#define ZCL_UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID (0x0013) -#define ZCL_UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID (0x0014) -#define ZCL_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0015) -#define ZCL_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0016) -#define ZCL_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0017) -#define ZCL_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0018) -#define ZCL_MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID (0x0019) -#define ZCL_REMOTE_SENSING_ATTRIBUTE_ID (0x001A) -#define ZCL_CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID (0x001B) -#define ZCL_SYSTEM_MODE_ATTRIBUTE_ID (0x001C) -#define ZCL_THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID (0x001E) -#define ZCL_START_OF_WEEK_ATTRIBUTE_ID (0x0020) -#define ZCL_NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID (0x0021) -#define ZCL_NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID (0x0022) -#define ZCL_TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID (0x0023) -#define ZCL_TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID (0x0024) -#define ZCL_THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID (0x0025) -#define ZCL_THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID (0x0029) -#define ZCL_SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID (0x0030) -#define ZCL_SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID (0x0031) -#define ZCL_SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID (0x0032) -#define ZCL_OCCUPIED_SETBACK_ATTRIBUTE_ID (0x0034) -#define ZCL_OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID (0x0035) -#define ZCL_OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID (0x0036) -#define ZCL_UNOCCUPIED_SETBACK_ATTRIBUTE_ID (0x0037) -#define ZCL_UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID (0x0038) -#define ZCL_UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID (0x0039) -#define ZCL_EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID (0x003A) -#define ZCL_AC_TYPE_ATTRIBUTE_ID (0x0040) -#define ZCL_AC_CAPACITY_ATTRIBUTE_ID (0x0041) -#define ZCL_AC_REFRIGERANT_TYPE_ATTRIBUTE_ID (0x0042) -#define ZCL_AC_COMPRESSOR_TYPE_ATTRIBUTE_ID (0x0043) -#define ZCL_AC_ERROR_CODE_ATTRIBUTE_ID (0x0044) -#define ZCL_AC_LOUVER_POSITION_ATTRIBUTE_ID (0x0045) -#define ZCL_AC_COIL_TEMPERATURE_ATTRIBUTE_ID (0x0046) -#define ZCL_AC_CAPACITY_FORMAT_ATTRIBUTE_ID (0x0047) - -// Attribute ids for cluster: Fan Control - -// Client attributes - -// Server attributes -#define ZCL_FAN_MODE_ATTRIBUTE_ID (0x0000) -#define ZCL_FAN_MODE_SEQUENCE_ATTRIBUTE_ID (0x0001) -#define ZCL_PERCENT_SETTING_ATTRIBUTE_ID (0x0002) -#define ZCL_PERCENT_CURRENT_ATTRIBUTE_ID (0x0003) -#define ZCL_SPEED_MAX_ATTRIBUTE_ID (0x0004) -#define ZCL_SPEED_SETTING_ATTRIBUTE_ID (0x0005) -#define ZCL_SPEED_CURRENT_ATTRIBUTE_ID (0x0006) -#define ZCL_ROCK_SUPPORT_ATTRIBUTE_ID (0x0007) -#define ZCL_ROCK_SETTING_ATTRIBUTE_ID (0x0008) -#define ZCL_WIND_SUPPORT_ATTRIBUTE_ID (0x0009) -#define ZCL_WIND_SETTING_ATTRIBUTE_ID (0x000A) - -// Attribute ids for cluster: Thermostat User Interface Configuration - -// Client attributes - -// Server attributes -#define ZCL_TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID (0x0000) -#define ZCL_KEYPAD_LOCKOUT_ATTRIBUTE_ID (0x0001) -#define ZCL_SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Color Control - -// Client attributes - -// Server attributes -#define ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID (0x0000) -#define ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID (0x0001) -#define ZCL_COLOR_CONTROL_REMAINING_TIME_ATTRIBUTE_ID (0x0002) -#define ZCL_COLOR_CONTROL_CURRENT_X_ATTRIBUTE_ID (0x0003) -#define ZCL_COLOR_CONTROL_CURRENT_Y_ATTRIBUTE_ID (0x0004) -#define ZCL_COLOR_CONTROL_DRIFT_COMPENSATION_ATTRIBUTE_ID (0x0005) -#define ZCL_COLOR_CONTROL_COMPENSATION_TEXT_ATTRIBUTE_ID (0x0006) -#define ZCL_COLOR_CONTROL_COLOR_TEMPERATURE_ATTRIBUTE_ID (0x0007) -#define ZCL_COLOR_CONTROL_COLOR_MODE_ATTRIBUTE_ID (0x0008) -#define ZCL_COLOR_CONTROL_OPTIONS_ATTRIBUTE_ID (0x000F) -#define ZCL_COLOR_CONTROL_NUMBER_OF_PRIMARIES_ATTRIBUTE_ID (0x0010) -#define ZCL_COLOR_CONTROL_PRIMARY_1_X_ATTRIBUTE_ID (0x0011) -#define ZCL_COLOR_CONTROL_PRIMARY_1_Y_ATTRIBUTE_ID (0x0012) -#define ZCL_COLOR_CONTROL_PRIMARY_1_INTENSITY_ATTRIBUTE_ID (0x0013) -#define ZCL_COLOR_CONTROL_PRIMARY_2_X_ATTRIBUTE_ID (0x0015) -#define ZCL_COLOR_CONTROL_PRIMARY_2_Y_ATTRIBUTE_ID (0x0016) -#define ZCL_COLOR_CONTROL_PRIMARY_2_INTENSITY_ATTRIBUTE_ID (0x0017) -#define ZCL_COLOR_CONTROL_PRIMARY_3_X_ATTRIBUTE_ID (0x0019) -#define ZCL_COLOR_CONTROL_PRIMARY_3_Y_ATTRIBUTE_ID (0x001A) -#define ZCL_COLOR_CONTROL_PRIMARY_3_INTENSITY_ATTRIBUTE_ID (0x001B) -#define ZCL_COLOR_CONTROL_PRIMARY_4_X_ATTRIBUTE_ID (0x0020) -#define ZCL_COLOR_CONTROL_PRIMARY_4_Y_ATTRIBUTE_ID (0x0021) -#define ZCL_COLOR_CONTROL_PRIMARY_4_INTENSITY_ATTRIBUTE_ID (0x0022) -#define ZCL_COLOR_CONTROL_PRIMARY_5_X_ATTRIBUTE_ID (0x0024) -#define ZCL_COLOR_CONTROL_PRIMARY_5_Y_ATTRIBUTE_ID (0x0025) -#define ZCL_COLOR_CONTROL_PRIMARY_5_INTENSITY_ATTRIBUTE_ID (0x0026) -#define ZCL_COLOR_CONTROL_PRIMARY_6_X_ATTRIBUTE_ID (0x0028) -#define ZCL_COLOR_CONTROL_PRIMARY_6_Y_ATTRIBUTE_ID (0x0029) -#define ZCL_COLOR_CONTROL_PRIMARY_6_INTENSITY_ATTRIBUTE_ID (0x002A) -#define ZCL_COLOR_CONTROL_WHITE_POINT_X_ATTRIBUTE_ID (0x0030) -#define ZCL_COLOR_CONTROL_WHITE_POINT_Y_ATTRIBUTE_ID (0x0031) -#define ZCL_COLOR_CONTROL_COLOR_POINT_R_X_ATTRIBUTE_ID (0x0032) -#define ZCL_COLOR_CONTROL_COLOR_POINT_R_Y_ATTRIBUTE_ID (0x0033) -#define ZCL_COLOR_CONTROL_COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID (0x0034) -#define ZCL_COLOR_CONTROL_COLOR_POINT_G_X_ATTRIBUTE_ID (0x0036) -#define ZCL_COLOR_CONTROL_COLOR_POINT_G_Y_ATTRIBUTE_ID (0x0037) -#define ZCL_COLOR_CONTROL_COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID (0x0038) -#define ZCL_COLOR_CONTROL_COLOR_POINT_B_X_ATTRIBUTE_ID (0x003A) -#define ZCL_COLOR_CONTROL_COLOR_POINT_B_Y_ATTRIBUTE_ID (0x003B) -#define ZCL_COLOR_CONTROL_COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID (0x003C) -#define ZCL_COLOR_CONTROL_ENHANCED_CURRENT_HUE_ATTRIBUTE_ID (0x4000) -#define ZCL_COLOR_CONTROL_ENHANCED_COLOR_MODE_ATTRIBUTE_ID (0x4001) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_ACTIVE_ATTRIBUTE_ID (0x4002) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_DIRECTION_ATTRIBUTE_ID (0x4003) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_TIME_ATTRIBUTE_ID (0x4004) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID (0x4005) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID (0x4006) -#define ZCL_COLOR_CONTROL_COLOR_CAPABILITIES_ATTRIBUTE_ID (0x400A) -#define ZCL_COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MIN_ATTRIBUTE_ID (0x400B) -#define ZCL_COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MAX_ATTRIBUTE_ID (0x400C) -#define ZCL_COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS_ATTRIBUTE_ID (0x400D) -#define ZCL_START_UP_COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID (0x4010) - -// Attribute ids for cluster: Ballast Configuration - -// Client attributes - -// Server attributes -#define ZCL_PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID (0x0000) -#define ZCL_PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID (0x0001) -#define ZCL_BALLAST_STATUS_ATTRIBUTE_ID (0x0002) -#define ZCL_MIN_LEVEL_ATTRIBUTE_ID (0x0010) -#define ZCL_MAX_LEVEL_ATTRIBUTE_ID (0x0011) -#define ZCL_INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID (0x0014) -#define ZCL_BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID (0x0015) -#define ZCL_LAMP_QUANTITY_ATTRIBUTE_ID (0x0020) -#define ZCL_LAMP_TYPE_ATTRIBUTE_ID (0x0030) -#define ZCL_LAMP_MANUFACTURER_ATTRIBUTE_ID (0x0031) -#define ZCL_LAMP_RATED_HOURS_ATTRIBUTE_ID (0x0032) -#define ZCL_LAMP_BURN_HOURS_ATTRIBUTE_ID (0x0033) -#define ZCL_LAMP_ALARM_MODE_ATTRIBUTE_ID (0x0034) -#define ZCL_LAMP_BURN_HOURS_TRIP_POINT_ATTRIBUTE_ID (0x0035) - -// Attribute ids for cluster: Illuminance Measurement - -// Client attributes - -// Server attributes -#define ZCL_ILLUM_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_ILLUM_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_ILLUM_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_ILLUM_TOLERANCE_ATTRIBUTE_ID (0x0003) -#define ZCL_ILLUM_LIGHT_SENSOR_TYPE_ATTRIBUTE_ID (0x0004) - -// Attribute ids for cluster: Temperature Measurement - -// Client attributes - -// Server attributes -#define ZCL_TEMP_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_TEMP_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_TEMP_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_TEMP_TOLERANCE_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Pressure Measurement - -// Client attributes - -// Server attributes -#define ZCL_PRESSURE_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_PRESSURE_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_PRESSURE_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_PRESSURE_TOLERANCE_ATTRIBUTE_ID (0x0003) -#define ZCL_PRESSURE_SCALED_VALUE_ATTRIBUTE_ID (0x0010) -#define ZCL_PRESSURE_MIN_SCALED_VALUE_ATTRIBUTE_ID (0x0011) -#define ZCL_PRESSURE_MAX_SCALED_VALUE_ATTRIBUTE_ID (0x0012) -#define ZCL_PRESSURE_SCALED_TOLERANCE_ATTRIBUTE_ID (0x0013) -#define ZCL_PRESSURE_SCALE_ATTRIBUTE_ID (0x0014) - -// Attribute ids for cluster: Flow Measurement - -// Client attributes - -// Server attributes -#define ZCL_FLOW_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_FLOW_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_FLOW_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_FLOW_TOLERANCE_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Relative Humidity Measurement - -// Client attributes - -// Server attributes -#define ZCL_RELATIVE_HUMIDITY_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_RELATIVE_HUMIDITY_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_RELATIVE_HUMIDITY_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_RELATIVE_HUMIDITY_TOLERANCE_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Occupancy Sensing - -// Client attributes - -// Server attributes -#define ZCL_OCCUPANCY_ATTRIBUTE_ID (0x0000) -#define ZCL_OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID (0x0001) -#define ZCL_OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID (0x0002) -#define ZCL_PIR_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID (0x0010) -#define ZCL_PIR_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID (0x0011) -#define ZCL_PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID (0x0012) -#define ZCL_ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID (0x0020) -#define ZCL_ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID (0x0021) -#define ZCL_ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID (0x0022) -#define ZCL_PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID (0x0030) -#define ZCL_PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID (0x0031) -#define ZCL_PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID (0x0032) - -// Attribute ids for cluster: Wake on LAN - -// Client attributes - -// Server attributes -#define ZCL_WAKE_ON_LAN_MAC_ADDRESS_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Channel - -// Client attributes - -// Server attributes -#define ZCL_CHANNEL_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_CHANNEL_LINEUP_ATTRIBUTE_ID (0x0001) -#define ZCL_CHANNEL_CURRENT_CHANNEL_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Target Navigator - -// Client attributes - -// Server attributes -#define ZCL_TARGET_NAVIGATOR_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_TARGET_NAVIGATOR_CURRENT_TARGET_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Media Playback - -// Client attributes - -// Server attributes -#define ZCL_MEDIA_PLAYBACK_STATE_ATTRIBUTE_ID (0x0000) -#define ZCL_MEDIA_PLAYBACK_START_TIME_ATTRIBUTE_ID (0x0001) -#define ZCL_MEDIA_PLAYBACK_DURATION_ATTRIBUTE_ID (0x0002) -#define ZCL_MEDIA_PLAYBACK_PLAYBACK_POSITION_ATTRIBUTE_ID (0x0003) -#define ZCL_MEDIA_PLAYBACK_PLAYBACK_SPEED_ATTRIBUTE_ID (0x0004) -#define ZCL_MEDIA_PLAYBACK_PLAYBACK_SEEK_RANGE_END_ATTRIBUTE_ID (0x0005) -#define ZCL_MEDIA_PLAYBACK_PLAYBACK_SEEK_RANGE_START_ATTRIBUTE_ID (0x0006) - -// Attribute ids for cluster: Media Input - -// Client attributes - -// Server attributes -#define ZCL_MEDIA_INPUT_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_MEDIA_INPUT_CURRENT_INPUT_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Low Power - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Keypad Input - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Content Launcher - -// Client attributes - -// Server attributes -#define ZCL_CONTENT_LAUNCHER_ACCEPT_HEADER_ATTRIBUTE_ID (0x0000) -#define ZCL_CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Audio Output - -// Client attributes - -// Server attributes -#define ZCL_AUDIO_OUTPUT_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_AUDIO_OUTPUT_CURRENT_OUTPUT_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Application Launcher - -// Client attributes - -// Server attributes -#define ZCL_APPLICATION_LAUNCHER_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_APPLICATION_LAUNCHER_CURRENT_APP_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Application Basic - -// Client attributes - -// Server attributes -#define ZCL_APPLICATION_VENDOR_NAME_ATTRIBUTE_ID (0x0000) -#define ZCL_APPLICATION_VENDOR_ID_ATTRIBUTE_ID (0x0001) -#define ZCL_APPLICATION_NAME_ATTRIBUTE_ID (0x0002) -#define ZCL_APPLICATION_PRODUCT_ID_ATTRIBUTE_ID (0x0003) -#define ZCL_APPLICATION_APP_ATTRIBUTE_ID (0x0004) -#define ZCL_APPLICATION_STATUS_ATTRIBUTE_ID (0x0005) -#define ZCL_APPLICATION_VERSION_ATTRIBUTE_ID (0x0006) -#define ZCL_APPLICATION_ALLOWED_VENDOR_LIST_ATTRIBUTE_ID (0x0007) - -// Attribute ids for cluster: Account Login - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Electrical Measurement - -// Client attributes - -// Server attributes -#define ZCL_MEASUREMENT_TYPE_ATTRIBUTE_ID (0x0000) -#define ZCL_DC_VOLTAGE_ATTRIBUTE_ID (0x0100) -#define ZCL_DC_VOLTAGE_MIN_ATTRIBUTE_ID (0x0101) -#define ZCL_DC_VOLTAGE_MAX_ATTRIBUTE_ID (0x0102) -#define ZCL_DC_CURRENT_ATTRIBUTE_ID (0x0103) -#define ZCL_DC_CURRENT_MIN_ATTRIBUTE_ID (0x0104) -#define ZCL_DC_CURRENT_MAX_ATTRIBUTE_ID (0x0105) -#define ZCL_DC_POWER_ATTRIBUTE_ID (0x0106) -#define ZCL_DC_POWER_MIN_ATTRIBUTE_ID (0x0107) -#define ZCL_DC_POWER_MAX_ATTRIBUTE_ID (0x0108) -#define ZCL_DC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID (0x0200) -#define ZCL_DC_VOLTAGE_DIVISOR_ATTRIBUTE_ID (0x0201) -#define ZCL_DC_CURRENT_MULTIPLIER_ATTRIBUTE_ID (0x0202) -#define ZCL_DC_CURRENT_DIVISOR_ATTRIBUTE_ID (0x0203) -#define ZCL_DC_POWER_MULTIPLIER_ATTRIBUTE_ID (0x0204) -#define ZCL_DC_POWER_DIVISOR_ATTRIBUTE_ID (0x0205) -#define ZCL_AC_FREQUENCY_ATTRIBUTE_ID (0x0300) -#define ZCL_AC_FREQUENCY_MIN_ATTRIBUTE_ID (0x0301) -#define ZCL_AC_FREQUENCY_MAX_ATTRIBUTE_ID (0x0302) -#define ZCL_NEUTRAL_CURRENT_ATTRIBUTE_ID (0x0303) -#define ZCL_TOTAL_ACTIVE_POWER_ATTRIBUTE_ID (0x0304) -#define ZCL_TOTAL_REACTIVE_POWER_ATTRIBUTE_ID (0x0305) -#define ZCL_TOTAL_APPARENT_POWER_ATTRIBUTE_ID (0x0306) -#define ZCL_MEASURED_1_ST_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0307) -#define ZCL_MEASURED_3_RD_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0308) -#define ZCL_MEASURED_5_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0309) -#define ZCL_MEASURED_7_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030A) -#define ZCL_MEASURED_9_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030B) -#define ZCL_MEASURED_11_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030C) -#define ZCL_MEASURED_PHASE_1_ST_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030D) -#define ZCL_MEASURED_PHASE_3_RD_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030E) -#define ZCL_MEASURED_PHASE_5_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030F) -#define ZCL_MEASURED_PHASE_7_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0310) -#define ZCL_MEASURED_PHASE_9_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0311) -#define ZCL_MEASURED_PHASE_11_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0312) -#define ZCL_AC_FREQUENCY_MULTIPLIER_ATTRIBUTE_ID (0x0400) -#define ZCL_AC_FREQUENCY_DIVISOR_ATTRIBUTE_ID (0x0401) -#define ZCL_POWER_MULTIPLIER_ATTRIBUTE_ID (0x0402) -#define ZCL_POWER_DIVISOR_ATTRIBUTE_ID (0x0403) -#define ZCL_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID (0x0404) -#define ZCL_PHASE_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID (0x0405) -#define ZCL_INSTANTANEOUS_VOLTAGE_ATTRIBUTE_ID (0x0500) -#define ZCL_INSTANTANEOUS_LINE_CURRENT_ATTRIBUTE_ID (0x0501) -#define ZCL_INSTANTANEOUS_ACTIVE_CURRENT_ATTRIBUTE_ID (0x0502) -#define ZCL_INSTANTANEOUS_REACTIVE_CURRENT_ATTRIBUTE_ID (0x0503) -#define ZCL_INSTANTANEOUS_POWER_ATTRIBUTE_ID (0x0504) -#define ZCL_RMS_VOLTAGE_ATTRIBUTE_ID (0x0505) -#define ZCL_RMS_VOLTAGE_MIN_ATTRIBUTE_ID (0x0506) -#define ZCL_RMS_VOLTAGE_MAX_ATTRIBUTE_ID (0x0507) -#define ZCL_RMS_CURRENT_ATTRIBUTE_ID (0x0508) -#define ZCL_RMS_CURRENT_MIN_ATTRIBUTE_ID (0x0509) -#define ZCL_RMS_CURRENT_MAX_ATTRIBUTE_ID (0x050A) -#define ZCL_ACTIVE_POWER_ATTRIBUTE_ID (0x050B) -#define ZCL_ACTIVE_POWER_MIN_ATTRIBUTE_ID (0x050C) -#define ZCL_ACTIVE_POWER_MAX_ATTRIBUTE_ID (0x050D) -#define ZCL_REACTIVE_POWER_ATTRIBUTE_ID (0x050E) -#define ZCL_APPARENT_POWER_ATTRIBUTE_ID (0x050F) -#define ZCL_AC_POWER_FACTOR_ATTRIBUTE_ID (0x0510) -#define ZCL_AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_ATTRIBUTE_ID (0x0511) -#define ZCL_AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_ATTRIBUTE_ID (0x0513) -#define ZCL_RMS_EXTREME_OVER_VOLTAGE_PERIOD_ATTRIBUTE_ID (0x0514) -#define ZCL_RMS_EXTREME_UNDER_VOLTAGE_PERIOD_ATTRIBUTE_ID (0x0515) -#define ZCL_RMS_VOLTAGE_SAG_PERIOD_ATTRIBUTE_ID (0x0516) -#define ZCL_RMS_VOLTAGE_SWELL_PERIOD_ATTRIBUTE_ID (0x0517) -#define ZCL_AC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID (0x0600) -#define ZCL_AC_VOLTAGE_DIVISOR_ATTRIBUTE_ID (0x0601) -#define ZCL_AC_CURRENT_MULTIPLIER_ATTRIBUTE_ID (0x0602) -#define ZCL_AC_CURRENT_DIVISOR_ATTRIBUTE_ID (0x0603) -#define ZCL_AC_POWER_MULTIPLIER_ATTRIBUTE_ID (0x0604) -#define ZCL_AC_POWER_DIVISOR_ATTRIBUTE_ID (0x0605) -#define ZCL_DC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID (0x0700) -#define ZCL_DC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID (0x0701) -#define ZCL_DC_CURRENT_OVERLOAD_ATTRIBUTE_ID (0x0702) -#define ZCL_AC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID (0x0800) -#define ZCL_AC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID (0x0801) -#define ZCL_AC_CURRENT_OVERLOAD_ATTRIBUTE_ID (0x0802) -#define ZCL_AC_POWER_OVERLOAD_ATTRIBUTE_ID (0x0803) -#define ZCL_AC_REACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID (0x0804) -#define ZCL_AVERAGE_RMS_OVER_VOLTAGE_ATTRIBUTE_ID (0x0805) -#define ZCL_AVERAGE_RMS_UNDER_VOLTAGE_ATTRIBUTE_ID (0x0806) -#define ZCL_RMS_EXTREME_OVER_VOLTAGE_ATTRIBUTE_ID (0x0807) -#define ZCL_RMS_EXTREME_UNDER_VOLTAGE_ATTRIBUTE_ID (0x0808) -#define ZCL_RMS_VOLTAGE_SAG_ATTRIBUTE_ID (0x0809) -#define ZCL_RMS_VOLTAGE_SWELL_ATTRIBUTE_ID (0x080A) -#define ZCL_LINE_CURRENT_PHASE_B_ATTRIBUTE_ID (0x0901) -#define ZCL_ACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID (0x0902) -#define ZCL_REACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID (0x0903) -#define ZCL_RMS_VOLTAGE_PHASE_B_ATTRIBUTE_ID (0x0905) -#define ZCL_RMS_VOLTAGE_MIN_PHASE_B_ATTRIBUTE_ID (0x0906) -#define ZCL_RMS_VOLTAGE_MAX_PHASE_B_ATTRIBUTE_ID (0x0907) -#define ZCL_RMS_CURRENT_PHASE_B_ATTRIBUTE_ID (0x0908) -#define ZCL_RMS_CURRENT_MIN_PHASE_B_ATTRIBUTE_ID (0x0909) -#define ZCL_RMS_CURRENT_MAX_PHASE_B_ATTRIBUTE_ID (0x090A) -#define ZCL_ACTIVE_POWER_PHASE_B_ATTRIBUTE_ID (0x090B) -#define ZCL_ACTIVE_POWER_MIN_PHASE_B_ATTRIBUTE_ID (0x090C) -#define ZCL_ACTIVE_POWER_MAX_PHASE_B_ATTRIBUTE_ID (0x090D) -#define ZCL_REACTIVE_POWER_PHASE_B_ATTRIBUTE_ID (0x090E) -#define ZCL_APPARENT_POWER_PHASE_B_ATTRIBUTE_ID (0x090F) -#define ZCL_POWER_FACTOR_PHASE_B_ATTRIBUTE_ID (0x0910) -#define ZCL_AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0911) -#define ZCL_AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID (0x0912) -#define ZCL_AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID (0x0913) -#define ZCL_RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0914) -#define ZCL_RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0915) -#define ZCL_RMS_VOLTAGE_SAG_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0916) -#define ZCL_RMS_VOLTAGE_SWELL_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0917) -#define ZCL_LINE_CURRENT_PHASE_C_ATTRIBUTE_ID (0x0A01) -#define ZCL_ACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID (0x0A02) -#define ZCL_REACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID (0x0A03) -#define ZCL_RMS_VOLTAGE_PHASE_C_ATTRIBUTE_ID (0x0A05) -#define ZCL_RMS_VOLTAGE_MIN_PHASE_C_ATTRIBUTE_ID (0x0A06) -#define ZCL_RMS_VOLTAGE_MAX_PHASE_C_ATTRIBUTE_ID (0x0A07) -#define ZCL_RMS_CURRENT_PHASE_C_ATTRIBUTE_ID (0x0A08) -#define ZCL_RMS_CURRENT_MIN_PHASE_C_ATTRIBUTE_ID (0x0A09) -#define ZCL_RMS_CURRENT_MAX_PHASE_C_ATTRIBUTE_ID (0x0A0A) -#define ZCL_ACTIVE_POWER_PHASE_C_ATTRIBUTE_ID (0x0A0B) -#define ZCL_ACTIVE_POWER_MIN_PHASE_C_ATTRIBUTE_ID (0x0A0C) -#define ZCL_ACTIVE_POWER_MAX_PHASE_C_ATTRIBUTE_ID (0x0A0D) -#define ZCL_REACTIVE_POWER_PHASE_C_ATTRIBUTE_ID (0x0A0E) -#define ZCL_APPARENT_POWER_PHASE_C_ATTRIBUTE_ID (0x0A0F) -#define ZCL_POWER_FACTOR_PHASE_C_ATTRIBUTE_ID (0x0A10) -#define ZCL_AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A11) -#define ZCL_AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID (0x0A12) -#define ZCL_AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID (0x0A13) -#define ZCL_RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A14) -#define ZCL_RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A15) -#define ZCL_RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A16) -#define ZCL_RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A17) - -// Attribute ids for cluster: Client Monitoring - -// Client attributes - -// Server attributes -#define ZCL_IDLE_MODE_INTERVAL_ATTRIBUTE_ID (0x0000) -#define ZCL_ACTIVE_MODE_INTERVAL_ATTRIBUTE_ID (0x0001) -#define ZCL_ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID (0x0002) -#define ZCL_EXPECTED_CLIENTS_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Unit Testing - -// Client attributes - -// Server attributes -#define ZCL_BOOLEAN_ATTRIBUTE_ID (0x0000) -#define ZCL_BITMAP8_ATTRIBUTE_ID (0x0001) -#define ZCL_BITMAP16_ATTRIBUTE_ID (0x0002) -#define ZCL_BITMAP32_ATTRIBUTE_ID (0x0003) -#define ZCL_BITMAP64_ATTRIBUTE_ID (0x0004) -#define ZCL_INT8_U_ATTRIBUTE_ID (0x0005) -#define ZCL_INT16_U_ATTRIBUTE_ID (0x0006) -#define ZCL_INT24_U_ATTRIBUTE_ID (0x0007) -#define ZCL_INT32_U_ATTRIBUTE_ID (0x0008) -#define ZCL_INT40_U_ATTRIBUTE_ID (0x0009) -#define ZCL_INT48_U_ATTRIBUTE_ID (0x000A) -#define ZCL_INT56_U_ATTRIBUTE_ID (0x000B) -#define ZCL_INT64_U_ATTRIBUTE_ID (0x000C) -#define ZCL_INT8_S_ATTRIBUTE_ID (0x000D) -#define ZCL_INT16_S_ATTRIBUTE_ID (0x000E) -#define ZCL_INT24_S_ATTRIBUTE_ID (0x000F) -#define ZCL_INT32_S_ATTRIBUTE_ID (0x0010) -#define ZCL_INT40_S_ATTRIBUTE_ID (0x0011) -#define ZCL_INT48_S_ATTRIBUTE_ID (0x0012) -#define ZCL_INT56_S_ATTRIBUTE_ID (0x0013) -#define ZCL_INT64_S_ATTRIBUTE_ID (0x0014) -#define ZCL_ENUM8_ATTRIBUTE_ID (0x0015) -#define ZCL_ENUM16_ATTRIBUTE_ID (0x0016) -#define ZCL_FLOAT_SINGLE_ATTRIBUTE_ID (0x0017) -#define ZCL_FLOAT_DOUBLE_ATTRIBUTE_ID (0x0018) -#define ZCL_OCTET_STRING_ATTRIBUTE_ID (0x0019) -#define ZCL_LIST_ATTRIBUTE_ID (0x001A) -#define ZCL_LIST_OCTET_STRING_ATTRIBUTE_ID (0x001B) -#define ZCL_LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID (0x001C) -#define ZCL_LONG_OCTET_STRING_ATTRIBUTE_ID (0x001D) -#define ZCL_CHAR_STRING_ATTRIBUTE_ID (0x001E) -#define ZCL_LONG_CHAR_STRING_ATTRIBUTE_ID (0x001F) -#define ZCL_EPOCH_US_ATTRIBUTE_ID (0x0020) -#define ZCL_EPOCH_S_ATTRIBUTE_ID (0x0021) -#define ZCL_TEST_VENDOR_ID_ATTRIBUTE_ID (0x0022) -#define ZCL_LIST_OF_STRUCTS_WITH_OPTIONALS_ATTRIBUTE_ID (0x0023) -#define ZCL_SIMPLE_ENUM_ATTRIBUTE_ID (0x0024) -#define ZCL_STRUCT_ATTRIBUTE_ID (0x0025) -#define ZCL_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x0026) -#define ZCL_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x0027) -#define ZCL_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x0028) -#define ZCL_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID (0x0029) -#define ZCL_LIST_LONG_OCTET_STRING_ATTRIBUTE_ID (0x002A) -#define ZCL_LIST_FABRIC_SCOPED_ATTRIBUTE_ID (0x002B) -#define ZCL_TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID (0x0030) -#define ZCL_GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID (0x0031) -#define ZCL_CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID (0x0032) -#define ZCL_UNSUPPORTED_ATTRIBUTE_ID (0x00FF) -#define ZCL_NULLABLE_BOOLEAN_ATTRIBUTE_ID (0x4000) -#define ZCL_NULLABLE_BITMAP8_ATTRIBUTE_ID (0x4001) -#define ZCL_NULLABLE_BITMAP16_ATTRIBUTE_ID (0x4002) -#define ZCL_NULLABLE_BITMAP32_ATTRIBUTE_ID (0x4003) -#define ZCL_NULLABLE_BITMAP64_ATTRIBUTE_ID (0x4004) -#define ZCL_NULLABLE_INT8_U_ATTRIBUTE_ID (0x4005) -#define ZCL_NULLABLE_INT16_U_ATTRIBUTE_ID (0x4006) -#define ZCL_NULLABLE_INT24_U_ATTRIBUTE_ID (0x4007) -#define ZCL_NULLABLE_INT32_U_ATTRIBUTE_ID (0x4008) -#define ZCL_NULLABLE_INT40_U_ATTRIBUTE_ID (0x4009) -#define ZCL_NULLABLE_INT48_U_ATTRIBUTE_ID (0x400A) -#define ZCL_NULLABLE_INT56_U_ATTRIBUTE_ID (0x400B) -#define ZCL_NULLABLE_INT64_U_ATTRIBUTE_ID (0x400C) -#define ZCL_NULLABLE_INT8_S_ATTRIBUTE_ID (0x400D) -#define ZCL_NULLABLE_INT16_S_ATTRIBUTE_ID (0x400E) -#define ZCL_NULLABLE_INT24_S_ATTRIBUTE_ID (0x400F) -#define ZCL_NULLABLE_INT32_S_ATTRIBUTE_ID (0x4010) -#define ZCL_NULLABLE_INT40_S_ATTRIBUTE_ID (0x4011) -#define ZCL_NULLABLE_INT48_S_ATTRIBUTE_ID (0x4012) -#define ZCL_NULLABLE_INT56_S_ATTRIBUTE_ID (0x4013) -#define ZCL_NULLABLE_INT64_S_ATTRIBUTE_ID (0x4014) -#define ZCL_NULLABLE_ENUM8_ATTRIBUTE_ID (0x4015) -#define ZCL_NULLABLE_ENUM16_ATTRIBUTE_ID (0x4016) -#define ZCL_NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID (0x4017) -#define ZCL_NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID (0x4018) -#define ZCL_NULLABLE_OCTET_STRING_ATTRIBUTE_ID (0x4019) -#define ZCL_NULLABLE_CHAR_STRING_ATTRIBUTE_ID (0x401E) -#define ZCL_NULLABLE_SIMPLE_ENUM_ATTRIBUTE_ID (0x4024) -#define ZCL_NULLABLE_STRUCT_ATTRIBUTE_ID (0x4025) -#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x4026) -#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x4027) -#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x4028) -#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_S_ATTRIBUTE_ID (0x4029) -#define ZCL_WRITE_ONLY_INT8_U_ATTRIBUTE_ID (0x402A) - -// Attribute ids for cluster: Fault Injection - -// Client attributes - -// Server attributes diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index d8c3a44aec3801..e54d42ba5d6843 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -688,26 +688,6 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_FEATURE_POSITION_AWARE_TILT_OFFSET (4) #define EMBER_AF_GROUP_CLUSTER_FEATURE_GROUP_NAMES (1) #define EMBER_AF_GROUP_CLUSTER_FEATURE_GROUP_NAMES_OFFSET (0) -#define EMBER_AF_IAS_ZONE_STATUS_ALARM1 (1) -#define EMBER_AF_IAS_ZONE_STATUS_ALARM1_OFFSET (0) -#define EMBER_AF_IAS_ZONE_STATUS_ALARM2 (2) -#define EMBER_AF_IAS_ZONE_STATUS_ALARM2_OFFSET (1) -#define EMBER_AF_IAS_ZONE_STATUS_TAMPER (4) -#define EMBER_AF_IAS_ZONE_STATUS_TAMPER_OFFSET (2) -#define EMBER_AF_IAS_ZONE_STATUS_BATTERY (8) -#define EMBER_AF_IAS_ZONE_STATUS_BATTERY_OFFSET (3) -#define EMBER_AF_IAS_ZONE_STATUS_SUPERVISION_REPORTS (16) -#define EMBER_AF_IAS_ZONE_STATUS_SUPERVISION_REPORTS_OFFSET (4) -#define EMBER_AF_IAS_ZONE_STATUS_RESTORE_REPORTS (32) -#define EMBER_AF_IAS_ZONE_STATUS_RESTORE_REPORTS_OFFSET (5) -#define EMBER_AF_IAS_ZONE_STATUS_TROUBLE (64) -#define EMBER_AF_IAS_ZONE_STATUS_TROUBLE_OFFSET (6) -#define EMBER_AF_IAS_ZONE_STATUS_AC (128) -#define EMBER_AF_IAS_ZONE_STATUS_AC_OFFSET (7) -#define EMBER_AF_IAS_ZONE_STATUS_TEST (256) -#define EMBER_AF_IAS_ZONE_STATUS_TEST_OFFSET (8) -#define EMBER_AF_IAS_ZONE_STATUS_BATTERY_DEFECT (512) -#define EMBER_AF_IAS_ZONE_STATUS_BATTERY_DEFECT_OFFSET (9) #define EMBER_AF_KEYPAD_INPUT_FEATURE_NAVIGATION_KEY_CODES (1) #define EMBER_AF_KEYPAD_INPUT_FEATURE_NAVIGATION_KEY_CODES_OFFSET (0) #define EMBER_AF_KEYPAD_INPUT_FEATURE_LOCATION_KEYS (2) @@ -866,12 +846,6 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_SIMPLE_BITMAP_VALUE_C_OFFSET (2) #define EMBER_AF_SOFTWARE_DIAGNOSTICS_FEATURE_WATER_MARKS (1) #define EMBER_AF_SOFTWARE_DIAGNOSTICS_FEATURE_WATER_MARKS_OFFSET (0) -#define EMBER_AF_SQUAWK_INFO_MODE (240) -#define EMBER_AF_SQUAWK_INFO_MODE_OFFSET (4) -#define EMBER_AF_SQUAWK_INFO_STROBE (8) -#define EMBER_AF_SQUAWK_INFO_STROBE_OFFSET (3) -#define EMBER_AF_SQUAWK_INFO_LEVEL (3) -#define EMBER_AF_SQUAWK_INFO_LEVEL_OFFSET (0) #define EMBER_AF_START_TIME_MINUTES (63) #define EMBER_AF_START_TIME_MINUTES_OFFSET (0) #define EMBER_AF_START_TIME_TIME_ENCODING (192) @@ -922,12 +896,6 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_TIME_STATUS_MASK_SUPERSEDING_OFFSET (3) #define EMBER_AF_UNIT_LOCALIZATION_FEATURE_TEMPERATURE_UNIT (1) #define EMBER_AF_UNIT_LOCALIZATION_FEATURE_TEMPERATURE_UNIT_OFFSET (0) -#define EMBER_AF_WARNING_INFO_MODE (240) -#define EMBER_AF_WARNING_INFO_MODE_OFFSET (4) -#define EMBER_AF_WARNING_INFO_STROBE (12) -#define EMBER_AF_WARNING_INFO_STROBE_OFFSET (2) -#define EMBER_AF_WARNING_INFO_SIREN_LEVEL (3) -#define EMBER_AF_WARNING_INFO_SIREN_LEVEL_OFFSET (0) #define EMBER_AF_WI_FI_NETWORK_DIAGNOSTICS_FEATURE_PACKET_COUNTS (1) #define EMBER_AF_WI_FI_NETWORK_DIAGNOSTICS_FEATURE_PACKET_COUNTS_OFFSET (0) #define EMBER_AF_WI_FI_NETWORK_DIAGNOSTICS_FEATURE_ERROR_COUNTS (2) diff --git a/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h index 460fa781290575..8b02038206c5ec 100644 --- a/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/tests/simulated-cluster-objects.h @@ -109,6 +109,81 @@ struct UnpairCommand } }; +struct GetCommissionerNodeIdCommand +{ + + CHIP_ERROR Encode(chip::TLV::TLVWriter & writer, chip::TLV::Tag tag) const + { + chip::TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, chip::TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; + } + + CHIP_ERROR Decode(chip::TLV::TLVReader & reader) + { + CHIP_ERROR err = CHIP_NO_ERROR; + chip::TLV::TLVType outer; + VerifyOrReturnError(chip::TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + VerifyOrReturnError(chip::TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + switch (chip::TLV::TagNumFromTag(reader.GetTag())) + { + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + + return CHIP_NO_ERROR; + } +}; + +struct GetCommissionerNodeIdResponse +{ + chip::NodeId nodeId; + + CHIP_ERROR Encode(chip::TLV::TLVWriter & writer, chip::TLV::Tag tag) const + { + chip::TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, chip::TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::ContextTag(0), nodeId)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; + } + + CHIP_ERROR Decode(chip::TLV::TLVReader & reader) + { + CHIP_ERROR err = CHIP_NO_ERROR; + chip::TLV::TLVType outer; + VerifyOrReturnError(chip::TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + VerifyOrReturnError(chip::TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + switch (chip::TLV::TagNumFromTag(reader.GetTag())) + { + case 0: + ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, nodeId)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + + return CHIP_NO_ERROR; + } +}; + struct WaitForMsCommand { uint32_t ms; @@ -1165,6 +1240,12 @@ using Type = struct PairWithCodeCommand; namespace Unpair { using Type = struct UnpairCommand; } +namespace GetCommissionerNodeId { +using Type = struct GetCommissionerNodeIdCommand; +} +namespace GetCommissionerNodeIdResponse { +using DecodableType = struct GetCommissionerNodeIdResponse; +} } // namespace Commands } // namespace CommissionerCommands diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index dfdbc2601f6d62..399f590a0ca7c8 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -8382,7 +8382,20 @@ void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * cre make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // make_unique>(Id, "identify-time", 0, UINT16_MAX, Attributes::IdentifyTime::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "identify-type", 0, UINT8_MAX, Attributes::IdentifyType::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "identify-time", Attributes::IdentifyTime::Id, credsIssuerConfig), // make_unique(Id, "identify-type", Attributes::IdentifyType::Id, credsIssuerConfig), // @@ -8420,14 +8433,27 @@ void registerClusterGroups(Commands & commands, CredentialIssuerCommands * creds // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "name-support", 0, UINT8_MAX, Attributes::NameSupport::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -8468,19 +8494,43 @@ void registerClusterScenes(Commands & commands, CredentialIssuerCommands * creds // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig), // - make_unique(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig), // - make_unique(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig), // - make_unique(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig), // - make_unique(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig), // - make_unique(Id, "last-configured-by", Attributes::LastConfiguredBy::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig), // + make_unique(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig), // + make_unique(Id, "current-group", Attributes::CurrentGroup::Id, credsIssuerConfig), // + make_unique(Id, "scene-valid", Attributes::SceneValid::Id, credsIssuerConfig), // + make_unique(Id, "name-support", Attributes::NameSupport::Id, credsIssuerConfig), // + make_unique(Id, "last-configured-by", Attributes::LastConfiguredBy::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "scene-count", 0, UINT8_MAX, Attributes::SceneCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-scene", 0, UINT8_MAX, Attributes::CurrentScene::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-group", 0, UINT16_MAX, Attributes::CurrentGroup::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "scene-valid", 0, 1, Attributes::SceneValid::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "name-support", 0, UINT8_MAX, Attributes::NameSupport::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "last-configured-by", 0, UINT64_MAX, Attributes::LastConfiguredBy::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "scene-count", Attributes::SceneCount::Id, credsIssuerConfig), // make_unique(Id, "current-scene", Attributes::CurrentScene::Id, credsIssuerConfig), // @@ -8534,11 +8584,27 @@ void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsI make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "on-time", 0, UINT16_MAX, Attributes::OnTime::Id, credsIssuerConfig), // - make_unique>(Id, "off-wait-time", 0, UINT16_MAX, Attributes::OffWaitTime::Id, + make_unique>(Id, "on-off", 0, 1, Attributes::OnOff::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "global-scene-control", 0, 1, Attributes::GlobalSceneControl::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "on-time", 0, UINT16_MAX, Attributes::OnTime::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "off-wait-time", 0, UINT16_MAX, Attributes::OffWaitTime::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "start-up-on-off", 0, UINT8_MAX, Attributes::StartUpOnOff::Id, credsIssuerConfig), // + Id, "start-up-on-off", 0, UINT8_MAX, Attributes::StartUpOnOff::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "on-off", Attributes::OnOff::Id, credsIssuerConfig), // make_unique(Id, "global-scene-control", Attributes::GlobalSceneControl::Id, credsIssuerConfig), // @@ -8582,8 +8648,21 @@ void registerClusterOnOffSwitchConfiguration(Commands & commands, CredentialIssu make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "switch-type", 0, UINT8_MAX, Attributes::SwitchType::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "switch-actions", 0, UINT8_MAX, Attributes::SwitchActions::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "switch-type", Attributes::SwitchType::Id, credsIssuerConfig), // make_unique(Id, "switch-actions", Attributes::SwitchActions::Id, credsIssuerConfig), // @@ -8645,20 +8724,48 @@ void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "current-level", 0, UINT8_MAX, Attributes::CurrentLevel::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "remaining-time", 0, UINT16_MAX, Attributes::RemainingTime::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "min-level", 0, UINT8_MAX, Attributes::MinLevel::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "max-level", 0, UINT8_MAX, Attributes::MaxLevel::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "current-frequency", 0, UINT16_MAX, Attributes::CurrentFrequency::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "min-frequency", 0, UINT16_MAX, Attributes::MinFrequency::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "max-frequency", 0, UINT16_MAX, Attributes::MaxFrequency::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( - Id, "options", 0, UINT8_MAX, Attributes::Options::Id, credsIssuerConfig), // + Id, "options", 0, UINT8_MAX, Attributes::Options::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "on-off-transition-time", 0, UINT16_MAX, Attributes::OnOffTransitionTime::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "on-level", 0, UINT8_MAX, Attributes::OnLevel::Id, - credsIssuerConfig), // - make_unique>>( - Id, "on-transition-time", 0, UINT16_MAX, Attributes::OnTransitionTime::Id, credsIssuerConfig), // - make_unique>>( - Id, "off-transition-time", 0, UINT16_MAX, Attributes::OffTransitionTime::Id, credsIssuerConfig), // - make_unique>>(Id, "default-move-rate", 0, UINT8_MAX, - Attributes::DefaultMoveRate::Id, credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "on-transition-time", 0, UINT16_MAX, + Attributes::OnTransitionTime::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "off-transition-time", 0, UINT16_MAX, + Attributes::OffTransitionTime::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "start-up-current-level", 0, UINT8_MAX, Attributes::StartUpCurrentLevel::Id, credsIssuerConfig), // + Id, "default-move-rate", 0, UINT8_MAX, Attributes::DefaultMoveRate::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "start-up-current-level", 0, UINT8_MAX, + Attributes::StartUpCurrentLevel::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "current-level", Attributes::CurrentLevel::Id, credsIssuerConfig), // make_unique(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig), // @@ -8702,28 +8809,51 @@ void registerClusterBinaryInputBasic(Commands & commands, CredentialIssuerComman // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::Id, credsIssuerConfig), // - make_unique(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig), // - make_unique(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig), // - make_unique(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig), // - make_unique(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig), // - make_unique(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig), // - make_unique(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig), // - make_unique(Id, "application-type", Attributes::ApplicationType::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig), // - make_unique>(Id, "description", Attributes::Description::Id, credsIssuerConfig), // - make_unique>(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig), // - make_unique>(Id, "out-of-service", 0, 1, Attributes::OutOfService::Id, credsIssuerConfig), // - make_unique>(Id, "present-value", 0, 1, Attributes::PresentValue::Id, credsIssuerConfig), // - make_unique>(Id, "reliability", 0, UINT8_MAX, Attributes::Reliability::Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig), // + make_unique(Id, "description", Attributes::Description::Id, credsIssuerConfig), // + make_unique(Id, "inactive-text", Attributes::InactiveText::Id, credsIssuerConfig), // + make_unique(Id, "out-of-service", Attributes::OutOfService::Id, credsIssuerConfig), // + make_unique(Id, "polarity", Attributes::Polarity::Id, credsIssuerConfig), // + make_unique(Id, "present-value", Attributes::PresentValue::Id, credsIssuerConfig), // + make_unique(Id, "reliability", Attributes::Reliability::Id, credsIssuerConfig), // + make_unique(Id, "status-flags", Attributes::StatusFlags::Id, credsIssuerConfig), // + make_unique(Id, "application-type", Attributes::ApplicationType::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "active-text", Attributes::ActiveText::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "description", Attributes::Description::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "inactive-text", Attributes::InactiveText::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "out-of-service", 0, 1, Attributes::OutOfService::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "polarity", 0, UINT8_MAX, Attributes::Polarity::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "present-value", 0, 1, Attributes::PresentValue::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "reliability", 0, UINT8_MAX, Attributes::Reliability::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "status-flags", 0, UINT8_MAX, Attributes::StatusFlags::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "application-type", 0, UINT32_MAX, Attributes::ApplicationType::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "active-text", Attributes::ActiveText::Id, credsIssuerConfig), // make_unique(Id, "description", Attributes::Description::Id, credsIssuerConfig), // @@ -8762,13 +8892,24 @@ void registerClusterPulseWidthModulation(Commands & commands, CredentialIssuerCo // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -8798,17 +8939,37 @@ void registerClusterDescriptor(Commands & commands, CredentialIssuerCommands * c // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig), // - make_unique(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig), // - make_unique(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig), // - make_unique(Id, "parts-list", Attributes::PartsList::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig), // + make_unique(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig), // + make_unique(Id, "client-list", Attributes::ClientList::Id, credsIssuerConfig), // + make_unique(Id, "parts-list", Attributes::PartsList::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "device-type-list", Attributes::DeviceTypeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "server-list", Attributes::ServerList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "client-list", Attributes::ClientList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "parts-list", Attributes::PartsList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "device-type-list", Attributes::DeviceTypeList::Id, credsIssuerConfig), // make_unique(Id, "server-list", Attributes::ServerList::Id, credsIssuerConfig), // @@ -8852,7 +9013,18 @@ void registerClusterBinding(Commands & commands, CredentialIssuerCommands * cred make_unique>(Id, credsIssuerConfig), // make_unique< WriteAttributeAsComplex>>( - Id, "binding", Attributes::Binding::Id, credsIssuerConfig), // + Id, "binding", Attributes::Binding::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "binding", Attributes::Binding::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -8900,10 +9072,30 @@ void registerClusterAccessControl(Commands & commands, CredentialIssuerCommands make_unique>(Id, credsIssuerConfig), // make_unique>>( - Id, "acl", Attributes::Acl::Id, credsIssuerConfig), // + Id, "acl", Attributes::Acl::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "extension", Attributes::Extension::Id, credsIssuerConfig), // + Id, "extension", Attributes::Extension::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "subjects-per-access-control-entry", 0, UINT16_MAX, + Attributes::SubjectsPerAccessControlEntry::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "targets-per-access-control-entry", 0, UINT16_MAX, + Attributes::TargetsPerAccessControlEntry::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "access-control-entries-per-fabric", 0, UINT16_MAX, + Attributes::AccessControlEntriesPerFabric::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "acl", Attributes::Acl::Id, credsIssuerConfig), // make_unique(Id, "extension", Attributes::Extension::Id, credsIssuerConfig), // @@ -8960,16 +9152,35 @@ void registerClusterActions(Commands & commands, CredentialIssuerCommands * cred // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig), // - make_unique(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig), // - make_unique(Id, "setup-url", Attributes::SetupURL::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig), // + make_unique(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig), // + make_unique(Id, "setup-url", Attributes::SetupURL::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique< + WriteAttributeAsComplex>>( + Id, "action-list", Attributes::ActionList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "endpoint-lists", Attributes::EndpointLists::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "setup-url", Attributes::SetupURL::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig), // make_unique(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig), // @@ -9034,10 +9245,57 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig), // - make_unique>(Id, "location", Attributes::Location::Id, credsIssuerConfig), // + make_unique>(Id, "data-model-revision", 0, UINT16_MAX, Attributes::DataModelRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "vendor-name", Attributes::VendorName::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorID::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "product-name", Attributes::ProductName::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "product-id", 0, UINT16_MAX, Attributes::ProductID::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "node-label", Attributes::NodeLabel::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "location", Attributes::Location::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "hardware-version", 0, UINT16_MAX, Attributes::HardwareVersion::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "software-version", 0, UINT32_MAX, Attributes::SoftwareVersion::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "part-number", Attributes::PartNumber::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "product-url", Attributes::ProductURL::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "product-label", Attributes::ProductLabel::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "serial-number", Attributes::SerialNumber::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "local-config-disabled", 0, 1, Attributes::LocalConfigDisabled::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "reachable", 0, 1, Attributes::Reachable::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "unique-id", Attributes::UniqueID::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>( + Id, "capability-minima", Attributes::CapabilityMinima::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "data-model-revision", Attributes::DataModelRevision::Id, credsIssuerConfig), // make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), // @@ -9098,13 +9356,24 @@ void registerClusterOtaSoftwareUpdateProvider(Commands & commands, CredentialIss // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -9148,7 +9417,25 @@ void registerClusterOtaSoftwareUpdateRequestor(Commands & commands, CredentialIs make_unique>(Id, credsIssuerConfig), // make_unique>>( - Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig), // + Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "update-possible", 0, 1, Attributes::UpdatePossible::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "update-state", 0, UINT8_MAX, Attributes::UpdateState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "update-state-progress", 0, UINT8_MAX, + Attributes::UpdateStateProgress::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "default-otaproviders", Attributes::DefaultOTAProviders::Id, credsIssuerConfig), // make_unique(Id, "update-possible", Attributes::UpdatePossible::Id, credsIssuerConfig), // @@ -9188,16 +9475,30 @@ void registerClusterLocalizationConfiguration(Commands & commands, CredentialIss // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig), // - make_unique(Id, "supported-locales", Attributes::SupportedLocales::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig), // + make_unique(Id, "supported-locales", Attributes::SupportedLocales::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "active-locale", Attributes::ActiveLocale::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>( + Id, "supported-locales", Attributes::SupportedLocales::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "active-locale", Attributes::ActiveLocale::Id, credsIssuerConfig), // make_unique(Id, "supported-locales", Attributes::SupportedLocales::Id, credsIssuerConfig), // @@ -9240,9 +9541,25 @@ void registerClusterTimeFormatLocalization(Commands & commands, CredentialIssuer make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // make_unique>( - Id, "hour-format", 0, UINT8_MAX, Attributes::HourFormat::Id, credsIssuerConfig), // + Id, "hour-format", 0, UINT8_MAX, Attributes::HourFormat::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>( - Id, "active-calendar-type", 0, UINT8_MAX, Attributes::ActiveCalendarType::Id, credsIssuerConfig), // + Id, "active-calendar-type", 0, UINT8_MAX, Attributes::ActiveCalendarType::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique< + WriteAttributeAsComplex>>( + Id, "supported-calendar-types", Attributes::SupportedCalendarTypes::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "hour-format", Attributes::HourFormat::Id, credsIssuerConfig), // make_unique(Id, "active-calendar-type", Attributes::ActiveCalendarType::Id, credsIssuerConfig), // @@ -9285,7 +9602,18 @@ void registerClusterUnitLocalization(Commands & commands, CredentialIssuerComman make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // make_unique>( - Id, "temperature-unit", 0, UINT8_MAX, Attributes::TemperatureUnit::Id, credsIssuerConfig), // + Id, "temperature-unit", 0, UINT8_MAX, Attributes::TemperatureUnit::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "temperature-unit", Attributes::TemperatureUnit::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -9316,14 +9644,27 @@ void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssu // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "sources", Attributes::Sources::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "sources", Attributes::Sources::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "sources", Attributes::Sources::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "sources", Attributes::Sources::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -9396,10 +9737,95 @@ void registerClusterPowerSource(Commands & commands, CredentialIssuerCommands * make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "status", Attributes::Status::Id, credsIssuerConfig), // - make_unique(Id, "order", Attributes::Order::Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::Id, credsIssuerConfig), // + make_unique>( + Id, "status", 0, UINT8_MAX, Attributes::Status::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "order", 0, UINT8_MAX, Attributes::Order::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>(Id, "wired-assessed-input-voltage", 0, UINT32_MAX, + Attributes::WiredAssessedInputVoltage::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "wired-assessed-input-frequency", 0, UINT16_MAX, + Attributes::WiredAssessedInputFrequency::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "wired-current-type", 0, UINT8_MAX, Attributes::WiredCurrentType::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>(Id, "wired-assessed-current", 0, UINT32_MAX, + Attributes::WiredAssessedCurrent::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "wired-nominal-voltage", 0, UINT32_MAX, Attributes::WiredNominalVoltage::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "wired-maximum-current", 0, UINT32_MAX, Attributes::WiredMaximumCurrent::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "wired-present", 0, 1, Attributes::WiredPresent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "active-wired-faults", Attributes::ActiveWiredFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "bat-voltage", 0, UINT32_MAX, Attributes::BatVoltage::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "bat-percent-remaining", 0, UINT8_MAX, + Attributes::BatPercentRemaining::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "bat-time-remaining", 0, UINT32_MAX, + Attributes::BatTimeRemaining::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "bat-charge-level", 0, UINT8_MAX, Attributes::BatChargeLevel::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "bat-replacement-needed", 0, 1, Attributes::BatReplacementNeeded::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "bat-replaceability", 0, UINT8_MAX, Attributes::BatReplaceability::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "bat-present", 0, 1, Attributes::BatPresent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "active-bat-faults", Attributes::ActiveBatFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "bat-replacement-description", Attributes::BatReplacementDescription::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "bat-common-designation", 0, UINT32_MAX, Attributes::BatCommonDesignation::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "bat-ansidesignation", Attributes::BatANSIDesignation::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "bat-iecdesignation", Attributes::BatIECDesignation::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "bat-approved-chemistry", 0, UINT32_MAX, Attributes::BatApprovedChemistry::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "bat-capacity", 0, UINT32_MAX, Attributes::BatCapacity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "bat-quantity", 0, UINT8_MAX, Attributes::BatQuantity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "bat-charge-state", 0, UINT8_MAX, Attributes::BatChargeState::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>(Id, "bat-time-to-full-charge", 0, UINT32_MAX, + Attributes::BatTimeToFullCharge::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "bat-functional-while-charging", 0, 1, Attributes::BatFunctionalWhileCharging::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "bat-charging-current", 0, UINT32_MAX, + Attributes::BatChargingCurrent::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "active-bat-charge-faults", Attributes::ActiveBatChargeFaults::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "status", Attributes::Status::Id, credsIssuerConfig), // + make_unique(Id, "order", Attributes::Order::Id, credsIssuerConfig), // + make_unique(Id, "description", Attributes::Description::Id, credsIssuerConfig), // make_unique(Id, "wired-assessed-input-voltage", Attributes::WiredAssessedInputVoltage::Id, credsIssuerConfig), // make_unique(Id, "wired-assessed-input-frequency", Attributes::WiredAssessedInputFrequency::Id, @@ -9476,16 +9902,39 @@ void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCo make_unique(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig), // make_unique(Id, "location-capability", Attributes::LocationCapability::Id, credsIssuerConfig), // make_unique(Id, "supports-concurrent-connection", Attributes::SupportsConcurrentConnection::Id, - credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "breadcrumb", 0, UINT64_MAX, Attributes::Breadcrumb::Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig), // + credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "breadcrumb", 0, UINT64_MAX, Attributes::Breadcrumb::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>( + Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>( + Id, "regulatory-config", 0, UINT8_MAX, Attributes::RegulatoryConfig::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>( + Id, "location-capability", 0, UINT8_MAX, Attributes::LocationCapability::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "supports-concurrent-connection", 0, 1, Attributes::SupportsConcurrentConnection::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "breadcrumb", Attributes::Breadcrumb::Id, credsIssuerConfig), // make_unique(Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, credsIssuerConfig), // make_unique(Id, "regulatory-config", Attributes::RegulatoryConfig::Id, credsIssuerConfig), // @@ -9526,26 +9975,56 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig), // - make_unique(Id, "networks", Attributes::Networks::Id, credsIssuerConfig), // - make_unique(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig), // - make_unique(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig), // - make_unique(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig), // - make_unique(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig), // - make_unique(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig), // - make_unique(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "interface-enabled", 0, 1, Attributes::InterfaceEnabled::Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig), // - make_unique(Id, "networks", Attributes::Networks::Id, credsIssuerConfig), // - make_unique(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig), // + make_unique(Id, "networks", Attributes::Networks::Id, credsIssuerConfig), // + make_unique(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig), // + make_unique(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig), // + make_unique(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig), // + make_unique(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig), // + make_unique(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig), // + make_unique(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "max-networks", 0, UINT8_MAX, Attributes::MaxNetworks::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "networks", Attributes::Networks::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "scan-max-time-seconds", 0, UINT8_MAX, Attributes::ScanMaxTimeSeconds::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "connect-max-time-seconds", 0, UINT8_MAX, Attributes::ConnectMaxTimeSeconds::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "interface-enabled", 0, 1, Attributes::InterfaceEnabled::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique< + WriteAttribute>>( + Id, "last-networking-status", 0, UINT8_MAX, Attributes::LastNetworkingStatus::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "last-network-id", Attributes::LastNetworkID::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "last-connect-error-value", INT32_MIN, INT32_MAX, + Attributes::LastConnectErrorValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig), // + make_unique(Id, "networks", Attributes::Networks::Id, credsIssuerConfig), // + make_unique(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig), // make_unique(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig), // make_unique(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig), // @@ -9582,13 +10061,24 @@ void registerClusterDiagnosticLogs(Commands & commands, CredentialIssuerCommands // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -9629,13 +10119,47 @@ void registerClusterGeneralDiagnostics(Commands & commands, CredentialIssuerComm make_unique(Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, credsIssuerConfig), // make_unique(Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, credsIssuerConfig), // make_unique(Id, "test-event-triggers-enabled", Attributes::TestEventTriggersEnabled::Id, - credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "network-interfaces", Attributes::NetworkInterfaces::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "reboot-count", 0, UINT16_MAX, Attributes::RebootCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "up-time", 0, UINT64_MAX, Attributes::UpTime::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "total-operational-hours", 0, UINT32_MAX, Attributes::TotalOperationalHours::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "boot-reason", 0, UINT8_MAX, Attributes::BootReason::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique< + WriteAttributeAsComplex>>( + Id, "active-hardware-faults", Attributes::ActiveHardwareFaults::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique< + WriteAttributeAsComplex>>( + Id, "active-radio-faults", Attributes::ActiveRadioFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique< + WriteAttributeAsComplex>>( + Id, "active-network-faults", Attributes::ActiveNetworkFaults::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "test-event-triggers-enabled", 0, 1, Attributes::TestEventTriggersEnabled::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "network-interfaces", Attributes::NetworkInterfaces::Id, credsIssuerConfig), // make_unique(Id, "reboot-count", Attributes::RebootCount::Id, credsIssuerConfig), // @@ -9696,10 +10220,31 @@ void registerClusterSoftwareDiagnostics(Commands & commands, CredentialIssuerCom make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig), // - make_unique(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig), // - make_unique(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig), // + make_unique>>( + Id, "thread-metrics", Attributes::ThreadMetrics::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-heap-free", 0, UINT64_MAX, Attributes::CurrentHeapFree::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-heap-used", 0, UINT64_MAX, Attributes::CurrentHeapUsed::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-heap-high-watermark", 0, UINT64_MAX, + Attributes::CurrentHeapHighWatermark::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "thread-metrics", Attributes::ThreadMetrics::Id, credsIssuerConfig), // + make_unique(Id, "current-heap-free", Attributes::CurrentHeapFree::Id, credsIssuerConfig), // + make_unique(Id, "current-heap-used", Attributes::CurrentHeapUsed::Id, credsIssuerConfig), // make_unique(Id, "current-heap-high-watermark", Attributes::CurrentHeapHighWatermark::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -9810,26 +10355,183 @@ void registerClusterThreadNetworkDiagnostics(Commands & commands, CredentialIssu make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "channel", Attributes::Channel::Id, credsIssuerConfig), // - make_unique(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig), // - make_unique(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig), // - make_unique(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig), // - make_unique(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig), // - make_unique(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig), // - make_unique(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig), // - make_unique(Id, "neighbor-table", Attributes::NeighborTable::Id, credsIssuerConfig), // - make_unique(Id, "route-table", Attributes::RouteTable::Id, credsIssuerConfig), // - make_unique(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig), // - make_unique(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig), // - make_unique(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig), // - make_unique(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig), // - make_unique(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig), // - make_unique(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig), // - make_unique(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig), // - make_unique(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig), // - make_unique(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig), // - make_unique(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig), // + make_unique>>(Id, "channel", 0, UINT16_MAX, Attributes::Channel::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "routing-role", 0, UINT8_MAX, Attributes::RoutingRole::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "network-name", Attributes::NetworkName::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "pan-id", 0, UINT16_MAX, Attributes::PanId::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "extended-pan-id", 0, UINT64_MAX, + Attributes::ExtendedPanId::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "neighbor-table", Attributes::NeighborTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "route-table", Attributes::RouteTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "partition-id", 0, UINT32_MAX, Attributes::PartitionId::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "weighting", 0, UINT8_MAX, Attributes::Weighting::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "data-version", 0, UINT8_MAX, Attributes::DataVersion::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "stable-data-version", 0, UINT8_MAX, + Attributes::StableDataVersion::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "leader-router-id", 0, UINT8_MAX, + Attributes::LeaderRouterId::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "detached-role-count", 0, UINT16_MAX, Attributes::DetachedRoleCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "child-role-count", 0, UINT16_MAX, Attributes::ChildRoleCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "router-role-count", 0, UINT16_MAX, Attributes::RouterRoleCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "leader-role-count", 0, UINT16_MAX, Attributes::LeaderRoleCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "attach-attempt-count", 0, UINT16_MAX, Attributes::AttachAttemptCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "partition-id-change-count", 0, UINT16_MAX, + Attributes::PartitionIdChangeCount::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "better-partition-attach-attempt-count", 0, UINT16_MAX, + Attributes::BetterPartitionAttachAttemptCount::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "parent-change-count", 0, UINT16_MAX, Attributes::ParentChangeCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-total-count", 0, UINT32_MAX, Attributes::TxTotalCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-unicast-count", 0, UINT32_MAX, Attributes::TxUnicastCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-broadcast-count", 0, UINT32_MAX, Attributes::TxBroadcastCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-ack-requested-count", 0, UINT32_MAX, Attributes::TxAckRequestedCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-acked-count", 0, UINT32_MAX, Attributes::TxAckedCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-no-ack-requested-count", 0, UINT32_MAX, Attributes::TxNoAckRequestedCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-data-count", 0, UINT32_MAX, Attributes::TxDataCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-data-poll-count", 0, UINT32_MAX, Attributes::TxDataPollCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-beacon-count", 0, UINT32_MAX, Attributes::TxBeaconCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-beacon-request-count", 0, UINT32_MAX, Attributes::TxBeaconRequestCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-other-count", 0, UINT32_MAX, Attributes::TxOtherCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-retry-count", 0, UINT32_MAX, Attributes::TxRetryCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-direct-max-retry-expiry-count", 0, UINT32_MAX, + Attributes::TxDirectMaxRetryExpiryCount::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "tx-indirect-max-retry-expiry-count", 0, UINT32_MAX, + Attributes::TxIndirectMaxRetryExpiryCount::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "tx-err-cca-count", 0, UINT32_MAX, Attributes::TxErrCcaCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-err-abort-count", 0, UINT32_MAX, Attributes::TxErrAbortCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-err-busy-channel-count", 0, UINT32_MAX, Attributes::TxErrBusyChannelCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-total-count", 0, UINT32_MAX, Attributes::RxTotalCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-unicast-count", 0, UINT32_MAX, Attributes::RxUnicastCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-broadcast-count", 0, UINT32_MAX, Attributes::RxBroadcastCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-data-count", 0, UINT32_MAX, Attributes::RxDataCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-data-poll-count", 0, UINT32_MAX, Attributes::RxDataPollCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-beacon-count", 0, UINT32_MAX, Attributes::RxBeaconCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-beacon-request-count", 0, UINT32_MAX, Attributes::RxBeaconRequestCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-other-count", 0, UINT32_MAX, Attributes::RxOtherCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-address-filtered-count", 0, UINT32_MAX, + Attributes::RxAddressFilteredCount::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rx-dest-addr-filtered-count", 0, UINT32_MAX, + Attributes::RxDestAddrFilteredCount::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rx-duplicated-count", 0, UINT32_MAX, Attributes::RxDuplicatedCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-err-no-frame-count", 0, UINT32_MAX, Attributes::RxErrNoFrameCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-err-unknown-neighbor-count", 0, UINT32_MAX, + Attributes::RxErrUnknownNeighborCount::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rx-err-invalid-src-addr-count", 0, UINT32_MAX, + Attributes::RxErrInvalidSrcAddrCount::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rx-err-sec-count", 0, UINT32_MAX, Attributes::RxErrSecCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-err-fcs-count", 0, UINT32_MAX, Attributes::RxErrFcsCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rx-err-other-count", 0, UINT32_MAX, Attributes::RxErrOtherCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "active-timestamp", 0, UINT64_MAX, + Attributes::ActiveTimestamp::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "pending-timestamp", 0, UINT64_MAX, + Attributes::PendingTimestamp::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "delay", 0, UINT32_MAX, Attributes::Delay::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "security-policy", Attributes::SecurityPolicy::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "channel-page0mask", Attributes::ChannelPage0Mask::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "operational-dataset-components", Attributes::OperationalDatasetComponents::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique< + WriteAttributeAsComplex>>( + Id, "active-network-faults-list", Attributes::ActiveNetworkFaultsList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "channel", Attributes::Channel::Id, credsIssuerConfig), // + make_unique(Id, "routing-role", Attributes::RoutingRole::Id, credsIssuerConfig), // + make_unique(Id, "network-name", Attributes::NetworkName::Id, credsIssuerConfig), // + make_unique(Id, "pan-id", Attributes::PanId::Id, credsIssuerConfig), // + make_unique(Id, "extended-pan-id", Attributes::ExtendedPanId::Id, credsIssuerConfig), // + make_unique(Id, "mesh-local-prefix", Attributes::MeshLocalPrefix::Id, credsIssuerConfig), // + make_unique(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig), // + make_unique(Id, "neighbor-table", Attributes::NeighborTable::Id, credsIssuerConfig), // + make_unique(Id, "route-table", Attributes::RouteTable::Id, credsIssuerConfig), // + make_unique(Id, "partition-id", Attributes::PartitionId::Id, credsIssuerConfig), // + make_unique(Id, "weighting", Attributes::Weighting::Id, credsIssuerConfig), // + make_unique(Id, "data-version", Attributes::DataVersion::Id, credsIssuerConfig), // + make_unique(Id, "stable-data-version", Attributes::StableDataVersion::Id, credsIssuerConfig), // + make_unique(Id, "leader-router-id", Attributes::LeaderRouterId::Id, credsIssuerConfig), // + make_unique(Id, "detached-role-count", Attributes::DetachedRoleCount::Id, credsIssuerConfig), // + make_unique(Id, "child-role-count", Attributes::ChildRoleCount::Id, credsIssuerConfig), // + make_unique(Id, "router-role-count", Attributes::RouterRoleCount::Id, credsIssuerConfig), // + make_unique(Id, "leader-role-count", Attributes::LeaderRoleCount::Id, credsIssuerConfig), // + make_unique(Id, "attach-attempt-count", Attributes::AttachAttemptCount::Id, credsIssuerConfig), // make_unique(Id, "partition-id-change-count", Attributes::PartitionIdChangeCount::Id, credsIssuerConfig), // make_unique(Id, "better-partition-attach-attempt-count", @@ -9939,14 +10641,59 @@ void registerClusterWiFiNetworkDiagnostics(Commands & commands, CredentialIssuer make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig), // - make_unique(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig), // - make_unique(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig), // - make_unique(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig), // - make_unique(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig), // - make_unique(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig), // - make_unique(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig), // + make_unique>>( + Id, "bssid", Attributes::Bssid::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "security-type", 0, UINT8_MAX, Attributes::SecurityType::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "wi-fi-version", 0, UINT8_MAX, Attributes::WiFiVersion::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "channel-number", 0, UINT16_MAX, + Attributes::ChannelNumber::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "rssi", INT8_MIN, INT8_MAX, Attributes::Rssi::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "beacon-lost-count", 0, UINT32_MAX, + Attributes::BeaconLostCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "beacon-rx-count", 0, UINT32_MAX, + Attributes::BeaconRxCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "packet-multicast-rx-count", 0, UINT32_MAX, + Attributes::PacketMulticastRxCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "packet-multicast-tx-count", 0, UINT32_MAX, + Attributes::PacketMulticastTxCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "packet-unicast-rx-count", 0, UINT32_MAX, + Attributes::PacketUnicastRxCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "packet-unicast-tx-count", 0, UINT32_MAX, + Attributes::PacketUnicastTxCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "current-max-rate", 0, UINT64_MAX, + Attributes::CurrentMaxRate::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "bssid", Attributes::Bssid::Id, credsIssuerConfig), // + make_unique(Id, "security-type", Attributes::SecurityType::Id, credsIssuerConfig), // + make_unique(Id, "wi-fi-version", Attributes::WiFiVersion::Id, credsIssuerConfig), // + make_unique(Id, "channel-number", Attributes::ChannelNumber::Id, credsIssuerConfig), // + make_unique(Id, "rssi", Attributes::Rssi::Id, credsIssuerConfig), // + make_unique(Id, "beacon-lost-count", Attributes::BeaconLostCount::Id, credsIssuerConfig), // + make_unique(Id, "beacon-rx-count", Attributes::BeaconRxCount::Id, credsIssuerConfig), // make_unique(Id, "packet-multicast-rx-count", Attributes::PacketMulticastRxCount::Id, credsIssuerConfig), // make_unique(Id, "packet-multicast-tx-count", Attributes::PacketMulticastTxCount::Id, @@ -9990,22 +10737,51 @@ void registerClusterEthernetNetworkDiagnostics(Commands & commands, CredentialIs // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig), // - make_unique(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig), // - make_unique(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig), // - make_unique(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig), // - make_unique(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig), // - make_unique(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig), // - make_unique(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig), // - make_unique(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig), // - make_unique(Id, "time-since-reset", Attributes::TimeSinceReset::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig), // + make_unique(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig), // + make_unique(Id, "packet-rx-count", Attributes::PacketRxCount::Id, credsIssuerConfig), // + make_unique(Id, "packet-tx-count", Attributes::PacketTxCount::Id, credsIssuerConfig), // + make_unique(Id, "tx-err-count", Attributes::TxErrCount::Id, credsIssuerConfig), // + make_unique(Id, "collision-count", Attributes::CollisionCount::Id, credsIssuerConfig), // + make_unique(Id, "overrun-count", Attributes::OverrunCount::Id, credsIssuerConfig), // + make_unique(Id, "carrier-detect", Attributes::CarrierDetect::Id, credsIssuerConfig), // + make_unique(Id, "time-since-reset", Attributes::TimeSinceReset::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "phyrate", 0, UINT8_MAX, Attributes::PHYRate::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "full-duplex", 0, 1, Attributes::FullDuplex::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "packet-rx-count", 0, UINT64_MAX, Attributes::PacketRxCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "packet-tx-count", 0, UINT64_MAX, Attributes::PacketTxCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tx-err-count", 0, UINT64_MAX, Attributes::TxErrCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "collision-count", 0, UINT64_MAX, Attributes::CollisionCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "overrun-count", 0, UINT64_MAX, Attributes::OverrunCount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "carrier-detect", 0, 1, Attributes::CarrierDetect::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "time-since-reset", 0, UINT64_MAX, Attributes::TimeSinceReset::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "phyrate", Attributes::PHYRate::Id, credsIssuerConfig), // make_unique(Id, "full-duplex", Attributes::FullDuplex::Id, credsIssuerConfig), // @@ -10062,16 +10838,41 @@ void registerClusterTimeSynchronization(Commands & commands, CredentialIssuerCom make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>>( - Id, "trusted-time-node-id", 0, UINT64_MAX, Attributes::TrustedTimeNodeId::Id, credsIssuerConfig), // + make_unique>>(Id, "utctime", 0, UINT64_MAX, Attributes::UTCTime::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "granularity", 0, UINT8_MAX, Attributes::Granularity::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "time-source", 0, UINT8_MAX, Attributes::TimeSource::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "trusted-time-node-id", 0, UINT64_MAX, + Attributes::TrustedTimeNodeId::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "default-ntp", Attributes::DefaultNtp::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "time-zone", Attributes::TimeZone::Id, credsIssuerConfig), // + Id, "time-zone", Attributes::TimeZone::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "dst-offset", Attributes::DstOffset::Id, credsIssuerConfig), // + Id, "dst-offset", Attributes::DstOffset::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "local-time", 0, UINT64_MAX, Attributes::LocalTime::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "time-zone-database", 0, 1, Attributes::TimeZoneDatabase::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "ntp-server-port", 0, UINT16_MAX, + Attributes::NtpServerPort::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "utctime", Attributes::UTCTime::Id, credsIssuerConfig), // make_unique(Id, "granularity", Attributes::Granularity::Id, credsIssuerConfig), // @@ -10111,29 +10912,69 @@ void registerClusterBridgedDeviceBasicInformation(Commands & commands, Credentia // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), // - make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), // - make_unique(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig), // - make_unique(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig), // - make_unique(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig), // - make_unique(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), // - make_unique(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig), // - make_unique(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), // - make_unique(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig), // - make_unique(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig), // - make_unique(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig), // - make_unique(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig), // - make_unique(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig), // - make_unique(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig), // - make_unique(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), // + make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), // + make_unique(Id, "product-name", Attributes::ProductName::Id, credsIssuerConfig), // + make_unique(Id, "node-label", Attributes::NodeLabel::Id, credsIssuerConfig), // + make_unique(Id, "hardware-version", Attributes::HardwareVersion::Id, credsIssuerConfig), // + make_unique(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, credsIssuerConfig), // + make_unique(Id, "software-version", Attributes::SoftwareVersion::Id, credsIssuerConfig), // + make_unique(Id, "software-version-string", Attributes::SoftwareVersionString::Id, credsIssuerConfig), // + make_unique(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, credsIssuerConfig), // + make_unique(Id, "part-number", Attributes::PartNumber::Id, credsIssuerConfig), // + make_unique(Id, "product-url", Attributes::ProductURL::Id, credsIssuerConfig), // + make_unique(Id, "product-label", Attributes::ProductLabel::Id, credsIssuerConfig), // + make_unique(Id, "serial-number", Attributes::SerialNumber::Id, credsIssuerConfig), // + make_unique(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig), // + make_unique(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "vendor-name", Attributes::VendorName::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorID::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "product-name", Attributes::ProductName::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "node-label", Attributes::NodeLabel::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "hardware-version", 0, UINT16_MAX, Attributes::HardwareVersion::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "hardware-version-string", Attributes::HardwareVersionString::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "software-version", 0, UINT32_MAX, Attributes::SoftwareVersion::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "software-version-string", Attributes::SoftwareVersionString::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "manufacturing-date", Attributes::ManufacturingDate::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "part-number", Attributes::PartNumber::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "product-url", Attributes::ProductURL::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "product-label", Attributes::ProductLabel::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "serial-number", Attributes::SerialNumber::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "reachable", 0, 1, Attributes::Reachable::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "unique-id", Attributes::UniqueID::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), // make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), // @@ -10186,16 +11027,33 @@ void registerClusterSwitch(Commands & commands, CredentialIssuerCommands * creds // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig), // - make_unique(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig), // - make_unique(Id, "multi-press-max", Attributes::MultiPressMax::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig), // + make_unique(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig), // + make_unique(Id, "multi-press-max", Attributes::MultiPressMax::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "number-of-positions", 0, UINT8_MAX, Attributes::NumberOfPositions::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-position", 0, UINT8_MAX, Attributes::CurrentPosition::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "multi-press-max", 0, UINT8_MAX, Attributes::MultiPressMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "number-of-positions", Attributes::NumberOfPositions::Id, credsIssuerConfig), // make_unique(Id, "current-position", Attributes::CurrentPosition::Id, credsIssuerConfig), // @@ -10245,16 +11103,35 @@ void registerClusterAdministratorCommissioning(Commands & commands, CredentialIs // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig), // - make_unique(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig), // - make_unique(Id, "admin-vendor-id", Attributes::AdminVendorId::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig), // + make_unique(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig), // + make_unique(Id, "admin-vendor-id", Attributes::AdminVendorId::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>( + Id, "window-status", 0, UINT8_MAX, Attributes::WindowStatus::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "admin-fabric-index", 0, UINT8_MAX, Attributes::AdminFabricIndex::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>(Id, "admin-vendor-id", 0, UINT16_MAX, + Attributes::AdminVendorId::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "window-status", Attributes::WindowStatus::Id, credsIssuerConfig), // make_unique(Id, "admin-fabric-index", Attributes::AdminFabricIndex::Id, credsIssuerConfig), // @@ -10308,11 +11185,37 @@ void registerClusterOperationalCredentials(Commands & commands, CredentialIssuer make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig), // - make_unique(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig), // - make_unique(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig), // - make_unique(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig), // + make_unique>>( + Id, "nocs", Attributes::NOCs::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "fabrics", Attributes::Fabrics::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "supported-fabrics", 0, UINT8_MAX, Attributes::SupportedFabrics::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "commissioned-fabrics", 0, UINT8_MAX, Attributes::CommissionedFabrics::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "current-fabric-index", 0, UINT8_MAX, Attributes::CurrentFabricIndex::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "nocs", Attributes::NOCs::Id, credsIssuerConfig), // + make_unique(Id, "fabrics", Attributes::Fabrics::Id, credsIssuerConfig), // + make_unique(Id, "supported-fabrics", Attributes::SupportedFabrics::Id, credsIssuerConfig), // + make_unique(Id, "commissioned-fabrics", Attributes::CommissionedFabrics::Id, credsIssuerConfig), // make_unique(Id, "trusted-root-certificates", Attributes::TrustedRootCertificates::Id, credsIssuerConfig), // make_unique(Id, "current-fabric-index", Attributes::CurrentFabricIndex::Id, credsIssuerConfig), // @@ -10361,7 +11264,25 @@ void registerClusterGroupKeyManagement(Commands & commands, CredentialIssuerComm make_unique>(Id, credsIssuerConfig), // make_unique>>( - Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig), // + Id, "group-key-map", Attributes::GroupKeyMap::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "group-table", Attributes::GroupTable::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "max-groups-per-fabric", 0, UINT16_MAX, Attributes::MaxGroupsPerFabric::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "max-group-keys-per-fabric", 0, UINT16_MAX, Attributes::MaxGroupKeysPerFabric::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "group-key-map", Attributes::GroupKeyMap::Id, credsIssuerConfig), // make_unique(Id, "group-table", Attributes::GroupTable::Id, credsIssuerConfig), // @@ -10396,14 +11317,28 @@ void registerClusterFixedLabel(Commands & commands, CredentialIssuerCommands * c // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique< + WriteAttributeAsComplex>>( + Id, "label-list", Attributes::LabelList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -10444,7 +11379,18 @@ void registerClusterUserLabel(Commands & commands, CredentialIssuerCommands * cr make_unique>(Id, credsIssuerConfig), // make_unique< WriteAttributeAsComplex>>( - Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig), // + Id, "label-list", Attributes::LabelList::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "label-list", Attributes::LabelList::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -10475,13 +11421,24 @@ void registerClusterProxyConfiguration(Commands & commands, CredentialIssuerComm // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -10511,13 +11468,24 @@ void registerClusterProxyDiscovery(Commands & commands, CredentialIssuerCommands // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -10547,13 +11515,24 @@ void registerClusterProxyValid(Commands & commands, CredentialIssuerCommands * c // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -10583,14 +11562,27 @@ void registerClusterBooleanState(Commands & commands, CredentialIssuerCommands * // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "state-value", Attributes::StateValue::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "state-value", Attributes::StateValue::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "state-value", 0, 1, Attributes::StateValue::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "state-value", Attributes::StateValue::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -10637,10 +11629,31 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>>(Id, "start-up-mode", 0, UINT8_MAX, - Attributes::StartUpMode::Id, credsIssuerConfig), // + make_unique>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>(Id, "standard-namespace", 0, UINT16_MAX, + Attributes::StandardNamespace::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "start-up-mode", 0, UINT8_MAX, Attributes::StartUpMode::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "on-mode", 0, UINT8_MAX, Attributes::OnMode::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "description", Attributes::Description::Id, credsIssuerConfig), // make_unique(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig), // @@ -10748,38 +11761,101 @@ void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * cre make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "lock-state", 0, UINT8_MAX, Attributes::LockState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "lock-type", 0, UINT8_MAX, Attributes::LockType::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "actuator-enabled", 0, 1, Attributes::ActuatorEnabled::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "door-state", 0, UINT8_MAX, Attributes::DoorState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "door-open-events", 0, UINT32_MAX, Attributes::DoorOpenEvents::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "door-closed-events", 0, UINT32_MAX, Attributes::DoorClosedEvents::Id, - credsIssuerConfig), // - make_unique>(Id, "open-period", 0, UINT16_MAX, Attributes::OpenPeriod::Id, credsIssuerConfig), // - make_unique>(Id, "language", Attributes::Language::Id, credsIssuerConfig), // - make_unique>(Id, "ledsettings", 0, UINT8_MAX, Attributes::LEDSettings::Id, credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "open-period", 0, UINT16_MAX, Attributes::OpenPeriod::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "number-of-total-users-supported", 0, UINT16_MAX, + Attributes::NumberOfTotalUsersSupported::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "number-of-pinusers-supported", 0, UINT16_MAX, + Attributes::NumberOfPINUsersSupported::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "number-of-rfidusers-supported", 0, UINT16_MAX, + Attributes::NumberOfRFIDUsersSupported::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "number-of-week-day-schedules-supported-per-user", 0, UINT8_MAX, + Attributes::NumberOfWeekDaySchedulesSupportedPerUser::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "number-of-year-day-schedules-supported-per-user", 0, UINT8_MAX, + Attributes::NumberOfYearDaySchedulesSupportedPerUser::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "number-of-holiday-schedules-supported", 0, UINT8_MAX, + Attributes::NumberOfHolidaySchedulesSupported::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "max-pincode-length", 0, UINT8_MAX, Attributes::MaxPINCodeLength::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "min-pincode-length", 0, UINT8_MAX, Attributes::MinPINCodeLength::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "max-rfidcode-length", 0, UINT8_MAX, Attributes::MaxRFIDCodeLength::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "min-rfidcode-length", 0, UINT8_MAX, Attributes::MinRFIDCodeLength::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "credential-rules-support", 0, UINT8_MAX, Attributes::CredentialRulesSupport::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "number-of-credentials-supported-per-user", 0, UINT8_MAX, + Attributes::NumberOfCredentialsSupportedPerUser::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "language", Attributes::Language::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "ledsettings", 0, UINT8_MAX, Attributes::LEDSettings::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "auto-relock-time", 0, UINT32_MAX, Attributes::AutoRelockTime::Id, - credsIssuerConfig), // - make_unique>(Id, "sound-volume", 0, UINT8_MAX, Attributes::SoundVolume::Id, credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "sound-volume", 0, UINT8_MAX, Attributes::SoundVolume::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>( - Id, "operating-mode", 0, UINT8_MAX, Attributes::OperatingMode::Id, credsIssuerConfig), // + Id, "operating-mode", 0, UINT8_MAX, Attributes::OperatingMode::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "supported-operating-modes", 0, UINT16_MAX, Attributes::SupportedOperatingModes::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "default-configuration-register", 0, UINT16_MAX, Attributes::DefaultConfigurationRegister::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "enable-local-programming", 0, 1, Attributes::EnableLocalProgramming::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "enable-one-touch-locking", 0, 1, Attributes::EnableOneTouchLocking::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "enable-inside-status-led", 0, 1, Attributes::EnableInsideStatusLED::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "enable-privacy-mode-button", 0, 1, Attributes::EnablePrivacyModeButton::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "local-programming-features", 0, UINT8_MAX, Attributes::LocalProgrammingFeatures::Id, credsIssuerConfig), // + Id, "local-programming-features", 0, UINT8_MAX, Attributes::LocalProgrammingFeatures::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "wrong-code-entry-limit", 0, UINT8_MAX, Attributes::WrongCodeEntryLimit::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "user-code-temporary-disable-time", 0, UINT8_MAX, - Attributes::UserCodeTemporaryDisableTime::Id, credsIssuerConfig), // + Attributes::UserCodeTemporaryDisableTime::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "send-pinover-the-air", 0, 1, Attributes::SendPINOverTheAir::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "require-pinfor-remote-operation", 0, 1, Attributes::RequirePINforRemoteOperation::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "expiring-user-timeout", 0, UINT16_MAX, Attributes::ExpiringUserTimeout::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "lock-state", Attributes::LockState::Id, credsIssuerConfig), // make_unique(Id, "lock-type", Attributes::LockType::Id, credsIssuerConfig), // @@ -10916,10 +11992,81 @@ void registerClusterWindowCovering(Commands & commands, CredentialIssuerCommands make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "type", 0, UINT8_MAX, Attributes::Type::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "physical-closed-limit-lift", 0, UINT16_MAX, + Attributes::PhysicalClosedLimitLift::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "physical-closed-limit-tilt", 0, UINT16_MAX, + Attributes::PhysicalClosedLimitTilt::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>(Id, "current-position-lift", 0, UINT16_MAX, + Attributes::CurrentPositionLift::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "current-position-tilt", 0, UINT16_MAX, + Attributes::CurrentPositionTilt::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "number-of-actuations-lift", 0, UINT16_MAX, + Attributes::NumberOfActuationsLift::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "number-of-actuations-tilt", 0, UINT16_MAX, + Attributes::NumberOfActuationsTilt::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "config-status", 0, UINT8_MAX, Attributes::ConfigStatus::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "current-position-lift-percentage", 0, UINT8_MAX, Attributes::CurrentPositionLiftPercentage::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "current-position-tilt-percentage", 0, UINT8_MAX, Attributes::CurrentPositionTiltPercentage::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "operational-status", 0, UINT8_MAX, Attributes::OperationalStatus::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "target-position-lift-percent100ths", 0, UINT16_MAX, Attributes::TargetPositionLiftPercent100ths::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "target-position-tilt-percent100ths", 0, UINT16_MAX, Attributes::TargetPositionTiltPercent100ths::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "end-product-type", 0, UINT8_MAX, Attributes::EndProductType::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "current-position-lift-percent100ths", 0, UINT16_MAX, Attributes::CurrentPositionLiftPercent100ths::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "current-position-tilt-percent100ths", 0, UINT16_MAX, Attributes::CurrentPositionTiltPercent100ths::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "installed-open-limit-lift", 0, UINT16_MAX, + Attributes::InstalledOpenLimitLift::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "installed-closed-limit-lift", 0, UINT16_MAX, + Attributes::InstalledClosedLimitLift::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "installed-open-limit-tilt", 0, UINT16_MAX, + Attributes::InstalledOpenLimitTilt::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "installed-closed-limit-tilt", 0, UINT16_MAX, + Attributes::InstalledClosedLimitTilt::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // make_unique>>( - Id, "mode", 0, UINT8_MAX, Attributes::Mode::Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "type", Attributes::Type::Id, credsIssuerConfig), // + Id, "mode", 0, UINT8_MAX, Attributes::Mode::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "safety-status", 0, UINT16_MAX, Attributes::SafetyStatus::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "type", Attributes::Type::Id, credsIssuerConfig), // make_unique(Id, "physical-closed-limit-lift", Attributes::PhysicalClosedLimitLift::Id, credsIssuerConfig), // make_unique(Id, "physical-closed-limit-tilt", Attributes::PhysicalClosedLimitTilt::Id, @@ -11004,18 +12151,39 @@ void registerClusterBarrierControl(Commands & commands, CredentialIssuerCommands make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "barrier-moving-state", 0, UINT8_MAX, Attributes::BarrierMovingState::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "barrier-safety-status", 0, UINT16_MAX, Attributes::BarrierSafetyStatus::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "barrier-capabilities", 0, UINT8_MAX, Attributes::BarrierCapabilities::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "barrier-open-events", 0, UINT16_MAX, Attributes::BarrierOpenEvents::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "barrier-close-events", 0, UINT16_MAX, Attributes::BarrierCloseEvents::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "barrier-command-open-events", 0, UINT16_MAX, - Attributes::BarrierCommandOpenEvents::Id, credsIssuerConfig), // + Attributes::BarrierCommandOpenEvents::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "barrier-command-close-events", 0, UINT16_MAX, - Attributes::BarrierCommandCloseEvents::Id, credsIssuerConfig), // - make_unique>(Id, "barrier-open-period", 0, UINT16_MAX, Attributes::BarrierOpenPeriod::Id, + Attributes::BarrierCommandCloseEvents::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "barrier-open-period", 0, UINT16_MAX, Attributes::BarrierOpenPeriod::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "barrier-close-period", 0, UINT16_MAX, Attributes::BarrierClosePeriod::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "barrier-position", 0, UINT8_MAX, Attributes::BarrierPosition::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "barrier-moving-state", Attributes::BarrierMovingState::Id, credsIssuerConfig), // make_unique(Id, "barrier-safety-status", Attributes::BarrierSafetyStatus::Id, credsIssuerConfig), // @@ -11087,14 +12255,76 @@ void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialI make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>>( - Id, "lifetime-running-hours", 0, UINT32_MAX, Attributes::LifetimeRunningHours::Id, credsIssuerConfig), // - make_unique>>( - Id, "lifetime-energy-consumed", 0, UINT32_MAX, Attributes::LifetimeEnergyConsumed::Id, credsIssuerConfig), // + make_unique>>(Id, "max-pressure", INT16_MIN, INT16_MAX, + Attributes::MaxPressure::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "max-speed", 0, UINT16_MAX, Attributes::MaxSpeed::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "max-flow", 0, UINT16_MAX, Attributes::MaxFlow::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-const-pressure", INT16_MIN, INT16_MAX, + Attributes::MinConstPressure::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-const-pressure", INT16_MIN, INT16_MAX, + Attributes::MaxConstPressure::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-comp-pressure", INT16_MIN, INT16_MAX, + Attributes::MinCompPressure::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-comp-pressure", INT16_MIN, INT16_MAX, + Attributes::MaxCompPressure::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-const-speed", 0, UINT16_MAX, + Attributes::MinConstSpeed::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-const-speed", 0, UINT16_MAX, + Attributes::MaxConstSpeed::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "min-const-flow", 0, UINT16_MAX, Attributes::MinConstFlow::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "max-const-flow", 0, UINT16_MAX, Attributes::MaxConstFlow::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-const-temp", INT16_MIN, INT16_MAX, + Attributes::MinConstTemp::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-const-temp", INT16_MIN, INT16_MAX, + Attributes::MaxConstTemp::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "pump-status", 0, UINT16_MAX, Attributes::PumpStatus::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "effective-operation-mode", 0, UINT8_MAX, Attributes::EffectiveOperationMode::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>( + Id, "effective-control-mode", 0, UINT8_MAX, Attributes::EffectiveControlMode::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "capacity", INT16_MIN, INT16_MAX, Attributes::Capacity::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "speed", 0, UINT16_MAX, Attributes::Speed::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "lifetime-running-hours", 0, UINT32_MAX, + Attributes::LifetimeRunningHours::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "power", 0, UINT32_MAX, Attributes::Power::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "lifetime-energy-consumed", 0, UINT32_MAX, + Attributes::LifetimeEnergyConsumed::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>( - Id, "operation-mode", 0, UINT8_MAX, Attributes::OperationMode::Id, credsIssuerConfig), // + Id, "operation-mode", 0, UINT8_MAX, Attributes::OperationMode::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>( - Id, "control-mode", 0, UINT8_MAX, Attributes::ControlMode::Id, credsIssuerConfig), // + Id, "control-mode", 0, UINT8_MAX, Attributes::ControlMode::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "max-pressure", Attributes::MaxPressure::Id, credsIssuerConfig), // make_unique(Id, "max-speed", Attributes::MaxSpeed::Id, credsIssuerConfig), // @@ -11258,57 +12488,140 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>>(Id, "local-temperature", INT16_MIN, INT16_MAX, + Attributes::LocalTemperature::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "outdoor-temperature", INT16_MIN, INT16_MAX, + Attributes::OutdoorTemperature::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "occupancy", 0, UINT8_MAX, Attributes::Occupancy::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "abs-min-heat-setpoint-limit", INT16_MIN, INT16_MAX, + Attributes::AbsMinHeatSetpointLimit::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "abs-max-heat-setpoint-limit", INT16_MIN, INT16_MAX, + Attributes::AbsMaxHeatSetpointLimit::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "abs-min-cool-setpoint-limit", INT16_MIN, INT16_MAX, + Attributes::AbsMinCoolSetpointLimit::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "abs-max-cool-setpoint-limit", INT16_MIN, INT16_MAX, + Attributes::AbsMaxCoolSetpointLimit::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "picooling-demand", 0, UINT8_MAX, Attributes::PICoolingDemand::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "piheating-demand", 0, UINT8_MAX, Attributes::PIHeatingDemand::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "hvacsystem-type-configuration", 0, UINT8_MAX, - Attributes::HVACSystemTypeConfiguration::Id, credsIssuerConfig), // + Attributes::HVACSystemTypeConfiguration::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "local-temperature-calibration", INT8_MIN, INT8_MAX, - Attributes::LocalTemperatureCalibration::Id, credsIssuerConfig), // + Attributes::LocalTemperatureCalibration::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "occupied-cooling-setpoint", INT16_MIN, INT16_MAX, - Attributes::OccupiedCoolingSetpoint::Id, credsIssuerConfig), // + Attributes::OccupiedCoolingSetpoint::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "occupied-heating-setpoint", INT16_MIN, INT16_MAX, - Attributes::OccupiedHeatingSetpoint::Id, credsIssuerConfig), // + Attributes::OccupiedHeatingSetpoint::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "unoccupied-cooling-setpoint", INT16_MIN, INT16_MAX, - Attributes::UnoccupiedCoolingSetpoint::Id, credsIssuerConfig), // + Attributes::UnoccupiedCoolingSetpoint::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "unoccupied-heating-setpoint", INT16_MIN, INT16_MAX, - Attributes::UnoccupiedHeatingSetpoint::Id, credsIssuerConfig), // + Attributes::UnoccupiedHeatingSetpoint::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "min-heat-setpoint-limit", INT16_MIN, INT16_MAX, - Attributes::MinHeatSetpointLimit::Id, credsIssuerConfig), // + Attributes::MinHeatSetpointLimit::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "max-heat-setpoint-limit", INT16_MIN, INT16_MAX, - Attributes::MaxHeatSetpointLimit::Id, credsIssuerConfig), // + Attributes::MaxHeatSetpointLimit::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "min-cool-setpoint-limit", INT16_MIN, INT16_MAX, - Attributes::MinCoolSetpointLimit::Id, credsIssuerConfig), // + Attributes::MinCoolSetpointLimit::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "max-cool-setpoint-limit", INT16_MIN, INT16_MAX, - Attributes::MaxCoolSetpointLimit::Id, credsIssuerConfig), // + Attributes::MaxCoolSetpointLimit::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "min-setpoint-dead-band", INT8_MIN, INT8_MAX, Attributes::MinSetpointDeadBand::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "remote-sensing", 0, UINT8_MAX, Attributes::RemoteSensing::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>( - Id, "control-sequence-of-operation", 0, UINT8_MAX, Attributes::ControlSequenceOfOperation::Id, credsIssuerConfig), // - make_unique>(Id, "system-mode", 0, UINT8_MAX, Attributes::SystemMode::Id, credsIssuerConfig), // - make_unique>(Id, "temperature-setpoint-hold", 0, UINT8_MAX, Attributes::TemperatureSetpointHold::Id, + Id, "control-sequence-of-operation", 0, UINT8_MAX, Attributes::ControlSequenceOfOperation::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "system-mode", 0, UINT8_MAX, Attributes::SystemMode::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "thermostat-running-mode", 0, UINT8_MAX, Attributes::ThermostatRunningMode::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "start-of-week", 0, UINT8_MAX, Attributes::StartOfWeek::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "number-of-weekly-transitions", 0, UINT8_MAX, + Attributes::NumberOfWeeklyTransitions::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "number-of-daily-transitions", 0, UINT8_MAX, + Attributes::NumberOfDailyTransitions::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "temperature-setpoint-hold", 0, UINT8_MAX, Attributes::TemperatureSetpointHold::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( Id, "temperature-setpoint-hold-duration", 0, UINT16_MAX, Attributes::TemperatureSetpointHoldDuration::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "thermostat-programming-operation-mode", 0, UINT8_MAX, - Attributes::ThermostatProgrammingOperationMode::Id, credsIssuerConfig), // - make_unique>>(Id, "occupied-setback", 0, UINT8_MAX, - Attributes::OccupiedSetback::Id, credsIssuerConfig), // + Attributes::ThermostatProgrammingOperationMode::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "thermostat-running-state", 0, UINT16_MAX, Attributes::ThermostatRunningState::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "setpoint-change-source", 0, UINT8_MAX, Attributes::SetpointChangeSource::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "setpoint-change-amount", INT16_MIN, INT16_MAX, + Attributes::SetpointChangeAmount::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "setpoint-change-source-timestamp", 0, UINT32_MAX, + Attributes::SetpointChangeSourceTimestamp::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // make_unique>>( - Id, "unoccupied-setback", 0, UINT8_MAX, Attributes::UnoccupiedSetback::Id, credsIssuerConfig), // + Id, "occupied-setback", 0, UINT8_MAX, Attributes::OccupiedSetback::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "occupied-setback-min", 0, UINT8_MAX, + Attributes::OccupiedSetbackMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "occupied-setback-max", 0, UINT8_MAX, + Attributes::OccupiedSetbackMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "unoccupied-setback", 0, UINT8_MAX, + Attributes::UnoccupiedSetback::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "unoccupied-setback-min", 0, UINT8_MAX, + Attributes::UnoccupiedSetbackMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "unoccupied-setback-max", 0, UINT8_MAX, + Attributes::UnoccupiedSetbackMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "emergency-heat-delta", 0, UINT8_MAX, Attributes::EmergencyHeatDelta::Id, - credsIssuerConfig), // - make_unique>(Id, "actype", 0, UINT8_MAX, Attributes::ACType::Id, credsIssuerConfig), // - make_unique>(Id, "accapacity", 0, UINT16_MAX, Attributes::ACCapacity::Id, credsIssuerConfig), // - make_unique>(Id, "acrefrigerant-type", 0, UINT8_MAX, Attributes::ACRefrigerantType::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "actype", 0, UINT8_MAX, Attributes::ACType::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "accapacity", 0, UINT16_MAX, Attributes::ACCapacity::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "acrefrigerant-type", 0, UINT8_MAX, Attributes::ACRefrigerantType::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "accompressor-type", 0, UINT8_MAX, Attributes::ACCompressorType::Id, - credsIssuerConfig), // - make_unique>(Id, "acerror-code", 0, UINT32_MAX, Attributes::ACErrorCode::Id, credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "acerror-code", 0, UINT32_MAX, Attributes::ACErrorCode::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "aclouver-position", 0, UINT8_MAX, Attributes::ACLouverPosition::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "accoil-temperature", INT16_MIN, INT16_MAX, + Attributes::ACCoilTemperature::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "accapacityformat", 0, UINT8_MAX, Attributes::ACCapacityformat::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "local-temperature", Attributes::LocalTemperature::Id, credsIssuerConfig), // make_unique(Id, "outdoor-temperature", Attributes::OutdoorTemperature::Id, credsIssuerConfig), // @@ -11423,16 +12736,39 @@ void registerClusterFanControl(Commands & commands, CredentialIssuerCommands * c make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "fan-mode", 0, UINT8_MAX, - Attributes::FanMode::Id, credsIssuerConfig), // + make_unique>( + Id, "fan-mode", 0, UINT8_MAX, Attributes::FanMode::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>( - Id, "fan-mode-sequence", 0, UINT8_MAX, Attributes::FanModeSequence::Id, credsIssuerConfig), // - make_unique>>(Id, "percent-setting", 0, UINT8_MAX, - Attributes::PercentSetting::Id, credsIssuerConfig), // - make_unique>>(Id, "speed-setting", 0, UINT8_MAX, - Attributes::SpeedSetting::Id, credsIssuerConfig), // - make_unique>(Id, "rock-setting", 0, UINT8_MAX, Attributes::RockSetting::Id, credsIssuerConfig), // - make_unique>(Id, "wind-setting", 0, UINT8_MAX, Attributes::WindSetting::Id, credsIssuerConfig), // + Id, "fan-mode-sequence", 0, UINT8_MAX, Attributes::FanModeSequence::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "percent-setting", 0, UINT8_MAX, Attributes::PercentSetting::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "percent-current", 0, UINT8_MAX, Attributes::PercentCurrent::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "speed-max", 0, UINT8_MAX, Attributes::SpeedMax::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "speed-setting", 0, UINT8_MAX, Attributes::SpeedSetting::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "speed-current", 0, UINT8_MAX, Attributes::SpeedCurrent::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rock-support", 0, UINT8_MAX, Attributes::RockSupport::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rock-setting", 0, UINT8_MAX, Attributes::RockSetting::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "wind-support", 0, UINT8_MAX, Attributes::WindSupport::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "wind-setting", 0, UINT8_MAX, Attributes::WindSetting::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "fan-mode", Attributes::FanMode::Id, credsIssuerConfig), // make_unique(Id, "fan-mode-sequence", Attributes::FanModeSequence::Id, credsIssuerConfig), // @@ -11485,12 +12821,24 @@ void registerClusterThermostatUserInterfaceConfiguration(Commands & commands, Cr make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // make_unique>(Id, "temperature-display-mode", 0, UINT8_MAX, Attributes::TemperatureDisplayMode::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "keypad-lockout", 0, UINT8_MAX, Attributes::KeypadLockout::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "schedule-programming-visibility", 0, UINT8_MAX, - Attributes::ScheduleProgrammingVisibility::Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // + Attributes::ScheduleProgrammingVisibility::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // make_unique(Id, "temperature-display-mode", Attributes::TemperatureDisplayMode::Id, credsIssuerConfig), // make_unique(Id, "keypad-lockout", Attributes::KeypadLockout::Id, credsIssuerConfig), // @@ -11608,32 +12956,137 @@ void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "options", 0, UINT8_MAX, Attributes::Options::Id, credsIssuerConfig), // + make_unique>(Id, "current-hue", 0, UINT8_MAX, Attributes::CurrentHue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-saturation", 0, UINT8_MAX, Attributes::CurrentSaturation::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "remaining-time", 0, UINT16_MAX, Attributes::RemainingTime::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-x", 0, UINT16_MAX, Attributes::CurrentX::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-y", 0, UINT16_MAX, Attributes::CurrentY::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "drift-compensation", 0, UINT8_MAX, Attributes::DriftCompensation::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "compensation-text", Attributes::CompensationText::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "color-temperature-mireds", 0, UINT16_MAX, Attributes::ColorTemperatureMireds::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "color-mode", 0, UINT8_MAX, Attributes::ColorMode::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "options", 0, UINT8_MAX, Attributes::Options::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>(Id, "number-of-primaries", 0, UINT8_MAX, + Attributes::NumberOfPrimaries::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary1x", 0, UINT16_MAX, Attributes::Primary1X::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary1y", 0, UINT16_MAX, Attributes::Primary1Y::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "primary1intensity", 0, UINT8_MAX, + Attributes::Primary1Intensity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary2x", 0, UINT16_MAX, Attributes::Primary2X::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary2y", 0, UINT16_MAX, Attributes::Primary2Y::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "primary2intensity", 0, UINT8_MAX, + Attributes::Primary2Intensity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary3x", 0, UINT16_MAX, Attributes::Primary3X::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary3y", 0, UINT16_MAX, Attributes::Primary3Y::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "primary3intensity", 0, UINT8_MAX, + Attributes::Primary3Intensity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary4x", 0, UINT16_MAX, Attributes::Primary4X::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary4y", 0, UINT16_MAX, Attributes::Primary4Y::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "primary4intensity", 0, UINT8_MAX, + Attributes::Primary4Intensity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary5x", 0, UINT16_MAX, Attributes::Primary5X::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary5y", 0, UINT16_MAX, Attributes::Primary5Y::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "primary5intensity", 0, UINT8_MAX, + Attributes::Primary5Intensity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary6x", 0, UINT16_MAX, Attributes::Primary6X::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "primary6y", 0, UINT16_MAX, Attributes::Primary6Y::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "primary6intensity", 0, UINT8_MAX, + Attributes::Primary6Intensity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "white-point-x", 0, UINT16_MAX, Attributes::WhitePointX::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "white-point-y", 0, UINT16_MAX, Attributes::WhitePointY::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "color-point-rx", 0, UINT16_MAX, Attributes::ColorPointRX::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "color-point-ry", 0, UINT16_MAX, Attributes::ColorPointRY::Id, - credsIssuerConfig), // - make_unique>>( - Id, "color-point-rintensity", 0, UINT8_MAX, Attributes::ColorPointRIntensity::Id, credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "color-point-rintensity", 0, UINT8_MAX, + Attributes::ColorPointRIntensity::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "color-point-gx", 0, UINT16_MAX, Attributes::ColorPointGX::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "color-point-gy", 0, UINT16_MAX, Attributes::ColorPointGY::Id, - credsIssuerConfig), // - make_unique>>( - Id, "color-point-gintensity", 0, UINT8_MAX, Attributes::ColorPointGIntensity::Id, credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "color-point-gintensity", 0, UINT8_MAX, + Attributes::ColorPointGIntensity::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "color-point-bx", 0, UINT16_MAX, Attributes::ColorPointBX::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "color-point-by", 0, UINT16_MAX, Attributes::ColorPointBY::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "color-point-bintensity", 0, UINT8_MAX, + Attributes::ColorPointBIntensity::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "enhanced-current-hue", 0, UINT16_MAX, Attributes::EnhancedCurrentHue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "enhanced-color-mode", 0, UINT8_MAX, Attributes::EnhancedColorMode::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "color-loop-active", 0, UINT8_MAX, Attributes::ColorLoopActive::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "color-loop-direction", 0, UINT8_MAX, Attributes::ColorLoopDirection::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "color-loop-time", 0, UINT16_MAX, Attributes::ColorLoopTime::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "color-loop-start-enhanced-hue", 0, UINT16_MAX, + Attributes::ColorLoopStartEnhancedHue::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "color-loop-stored-enhanced-hue", 0, UINT16_MAX, + Attributes::ColorLoopStoredEnhancedHue::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "color-capabilities", 0, UINT16_MAX, Attributes::ColorCapabilities::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "color-temp-physical-min-mireds", 0, UINT16_MAX, + Attributes::ColorTempPhysicalMinMireds::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "color-temp-physical-max-mireds", 0, UINT16_MAX, + Attributes::ColorTempPhysicalMaxMireds::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "couple-color-temp-to-level-min-mireds", 0, UINT16_MAX, + Attributes::CoupleColorTempToLevelMinMireds::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>>( - Id, "color-point-bintensity", 0, UINT8_MAX, Attributes::ColorPointBIntensity::Id, credsIssuerConfig), // make_unique>>( Id, "start-up-color-temperature-mireds", 0, UINT16_MAX, Attributes::StartUpColorTemperatureMireds::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig), // make_unique(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig), // @@ -11743,29 +13196,54 @@ void registerClusterBallastConfiguration(Commands & commands, CredentialIssuerCo make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "min-level", 0, UINT8_MAX, Attributes::MinLevel::Id, credsIssuerConfig), // - make_unique>(Id, "max-level", 0, UINT8_MAX, Attributes::MaxLevel::Id, credsIssuerConfig), // - make_unique>>( - Id, "intrinsic-ballast-factor", 0, UINT8_MAX, Attributes::IntrinsicBallastFactor::Id, credsIssuerConfig), // - make_unique>>( - Id, "ballast-factor-adjustment", 0, UINT8_MAX, Attributes::BallastFactorAdjustment::Id, credsIssuerConfig), // - make_unique>(Id, "lamp-type", Attributes::LampType::Id, credsIssuerConfig), // - make_unique>(Id, "lamp-manufacturer", Attributes::LampManufacturer::Id, - credsIssuerConfig), // - make_unique>>(Id, "lamp-rated-hours", 0, UINT32_MAX, - Attributes::LampRatedHours::Id, credsIssuerConfig), // - make_unique>>(Id, "lamp-burn-hours", 0, UINT32_MAX, - Attributes::LampBurnHours::Id, credsIssuerConfig), // - make_unique>(Id, "lamp-alarm-mode", 0, UINT8_MAX, Attributes::LampAlarmMode::Id, + make_unique>(Id, "physical-min-level", 0, UINT8_MAX, Attributes::PhysicalMinLevel::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "physical-max-level", 0, UINT8_MAX, Attributes::PhysicalMaxLevel::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ballast-status", 0, UINT8_MAX, Attributes::BallastStatus::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "min-level", 0, UINT8_MAX, Attributes::MinLevel::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "max-level", 0, UINT8_MAX, Attributes::MaxLevel::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>(Id, "intrinsic-ballast-factor", 0, UINT8_MAX, + Attributes::IntrinsicBallastFactor::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "ballast-factor-adjustment", 0, UINT8_MAX, + Attributes::BallastFactorAdjustment::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "lamp-quantity", 0, UINT8_MAX, Attributes::LampQuantity::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "lamp-type", Attributes::LampType::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "lamp-manufacturer", Attributes::LampManufacturer::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "lamp-burn-hours-trip-point", 0, UINT32_MAX, Attributes::LampBurnHoursTripPoint::Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "physical-min-level", Attributes::PhysicalMinLevel::Id, credsIssuerConfig), // - make_unique(Id, "physical-max-level", Attributes::PhysicalMaxLevel::Id, credsIssuerConfig), // - make_unique(Id, "ballast-status", Attributes::BallastStatus::Id, credsIssuerConfig), // - make_unique(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig), // - make_unique(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig), // + Id, "lamp-rated-hours", 0, UINT32_MAX, Attributes::LampRatedHours::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "lamp-burn-hours", 0, UINT32_MAX, Attributes::LampBurnHours::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "lamp-alarm-mode", 0, UINT8_MAX, Attributes::LampAlarmMode::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>(Id, "lamp-burn-hours-trip-point", 0, UINT32_MAX, + Attributes::LampBurnHoursTripPoint::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "physical-min-level", Attributes::PhysicalMinLevel::Id, credsIssuerConfig), // + make_unique(Id, "physical-max-level", Attributes::PhysicalMaxLevel::Id, credsIssuerConfig), // + make_unique(Id, "ballast-status", Attributes::BallastStatus::Id, credsIssuerConfig), // + make_unique(Id, "min-level", Attributes::MinLevel::Id, credsIssuerConfig), // + make_unique(Id, "max-level", Attributes::MaxLevel::Id, credsIssuerConfig), // make_unique(Id, "intrinsic-ballast-factor", Attributes::IntrinsicBallastFactor::Id, credsIssuerConfig), // make_unique(Id, "ballast-factor-adjustment", Attributes::BallastFactorAdjustment::Id, @@ -11806,18 +13284,43 @@ void registerClusterIlluminanceMeasurement(Commands & commands, CredentialIssuer // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // - make_unique(Id, "light-sensor-type", Attributes::LightSensorType::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // + make_unique(Id, "light-sensor-type", Attributes::LightSensorType::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>(Id, "measured-value", 0, UINT16_MAX, + Attributes::MeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-measured-value", 0, UINT16_MAX, + Attributes::MinMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-measured-value", 0, UINT16_MAX, + Attributes::MaxMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tolerance", 0, UINT16_MAX, Attributes::Tolerance::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "light-sensor-type", 0, UINT8_MAX, + Attributes::LightSensorType::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // @@ -11852,17 +13355,39 @@ void registerClusterTemperatureMeasurement(Commands & commands, CredentialIssuer // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>(Id, "measured-value", INT16_MIN, INT16_MAX, + Attributes::MeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-measured-value", INT16_MIN, INT16_MAX, + Attributes::MinMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-measured-value", INT16_MIN, INT16_MAX, + Attributes::MaxMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tolerance", 0, UINT16_MAX, Attributes::Tolerance::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // @@ -11896,22 +13421,57 @@ void registerClusterPressureMeasurement(Commands & commands, CredentialIssuerCom // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // - make_unique(Id, "scaled-value", Attributes::ScaledValue::Id, credsIssuerConfig), // - make_unique(Id, "min-scaled-value", Attributes::MinScaledValue::Id, credsIssuerConfig), // - make_unique(Id, "max-scaled-value", Attributes::MaxScaledValue::Id, credsIssuerConfig), // - make_unique(Id, "scaled-tolerance", Attributes::ScaledTolerance::Id, credsIssuerConfig), // - make_unique(Id, "scale", Attributes::Scale::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // + make_unique(Id, "scaled-value", Attributes::ScaledValue::Id, credsIssuerConfig), // + make_unique(Id, "min-scaled-value", Attributes::MinScaledValue::Id, credsIssuerConfig), // + make_unique(Id, "max-scaled-value", Attributes::MaxScaledValue::Id, credsIssuerConfig), // + make_unique(Id, "scaled-tolerance", Attributes::ScaledTolerance::Id, credsIssuerConfig), // + make_unique(Id, "scale", Attributes::Scale::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>(Id, "measured-value", INT16_MIN, INT16_MAX, + Attributes::MeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-measured-value", INT16_MIN, INT16_MAX, + Attributes::MinMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-measured-value", INT16_MIN, INT16_MAX, + Attributes::MaxMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tolerance", 0, UINT16_MAX, Attributes::Tolerance::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "scaled-value", INT16_MIN, INT16_MAX, + Attributes::ScaledValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-scaled-value", INT16_MIN, INT16_MAX, + Attributes::MinScaledValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-scaled-value", INT16_MIN, INT16_MAX, + Attributes::MaxScaledValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "scaled-tolerance", 0, UINT16_MAX, Attributes::ScaledTolerance::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "scale", INT8_MIN, INT8_MAX, Attributes::Scale::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // @@ -11950,17 +13510,39 @@ void registerClusterFlowMeasurement(Commands & commands, CredentialIssuerCommand // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>(Id, "measured-value", 0, UINT16_MAX, + Attributes::MeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-measured-value", 0, UINT16_MAX, + Attributes::MinMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-measured-value", 0, UINT16_MAX, + Attributes::MaxMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tolerance", 0, UINT16_MAX, Attributes::Tolerance::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // @@ -11994,17 +13576,39 @@ void registerClusterRelativeHumidityMeasurement(Commands & commands, CredentialI // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // - make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "max-measured-value", Attributes::MaxMeasuredValue::Id, credsIssuerConfig), // + make_unique(Id, "tolerance", Attributes::Tolerance::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>(Id, "measured-value", 0, UINT16_MAX, + Attributes::MeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "min-measured-value", 0, UINT16_MAX, + Attributes::MinMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "max-measured-value", 0, UINT16_MAX, + Attributes::MaxMeasuredValue::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tolerance", 0, UINT16_MAX, Attributes::Tolerance::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "measured-value", Attributes::MeasuredValue::Id, credsIssuerConfig), // make_unique(Id, "min-measured-value", Attributes::MinMeasuredValue::Id, credsIssuerConfig), // @@ -12067,27 +13671,54 @@ void registerClusterOccupancySensing(Commands & commands, CredentialIssuerComman make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "occupancy", 0, UINT8_MAX, Attributes::Occupancy::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "occupancy-sensor-type", 0, UINT8_MAX, Attributes::OccupancySensorType::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "occupancy-sensor-type-bitmap", 0, UINT8_MAX, + Attributes::OccupancySensorTypeBitmap::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // make_unique>(Id, "piroccupied-to-unoccupied-delay", 0, UINT16_MAX, - Attributes::PIROccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // + Attributes::PIROccupiedToUnoccupiedDelay::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "pirunoccupied-to-occupied-delay", 0, UINT16_MAX, - Attributes::PIRUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // + Attributes::PIRUnoccupiedToOccupiedDelay::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "pirunoccupied-to-occupied-threshold", 0, UINT8_MAX, - Attributes::PIRUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // + Attributes::PIRUnoccupiedToOccupiedThreshold::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "ultrasonic-occupied-to-unoccupied-delay", 0, UINT16_MAX, - Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // + Attributes::UltrasonicOccupiedToUnoccupiedDelay::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "ultrasonic-unoccupied-to-occupied-delay", 0, UINT16_MAX, - Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // + Attributes::UltrasonicUnoccupiedToOccupiedDelay::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "ultrasonic-unoccupied-to-occupied-threshold", 0, UINT8_MAX, - Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // + Attributes::UltrasonicUnoccupiedToOccupiedThreshold::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "physical-contact-occupied-to-unoccupied-delay", 0, UINT16_MAX, - Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, credsIssuerConfig), // + Attributes::PhysicalContactOccupiedToUnoccupiedDelay::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "physical-contact-unoccupied-to-occupied-delay", 0, UINT16_MAX, - Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, credsIssuerConfig), // + Attributes::PhysicalContactUnoccupiedToOccupiedDelay::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "physical-contact-unoccupied-to-occupied-threshold", 0, UINT8_MAX, - Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id, credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig), // - make_unique(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), // + Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "occupancy", Attributes::Occupancy::Id, credsIssuerConfig), // + make_unique(Id, "occupancy-sensor-type", Attributes::OccupancySensorType::Id, credsIssuerConfig), // make_unique(Id, "occupancy-sensor-type-bitmap", Attributes::OccupancySensorTypeBitmap::Id, credsIssuerConfig), // make_unique(Id, "piroccupied-to-unoccupied-delay", Attributes::PIROccupiedToUnoccupiedDelay::Id, @@ -12136,14 +13767,27 @@ void registerClusterWakeOnLan(Commands & commands, CredentialIssuerCommands * cr // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "macaddress", Attributes::MACAddress::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "macaddress", Attributes::MACAddress::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "macaddress", Attributes::MACAddress::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "macaddress", Attributes::MACAddress::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -12177,16 +13821,36 @@ void registerClusterChannel(Commands & commands, CredentialIssuerCommands * cred // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "channel-list", Attributes::ChannelList::Id, credsIssuerConfig), // - make_unique(Id, "lineup", Attributes::Lineup::Id, credsIssuerConfig), // - make_unique(Id, "current-channel", Attributes::CurrentChannel::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "channel-list", Attributes::ChannelList::Id, credsIssuerConfig), // + make_unique(Id, "lineup", Attributes::Lineup::Id, credsIssuerConfig), // + make_unique(Id, "current-channel", Attributes::CurrentChannel::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "channel-list", Attributes::ChannelList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique< + WriteAttributeAsComplex>>( + Id, "lineup", Attributes::Lineup::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "current-channel", Attributes::CurrentChannel::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "channel-list", Attributes::ChannelList::Id, credsIssuerConfig), // make_unique(Id, "lineup", Attributes::Lineup::Id, credsIssuerConfig), // @@ -12220,15 +13884,31 @@ void registerClusterTargetNavigator(Commands & commands, CredentialIssuerCommand // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "target-list", Attributes::TargetList::Id, credsIssuerConfig), // - make_unique(Id, "current-target", Attributes::CurrentTarget::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "target-list", Attributes::TargetList::Id, credsIssuerConfig), // + make_unique(Id, "current-target", Attributes::CurrentTarget::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "target-list", Attributes::TargetList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-target", 0, UINT8_MAX, Attributes::CurrentTarget::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "target-list", Attributes::TargetList::Id, credsIssuerConfig), // make_unique(Id, "current-target", Attributes::CurrentTarget::Id, credsIssuerConfig), // @@ -12271,20 +13951,48 @@ void registerClusterMediaPlayback(Commands & commands, CredentialIssuerCommands // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig), // - make_unique(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig), // - make_unique(Id, "duration", Attributes::Duration::Id, credsIssuerConfig), // - make_unique(Id, "sampled-position", Attributes::SampledPosition::Id, credsIssuerConfig), // - make_unique(Id, "playback-speed", Attributes::PlaybackSpeed::Id, credsIssuerConfig), // - make_unique(Id, "seek-range-end", Attributes::SeekRangeEnd::Id, credsIssuerConfig), // - make_unique(Id, "seek-range-start", Attributes::SeekRangeStart::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig), // + make_unique(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig), // + make_unique(Id, "duration", Attributes::Duration::Id, credsIssuerConfig), // + make_unique(Id, "sampled-position", Attributes::SampledPosition::Id, credsIssuerConfig), // + make_unique(Id, "playback-speed", Attributes::PlaybackSpeed::Id, credsIssuerConfig), // + make_unique(Id, "seek-range-end", Attributes::SeekRangeEnd::Id, credsIssuerConfig), // + make_unique(Id, "seek-range-start", Attributes::SeekRangeStart::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>( + Id, "current-state", 0, UINT8_MAX, Attributes::CurrentState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "start-time", 0, UINT64_MAX, Attributes::StartTime::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "duration", 0, UINT64_MAX, Attributes::Duration::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "sampled-position", Attributes::SampledPosition::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "playback-speed", -std::numeric_limits::infinity(), + std::numeric_limits::infinity(), Attributes::PlaybackSpeed::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "seek-range-end", 0, UINT64_MAX, Attributes::SeekRangeEnd::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "seek-range-start", 0, UINT64_MAX, + Attributes::SeekRangeStart::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "current-state", Attributes::CurrentState::Id, credsIssuerConfig), // make_unique(Id, "start-time", Attributes::StartTime::Id, credsIssuerConfig), // @@ -12325,15 +14033,31 @@ void registerClusterMediaInput(Commands & commands, CredentialIssuerCommands * c // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "input-list", Attributes::InputList::Id, credsIssuerConfig), // - make_unique(Id, "current-input", Attributes::CurrentInput::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "input-list", Attributes::InputList::Id, credsIssuerConfig), // + make_unique(Id, "current-input", Attributes::CurrentInput::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "input-list", Attributes::InputList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-input", 0, UINT8_MAX, Attributes::CurrentInput::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "input-list", Attributes::InputList::Id, credsIssuerConfig), // make_unique(Id, "current-input", Attributes::CurrentInput::Id, credsIssuerConfig), // @@ -12366,13 +14090,24 @@ void registerClusterLowPower(Commands & commands, CredentialIssuerCommands * cre // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -12403,13 +14138,24 @@ void registerClusterKeypadInput(Commands & commands, CredentialIssuerCommands * // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -12451,8 +14197,22 @@ void registerClusterContentLauncher(Commands & commands, CredentialIssuerCommand make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "accept-header", Attributes::AcceptHeader::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "supported-streaming-protocols", 0, UINT32_MAX, - Attributes::SupportedStreamingProtocols::Id, credsIssuerConfig), // + Attributes::SupportedStreamingProtocols::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "accept-header", Attributes::AcceptHeader::Id, credsIssuerConfig), // make_unique(Id, "supported-streaming-protocols", Attributes::SupportedStreamingProtocols::Id, @@ -12487,15 +14247,31 @@ void registerClusterAudioOutput(Commands & commands, CredentialIssuerCommands * // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "output-list", Attributes::OutputList::Id, credsIssuerConfig), // - make_unique(Id, "current-output", Attributes::CurrentOutput::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "output-list", Attributes::OutputList::Id, credsIssuerConfig), // + make_unique(Id, "current-output", Attributes::CurrentOutput::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "output-list", Attributes::OutputList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-output", 0, UINT8_MAX, Attributes::CurrentOutput::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "output-list", Attributes::OutputList::Id, credsIssuerConfig), // make_unique(Id, "current-output", Attributes::CurrentOutput::Id, credsIssuerConfig), // @@ -12539,9 +14315,22 @@ void registerClusterApplicationLauncher(Commands & commands, CredentialIssuerCom make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "catalog-list", Attributes::CatalogList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( - Id, "current-app", Attributes::CurrentApp::Id, credsIssuerConfig), // + Id, "current-app", Attributes::CurrentApp::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "catalog-list", Attributes::CatalogList::Id, credsIssuerConfig), // make_unique(Id, "current-app", Attributes::CurrentApp::Id, credsIssuerConfig), // @@ -12573,21 +14362,48 @@ void registerClusterApplicationBasic(Commands & commands, CredentialIssuerComman // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), // - make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), // - make_unique(Id, "application-name", Attributes::ApplicationName::Id, credsIssuerConfig), // - make_unique(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig), // - make_unique(Id, "application", Attributes::Application::Id, credsIssuerConfig), // - make_unique(Id, "status", Attributes::Status::Id, credsIssuerConfig), // - make_unique(Id, "application-version", Attributes::ApplicationVersion::Id, credsIssuerConfig), // - make_unique(Id, "allowed-vendor-list", Attributes::AllowedVendorList::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), // + make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), // + make_unique(Id, "application-name", Attributes::ApplicationName::Id, credsIssuerConfig), // + make_unique(Id, "product-id", Attributes::ProductID::Id, credsIssuerConfig), // + make_unique(Id, "application", Attributes::Application::Id, credsIssuerConfig), // + make_unique(Id, "status", Attributes::Status::Id, credsIssuerConfig), // + make_unique(Id, "application-version", Attributes::ApplicationVersion::Id, credsIssuerConfig), // + make_unique(Id, "allowed-vendor-list", Attributes::AllowedVendorList::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "vendor-name", Attributes::VendorName::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorID::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "application-name", Attributes::ApplicationName::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "product-id", 0, UINT16_MAX, Attributes::ProductID::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "application", Attributes::Application::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>( + Id, "status", 0, UINT8_MAX, Attributes::Status::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "application-version", Attributes::ApplicationVersion::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "allowed-vendor-list", Attributes::AllowedVendorList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "vendor-name", Attributes::VendorName::Id, credsIssuerConfig), // make_unique(Id, "vendor-id", Attributes::VendorID::Id, credsIssuerConfig), // @@ -12628,13 +14444,24 @@ void registerClusterAccountLogin(Commands & commands, CredentialIssuerCommands * // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -12836,22 +14663,325 @@ void registerClusterElectricalMeasurement(Commands & commands, CredentialIssuerC make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "measurement-type", 0, UINT32_MAX, Attributes::MeasurementType::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-voltage", INT16_MIN, INT16_MAX, Attributes::DcVoltage::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-voltage-min", INT16_MIN, INT16_MAX, Attributes::DcVoltageMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-voltage-max", INT16_MIN, INT16_MAX, Attributes::DcVoltageMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-current", INT16_MIN, INT16_MAX, Attributes::DcCurrent::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-current-min", INT16_MIN, INT16_MAX, Attributes::DcCurrentMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-current-max", INT16_MIN, INT16_MAX, Attributes::DcCurrentMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-power", INT16_MIN, INT16_MAX, Attributes::DcPower::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-power-min", INT16_MIN, INT16_MAX, Attributes::DcPowerMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-power-max", INT16_MIN, INT16_MAX, Attributes::DcPowerMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-voltage-multiplier", 0, UINT16_MAX, Attributes::DcVoltageMultiplier::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-voltage-divisor", 0, UINT16_MAX, Attributes::DcVoltageDivisor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-current-multiplier", 0, UINT16_MAX, Attributes::DcCurrentMultiplier::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-current-divisor", 0, UINT16_MAX, Attributes::DcCurrentDivisor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-power-multiplier", 0, UINT16_MAX, Attributes::DcPowerMultiplier::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "dc-power-divisor", 0, UINT16_MAX, Attributes::DcPowerDivisor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-frequency", 0, UINT16_MAX, Attributes::AcFrequency::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-frequency-min", 0, UINT16_MAX, Attributes::AcFrequencyMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-frequency-max", 0, UINT16_MAX, Attributes::AcFrequencyMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "neutral-current", 0, UINT16_MAX, Attributes::NeutralCurrent::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "total-active-power", INT32_MIN, INT32_MAX, Attributes::TotalActivePower::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "total-reactive-power", INT32_MIN, INT32_MAX, Attributes::TotalReactivePower::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "total-apparent-power", 0, UINT32_MAX, Attributes::TotalApparentPower::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "measured1st-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::Measured1stHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured3rd-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::Measured3rdHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured5th-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::Measured5thHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured7th-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::Measured7thHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured9th-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::Measured9thHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured11th-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::Measured11thHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured-phase1st-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::MeasuredPhase1stHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured-phase3rd-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::MeasuredPhase3rdHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured-phase5th-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::MeasuredPhase5thHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured-phase7th-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::MeasuredPhase7thHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured-phase9th-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::MeasuredPhase9thHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "measured-phase11th-harmonic-current", INT16_MIN, INT16_MAX, + Attributes::MeasuredPhase11thHarmonicCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "ac-frequency-multiplier", 0, UINT16_MAX, Attributes::AcFrequencyMultiplier::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-frequency-divisor", 0, UINT16_MAX, Attributes::AcFrequencyDivisor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "power-multiplier", 0, UINT32_MAX, Attributes::PowerMultiplier::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "power-divisor", 0, UINT32_MAX, Attributes::PowerDivisor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "harmonic-current-multiplier", INT8_MIN, INT8_MAX, + Attributes::HarmonicCurrentMultiplier::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "phase-harmonic-current-multiplier", INT8_MIN, INT8_MAX, + Attributes::PhaseHarmonicCurrentMultiplier::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "instantaneous-voltage", INT16_MIN, INT16_MAX, + Attributes::InstantaneousVoltage::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "instantaneous-line-current", 0, UINT16_MAX, + Attributes::InstantaneousLineCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "instantaneous-active-current", INT16_MIN, INT16_MAX, + Attributes::InstantaneousActiveCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "instantaneous-reactive-current", INT16_MIN, INT16_MAX, + Attributes::InstantaneousReactiveCurrent::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "instantaneous-power", INT16_MIN, INT16_MAX, Attributes::InstantaneousPower::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage", 0, UINT16_MAX, Attributes::RmsVoltage::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage-min", 0, UINT16_MAX, Attributes::RmsVoltageMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage-max", 0, UINT16_MAX, Attributes::RmsVoltageMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current", 0, UINT16_MAX, Attributes::RmsCurrent::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current-min", 0, UINT16_MAX, Attributes::RmsCurrentMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current-max", 0, UINT16_MAX, Attributes::RmsCurrentMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-power", INT16_MIN, INT16_MAX, Attributes::ActivePower::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-power-min", INT16_MIN, INT16_MAX, Attributes::ActivePowerMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-power-max", INT16_MIN, INT16_MAX, Attributes::ActivePowerMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "reactive-power", INT16_MIN, INT16_MAX, Attributes::ReactivePower::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "apparent-power", 0, UINT16_MAX, Attributes::ApparentPower::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "power-factor", INT8_MIN, INT8_MAX, Attributes::PowerFactor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "average-rms-voltage-measurement-period", 0, UINT16_MAX, - Attributes::AverageRmsVoltageMeasurementPeriod::Id, credsIssuerConfig), // + Attributes::AverageRmsVoltageMeasurementPeriod::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "average-rms-under-voltage-counter", 0, UINT16_MAX, - Attributes::AverageRmsUnderVoltageCounter::Id, credsIssuerConfig), // + Attributes::AverageRmsUnderVoltageCounter::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "rms-extreme-over-voltage-period", 0, UINT16_MAX, - Attributes::RmsExtremeOverVoltagePeriod::Id, credsIssuerConfig), // + Attributes::RmsExtremeOverVoltagePeriod::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "rms-extreme-under-voltage-period", 0, UINT16_MAX, - Attributes::RmsExtremeUnderVoltagePeriod::Id, credsIssuerConfig), // - make_unique>(Id, "rms-voltage-sag-period", 0, UINT16_MAX, Attributes::RmsVoltageSagPeriod::Id, + Attributes::RmsExtremeUnderVoltagePeriod::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage-sag-period", 0, UINT16_MAX, Attributes::RmsVoltageSagPeriod::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "rms-voltage-swell-period", 0, UINT16_MAX, Attributes::RmsVoltageSwellPeriod::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "ac-voltage-multiplier", 0, UINT16_MAX, Attributes::AcVoltageMultiplier::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-voltage-divisor", 0, UINT16_MAX, Attributes::AcVoltageDivisor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-current-multiplier", 0, UINT16_MAX, Attributes::AcCurrentMultiplier::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-current-divisor", 0, UINT16_MAX, Attributes::AcCurrentDivisor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-power-multiplier", 0, UINT16_MAX, Attributes::AcPowerMultiplier::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-power-divisor", 0, UINT16_MAX, Attributes::AcPowerDivisor::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "overload-alarms-mask", 0, UINT8_MAX, Attributes::OverloadAlarmsMask::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "voltage-overload", INT16_MIN, INT16_MAX, Attributes::VoltageOverload::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "current-overload", INT16_MIN, INT16_MAX, Attributes::CurrentOverload::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "ac-overload-alarms-mask", 0, UINT16_MAX, Attributes::AcOverloadAlarmsMask::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "ac-voltage-overload", INT16_MIN, INT16_MAX, Attributes::AcVoltageOverload::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-current-overload", INT16_MIN, INT16_MAX, Attributes::AcCurrentOverload::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "ac-active-power-overload", INT16_MIN, INT16_MAX, + Attributes::AcActivePowerOverload::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "ac-reactive-power-overload", INT16_MIN, INT16_MAX, + Attributes::AcReactivePowerOverload::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "average-rms-over-voltage", INT16_MIN, INT16_MAX, + Attributes::AverageRmsOverVoltage::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "average-rms-under-voltage", INT16_MIN, INT16_MAX, + Attributes::AverageRmsUnderVoltage::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-extreme-over-voltage", INT16_MIN, INT16_MAX, + Attributes::RmsExtremeOverVoltage::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-extreme-under-voltage", INT16_MIN, INT16_MAX, + Attributes::RmsExtremeUnderVoltage::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-voltage-sag", INT16_MIN, INT16_MAX, Attributes::RmsVoltageSag::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage-swell", INT16_MIN, INT16_MAX, Attributes::RmsVoltageSwell::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "line-current-phase-b", 0, UINT16_MAX, Attributes::LineCurrentPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-current-phase-b", INT16_MIN, INT16_MAX, + Attributes::ActiveCurrentPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "reactive-current-phase-b", INT16_MIN, INT16_MAX, + Attributes::ReactiveCurrentPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-voltage-phase-b", 0, UINT16_MAX, Attributes::RmsVoltagePhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage-min-phase-b", 0, UINT16_MAX, Attributes::RmsVoltageMinPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage-max-phase-b", 0, UINT16_MAX, Attributes::RmsVoltageMaxPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current-phase-b", 0, UINT16_MAX, Attributes::RmsCurrentPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current-min-phase-b", 0, UINT16_MAX, Attributes::RmsCurrentMinPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current-max-phase-b", 0, UINT16_MAX, Attributes::RmsCurrentMaxPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-power-phase-b", INT16_MIN, INT16_MAX, Attributes::ActivePowerPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-power-min-phase-b", INT16_MIN, INT16_MAX, + Attributes::ActivePowerMinPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "active-power-max-phase-b", INT16_MIN, INT16_MAX, + Attributes::ActivePowerMaxPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "reactive-power-phase-b", INT16_MIN, INT16_MAX, + Attributes::ReactivePowerPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "apparent-power-phase-b", 0, UINT16_MAX, Attributes::ApparentPowerPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "power-factor-phase-b", INT8_MIN, INT8_MAX, Attributes::PowerFactorPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "average-rms-voltage-measurement-period-phase-b", 0, UINT16_MAX, + Attributes::AverageRmsVoltageMeasurementPeriodPhaseB::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "average-rms-over-voltage-counter-phase-b", 0, UINT16_MAX, + Attributes::AverageRmsOverVoltageCounterPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "average-rms-under-voltage-counter-phase-b", 0, UINT16_MAX, + Attributes::AverageRmsUnderVoltageCounterPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-extreme-over-voltage-period-phase-b", 0, UINT16_MAX, + Attributes::RmsExtremeOverVoltagePeriodPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-extreme-under-voltage-period-phase-b", 0, UINT16_MAX, + Attributes::RmsExtremeUnderVoltagePeriodPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-voltage-sag-period-phase-b", 0, UINT16_MAX, + Attributes::RmsVoltageSagPeriodPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-voltage-swell-period-phase-b", 0, UINT16_MAX, + Attributes::RmsVoltageSwellPeriodPhaseB::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "line-current-phase-c", 0, UINT16_MAX, Attributes::LineCurrentPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-current-phase-c", INT16_MIN, INT16_MAX, + Attributes::ActiveCurrentPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "reactive-current-phase-c", INT16_MIN, INT16_MAX, + Attributes::ReactiveCurrentPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-voltage-phase-c", 0, UINT16_MAX, Attributes::RmsVoltagePhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage-min-phase-c", 0, UINT16_MAX, Attributes::RmsVoltageMinPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-voltage-max-phase-c", 0, UINT16_MAX, Attributes::RmsVoltageMaxPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current-phase-c", 0, UINT16_MAX, Attributes::RmsCurrentPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current-min-phase-c", 0, UINT16_MAX, Attributes::RmsCurrentMinPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "rms-current-max-phase-c", 0, UINT16_MAX, Attributes::RmsCurrentMaxPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-power-phase-c", INT16_MIN, INT16_MAX, Attributes::ActivePowerPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-power-min-phase-c", INT16_MIN, INT16_MAX, + Attributes::ActivePowerMinPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "active-power-max-phase-c", INT16_MIN, INT16_MAX, + Attributes::ActivePowerMaxPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "reactive-power-phase-c", INT16_MIN, INT16_MAX, + Attributes::ReactivePowerPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "apparent-power-phase-c", 0, UINT16_MAX, Attributes::ApparentPowerPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "power-factor-phase-c", INT8_MIN, INT8_MAX, Attributes::PowerFactorPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "average-rms-voltage-measurement-period-phase-c", 0, UINT16_MAX, + Attributes::AverageRmsVoltageMeasurementPeriodPhaseC::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "average-rms-over-voltage-counter-phase-c", 0, UINT16_MAX, + Attributes::AverageRmsOverVoltageCounterPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "average-rms-under-voltage-counter-phase-c", 0, UINT16_MAX, + Attributes::AverageRmsUnderVoltageCounterPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-extreme-over-voltage-period-phase-c", 0, UINT16_MAX, + Attributes::RmsExtremeOverVoltagePeriodPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-extreme-under-voltage-period-phase-c", 0, UINT16_MAX, + Attributes::RmsExtremeUnderVoltagePeriodPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-voltage-sag-period-phase-c", 0, UINT16_MAX, + Attributes::RmsVoltageSagPeriodPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "rms-voltage-swell-period-phase-c", 0, UINT16_MAX, + Attributes::RmsVoltageSwellPeriodPhaseC::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "measurement-type", Attributes::MeasurementType::Id, credsIssuerConfig), // make_unique(Id, "dc-voltage", Attributes::DcVoltage::Id, credsIssuerConfig), // @@ -13056,17 +15186,37 @@ void registerClusterClientMonitoring(Commands & commands, CredentialIssuerComman // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "idle-mode-interval", Attributes::IdleModeInterval::Id, credsIssuerConfig), // - make_unique(Id, "active-mode-interval", Attributes::ActiveModeInterval::Id, credsIssuerConfig), // - make_unique(Id, "active-mode-threshold", Attributes::ActiveModeThreshold::Id, credsIssuerConfig), // - make_unique(Id, "expected-clients", Attributes::ExpectedClients::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "idle-mode-interval", Attributes::IdleModeInterval::Id, credsIssuerConfig), // + make_unique(Id, "active-mode-interval", Attributes::ActiveModeInterval::Id, credsIssuerConfig), // + make_unique(Id, "active-mode-threshold", Attributes::ActiveModeThreshold::Id, credsIssuerConfig), // + make_unique(Id, "expected-clients", Attributes::ExpectedClients::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>(Id, "idle-mode-interval", 0, UINT32_MAX, Attributes::IdleModeInterval::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-mode-interval", 0, UINT32_MAX, Attributes::ActiveModeInterval::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "active-mode-threshold", 0, UINT16_MAX, Attributes::ActiveModeThreshold::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "expected-clients", Attributes::ExpectedClients::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "idle-mode-interval", Attributes::IdleModeInterval::Id, credsIssuerConfig), // make_unique(Id, "active-mode-interval", Attributes::ActiveModeInterval::Id, credsIssuerConfig), // @@ -13216,158 +15366,210 @@ void registerClusterUnitTesting(Commands & commands, CredentialIssuerCommands * make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "boolean", 0, 1, Attributes::Boolean::Id, credsIssuerConfig), // + make_unique>(Id, "boolean", 0, 1, Attributes::Boolean::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>>( - Id, "bitmap8", 0, UINT8_MAX, Attributes::Bitmap8::Id, credsIssuerConfig), // + Id, "bitmap8", 0, UINT8_MAX, Attributes::Bitmap8::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "bitmap16", 0, UINT16_MAX, Attributes::Bitmap16::Id, credsIssuerConfig), // + Id, "bitmap16", 0, UINT16_MAX, Attributes::Bitmap16::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "bitmap32", 0, UINT32_MAX, Attributes::Bitmap32::Id, credsIssuerConfig), // + Id, "bitmap32", 0, UINT32_MAX, Attributes::Bitmap32::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "bitmap64", 0, UINT64_MAX, Attributes::Bitmap64::Id, credsIssuerConfig), // - make_unique>(Id, "int8u", 0, UINT8_MAX, Attributes::Int8u::Id, credsIssuerConfig), // - make_unique>(Id, "int16u", 0, UINT16_MAX, Attributes::Int16u::Id, credsIssuerConfig), // - make_unique>(Id, "int24u", 0, UINT32_MAX, Attributes::Int24u::Id, credsIssuerConfig), // - make_unique>(Id, "int32u", 0, UINT32_MAX, Attributes::Int32u::Id, credsIssuerConfig), // - make_unique>(Id, "int40u", 0, UINT64_MAX, Attributes::Int40u::Id, credsIssuerConfig), // - make_unique>(Id, "int48u", 0, UINT64_MAX, Attributes::Int48u::Id, credsIssuerConfig), // - make_unique>(Id, "int56u", 0, UINT64_MAX, Attributes::Int56u::Id, credsIssuerConfig), // - make_unique>(Id, "int64u", 0, UINT64_MAX, Attributes::Int64u::Id, credsIssuerConfig), // - make_unique>(Id, "int8s", INT8_MIN, INT8_MAX, Attributes::Int8s::Id, credsIssuerConfig), // - make_unique>(Id, "int16s", INT16_MIN, INT16_MAX, Attributes::Int16s::Id, credsIssuerConfig), // - make_unique>(Id, "int24s", INT32_MIN, INT32_MAX, Attributes::Int24s::Id, credsIssuerConfig), // - make_unique>(Id, "int32s", INT32_MIN, INT32_MAX, Attributes::Int32s::Id, credsIssuerConfig), // - make_unique>(Id, "int40s", INT64_MIN, INT64_MAX, Attributes::Int40s::Id, credsIssuerConfig), // - make_unique>(Id, "int48s", INT64_MIN, INT64_MAX, Attributes::Int48s::Id, credsIssuerConfig), // - make_unique>(Id, "int56s", INT64_MIN, INT64_MAX, Attributes::Int56s::Id, credsIssuerConfig), // - make_unique>(Id, "int64s", INT64_MIN, INT64_MAX, Attributes::Int64s::Id, credsIssuerConfig), // - make_unique>(Id, "enum8", 0, UINT8_MAX, Attributes::Enum8::Id, credsIssuerConfig), // - make_unique>(Id, "enum16", 0, UINT16_MAX, Attributes::Enum16::Id, credsIssuerConfig), // + Id, "bitmap64", 0, UINT64_MAX, Attributes::Bitmap64::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "int8u", 0, UINT8_MAX, Attributes::Int8u::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int16u", 0, UINT16_MAX, Attributes::Int16u::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int24u", 0, UINT32_MAX, Attributes::Int24u::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int32u", 0, UINT32_MAX, Attributes::Int32u::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int40u", 0, UINT64_MAX, Attributes::Int40u::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int48u", 0, UINT64_MAX, Attributes::Int48u::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int56u", 0, UINT64_MAX, Attributes::Int56u::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int64u", 0, UINT64_MAX, Attributes::Int64u::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int8s", INT8_MIN, INT8_MAX, Attributes::Int8s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int16s", INT16_MIN, INT16_MAX, Attributes::Int16s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int24s", INT32_MIN, INT32_MAX, Attributes::Int24s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int32s", INT32_MIN, INT32_MAX, Attributes::Int32s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int40s", INT64_MIN, INT64_MAX, Attributes::Int40s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int48s", INT64_MIN, INT64_MAX, Attributes::Int48s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int56s", INT64_MIN, INT64_MAX, Attributes::Int56s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "int64s", INT64_MIN, INT64_MAX, Attributes::Int64s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "enum8", 0, UINT8_MAX, Attributes::Enum8::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "enum16", 0, UINT16_MAX, Attributes::Enum16::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>(Id, "float-single", -std::numeric_limits::infinity(), std::numeric_limits::infinity(), Attributes::FloatSingle::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "float-double", -std::numeric_limits::infinity(), std::numeric_limits::infinity(), Attributes::FloatDouble::Id, - credsIssuerConfig), // - make_unique>(Id, "octet-string", Attributes::OctetString::Id, credsIssuerConfig), // - make_unique>>(Id, "list-int8u", Attributes::ListInt8u::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "octet-string", Attributes::OctetString::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>( + Id, "list-int8u", Attributes::ListInt8u::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "list-octet-string", Attributes::ListOctetString::Id, credsIssuerConfig), // + Id, "list-octet-string", Attributes::ListOctetString::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "list-struct-octet-string", Attributes::ListStructOctetString::Id, credsIssuerConfig), // - make_unique>(Id, "long-octet-string", Attributes::LongOctetString::Id, credsIssuerConfig), // - make_unique>(Id, "char-string", Attributes::CharString::Id, credsIssuerConfig), // - make_unique>(Id, "long-char-string", Attributes::LongCharString::Id, credsIssuerConfig), // - make_unique>(Id, "epoch-us", 0, UINT64_MAX, Attributes::EpochUs::Id, credsIssuerConfig), // - make_unique>(Id, "epoch-s", 0, UINT32_MAX, Attributes::EpochS::Id, credsIssuerConfig), // - make_unique>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorId::Id, credsIssuerConfig), // + Id, "list-struct-octet-string", Attributes::ListStructOctetString::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "long-octet-string", Attributes::LongOctetString::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "char-string", Attributes::CharString::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "long-char-string", Attributes::LongCharString::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "epoch-us", 0, UINT64_MAX, Attributes::EpochUs::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "epoch-s", 0, UINT32_MAX, Attributes::EpochS::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>(Id, "vendor-id", 0, UINT16_MAX, Attributes::VendorId::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "list-nullables-and-optionals-struct", Attributes::ListNullablesAndOptionalsStruct::Id, credsIssuerConfig), // - make_unique>(Id, "enum-attr", 0, UINT8_MAX, - Attributes::EnumAttr::Id, credsIssuerConfig), // + Id, "list-nullables-and-optionals-struct", Attributes::ListNullablesAndOptionalsStruct::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>( + Id, "enum-attr", 0, UINT8_MAX, Attributes::EnumAttr::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>( - Id, "struct-attr", Attributes::StructAttr::Id, credsIssuerConfig), // + Id, "struct-attr", Attributes::StructAttr::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "range-restricted-int8u", 0, UINT8_MAX, Attributes::RangeRestrictedInt8u::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "range-restricted-int8s", INT8_MIN, INT8_MAX, Attributes::RangeRestrictedInt8s::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "range-restricted-int16u", 0, UINT16_MAX, Attributes::RangeRestrictedInt16u::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "range-restricted-int16s", INT16_MIN, INT16_MAX, - Attributes::RangeRestrictedInt16s::Id, credsIssuerConfig), // + Attributes::RangeRestrictedInt16s::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "list-long-octet-string", Attributes::ListLongOctetString::Id, credsIssuerConfig), // + Id, "list-long-octet-string", Attributes::ListLongOctetString::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "list-fabric-scoped", Attributes::ListFabricScoped::Id, credsIssuerConfig), // - make_unique>(Id, "timed-write-boolean", 0, 1, Attributes::TimedWriteBoolean::Id, credsIssuerConfig), // + Id, "list-fabric-scoped", Attributes::ListFabricScoped::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "timed-write-boolean", 0, 1, Attributes::TimedWriteBoolean::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "general-error-boolean", 0, 1, Attributes::GeneralErrorBoolean::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "cluster-error-boolean", 0, 1, Attributes::ClusterErrorBoolean::Id, - credsIssuerConfig), // - make_unique>(Id, "unsupported", 0, 1, Attributes::Unsupported::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-boolean", 0, 1, - Attributes::NullableBoolean::Id, credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>(Id, "unsupported", 0, 1, Attributes::Unsupported::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>( + Id, "nullable-boolean", 0, 1, Attributes::NullableBoolean::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique< WriteAttribute>>>( - Id, "nullable-bitmap8", 0, UINT8_MAX, Attributes::NullableBitmap8::Id, credsIssuerConfig), // + Id, "nullable-bitmap8", 0, UINT8_MAX, Attributes::NullableBitmap8::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique< WriteAttribute>>>( - Id, "nullable-bitmap16", 0, UINT16_MAX, Attributes::NullableBitmap16::Id, credsIssuerConfig), // + Id, "nullable-bitmap16", 0, UINT16_MAX, Attributes::NullableBitmap16::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique< WriteAttribute>>>( - Id, "nullable-bitmap32", 0, UINT32_MAX, Attributes::NullableBitmap32::Id, credsIssuerConfig), // + Id, "nullable-bitmap32", 0, UINT32_MAX, Attributes::NullableBitmap32::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique< WriteAttribute>>>( - Id, "nullable-bitmap64", 0, UINT64_MAX, Attributes::NullableBitmap64::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-int8u", 0, UINT8_MAX, - Attributes::NullableInt8u::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-int16u", 0, UINT16_MAX, - Attributes::NullableInt16u::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-int24u", 0, UINT32_MAX, - Attributes::NullableInt24u::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-int32u", 0, UINT32_MAX, - Attributes::NullableInt32u::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-int40u", 0, UINT64_MAX, - Attributes::NullableInt40u::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-int48u", 0, UINT64_MAX, - Attributes::NullableInt48u::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-int56u", 0, UINT64_MAX, - Attributes::NullableInt56u::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-int64u", 0, UINT64_MAX, - Attributes::NullableInt64u::Id, credsIssuerConfig), // + Id, "nullable-bitmap64", 0, UINT64_MAX, Attributes::NullableBitmap64::Id, WriteCommandType::kWrite, + credsIssuerConfig), // + make_unique>>( + Id, "nullable-int8u", 0, UINT8_MAX, Attributes::NullableInt8u::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-int16u", 0, UINT16_MAX, Attributes::NullableInt16u::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-int24u", 0, UINT32_MAX, Attributes::NullableInt24u::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-int32u", 0, UINT32_MAX, Attributes::NullableInt32u::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-int40u", 0, UINT64_MAX, Attributes::NullableInt40u::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-int48u", 0, UINT64_MAX, Attributes::NullableInt48u::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-int56u", 0, UINT64_MAX, Attributes::NullableInt56u::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-int64u", 0, UINT64_MAX, Attributes::NullableInt64u::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-int8s", INT8_MIN, INT8_MAX, - Attributes::NullableInt8s::Id, credsIssuerConfig), // + Attributes::NullableInt8s::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique>>(Id, "nullable-int16s", INT16_MIN, INT16_MAX, - Attributes::NullableInt16s::Id, credsIssuerConfig), // + Attributes::NullableInt16s::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-int24s", INT32_MIN, INT32_MAX, - Attributes::NullableInt24s::Id, credsIssuerConfig), // + Attributes::NullableInt24s::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-int32s", INT32_MIN, INT32_MAX, - Attributes::NullableInt32s::Id, credsIssuerConfig), // + Attributes::NullableInt32s::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-int40s", INT64_MIN, INT64_MAX, - Attributes::NullableInt40s::Id, credsIssuerConfig), // + Attributes::NullableInt40s::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-int48s", INT64_MIN, INT64_MAX, - Attributes::NullableInt48s::Id, credsIssuerConfig), // + Attributes::NullableInt48s::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-int56s", INT64_MIN, INT64_MAX, - Attributes::NullableInt56s::Id, credsIssuerConfig), // + Attributes::NullableInt56s::Id, + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-int64s", INT64_MIN, INT64_MAX, - Attributes::NullableInt64s::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-enum8", 0, UINT8_MAX, - Attributes::NullableEnum8::Id, credsIssuerConfig), // - make_unique>>(Id, "nullable-enum16", 0, UINT16_MAX, - Attributes::NullableEnum16::Id, credsIssuerConfig), // + Attributes::NullableInt64s::Id, + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-enum8", 0, UINT8_MAX, Attributes::NullableEnum8::Id, WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "nullable-enum16", 0, UINT16_MAX, Attributes::NullableEnum16::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( Id, "nullable-float-single", -std::numeric_limits::infinity(), std::numeric_limits::infinity(), - Attributes::NullableFloatSingle::Id, credsIssuerConfig), // + Attributes::NullableFloatSingle::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( Id, "nullable-float-double", -std::numeric_limits::infinity(), std::numeric_limits::infinity(), - Attributes::NullableFloatDouble::Id, credsIssuerConfig), // + Attributes::NullableFloatDouble::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "nullable-octet-string", Attributes::NullableOctetString::Id, credsIssuerConfig), // + Id, "nullable-octet-string", Attributes::NullableOctetString::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "nullable-char-string", Attributes::NullableCharString::Id, credsIssuerConfig), // + Id, "nullable-char-string", Attributes::NullableCharString::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( - Id, "nullable-enum-attr", 0, UINT8_MAX, Attributes::NullableEnumAttr::Id, credsIssuerConfig), // + Id, "nullable-enum-attr", 0, UINT8_MAX, Attributes::NullableEnumAttr::Id, WriteCommandType::kWrite, + credsIssuerConfig), // make_unique< WriteAttributeAsComplex>>( - Id, "nullable-struct", Attributes::NullableStruct::Id, credsIssuerConfig), // + Id, "nullable-struct", Attributes::NullableStruct::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-range-restricted-int8u", 0, UINT8_MAX, Attributes::NullableRangeRestrictedInt8u::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-range-restricted-int8s", INT8_MIN, INT8_MAX, Attributes::NullableRangeRestrictedInt8s::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>(Id, "nullable-range-restricted-int16u", 0, UINT16_MAX, Attributes::NullableRangeRestrictedInt16u::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( Id, "nullable-range-restricted-int16s", INT16_MIN, INT16_MAX, Attributes::NullableRangeRestrictedInt16s::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "write-only-int8u", 0, UINT8_MAX, Attributes::WriteOnlyInt8u::Id, - credsIssuerConfig), // + WriteCommandType::kWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "boolean", Attributes::Boolean::Id, credsIssuerConfig), // make_unique(Id, "bitmap8", Attributes::Bitmap8::Id, credsIssuerConfig), // @@ -13491,13 +15693,24 @@ void registerClusterFaultInjection(Commands & commands, CredentialIssuerCommands // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // - make_unique>(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 7b06be89ef5f12..995f4a5e66bdff 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -599,14 +599,6 @@ class TestAccessControlClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1240,12 +1232,6 @@ class TestAccessControlClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2164,14 +2150,6 @@ class Test_TC_ACL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2261,12 +2239,6 @@ class Test_TC_ACL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2344,14 +2316,6 @@ class Test_TC_ACL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2403,12 +2367,6 @@ class Test_TC_ACL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2473,14 +2431,6 @@ class Test_TC_ACL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2515,12 +2465,6 @@ class Test_TC_ACL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2605,14 +2549,6 @@ class Test_TC_ACL_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2793,12 +2729,6 @@ class Test_TC_ACL_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -3239,14 +3169,6 @@ class Test_TC_ACL_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -4091,12 +4013,6 @@ class Test_TC_ACL_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -5718,14 +5634,6 @@ class Test_TC_ACL_2_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -5818,6 +5726,18 @@ class Test_TC_ACL_2_7Suite : public TestCommand { chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("accessControlExtensionChanged.adminNodeID", value.adminNodeID)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.adminNodeID.Value()", value.adminNodeID.Value(), + mTH1CommissionerNodeId.HasValue() ? mTH1CommissionerNodeId.Value() : 112233ULL)); + VerifyOrReturn(CheckValueNull("accessControlExtensionChanged.adminPasscodeID", value.adminPasscodeID)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.changeType", value.changeType, 1U)); + VerifyOrReturn(CheckValueNonNull("accessControlExtensionChanged.latestValue", value.latestValue)); + VerifyOrReturn(CheckValueAsString( + "accessControlExtensionChanged.latestValue.Value().data", value.latestValue.Value().data, + mDOkEmpty.HasValue() ? mDOkEmpty.Value() : chip::ByteSpan(chip::Uint8::from_const_char("\x17\x18"), 2))); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.latestValue.Value().fabricIndex", + value.latestValue.Value().fabricIndex, TH1FabricIndex)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.fabricIndex", value.fabricIndex, TH1FabricIndex)); } mTestSubStepIndex++; break; @@ -5834,6 +5754,25 @@ class Test_TC_ACL_2_7Suite : public TestCommand { chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("accessControlExtensionChanged.adminNodeID", value.adminNodeID)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.adminNodeID.Value()", value.adminNodeID.Value(), + mTH2CommissionerNodeId.HasValue() ? mTH2CommissionerNodeId.Value() : 112233ULL)); + VerifyOrReturn(CheckValueNull("accessControlExtensionChanged.adminPasscodeID", value.adminPasscodeID)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.changeType", value.changeType, 1U)); + VerifyOrReturn(CheckValueNonNull("accessControlExtensionChanged.latestValue", value.latestValue)); + VerifyOrReturn(CheckValueAsString( + "accessControlExtensionChanged.latestValue.Value().data", value.latestValue.Value().data, + mDOkSingle.HasValue() + ? mDOkSingle.Value() + : chip::ByteSpan(chip::Uint8::from_const_char( + "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64" + "\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65" + "\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63" + "\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + 71))); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.latestValue.Value().fabricIndex", + value.latestValue.Value().fabricIndex, TH2FabricIndex)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.fabricIndex", value.fabricIndex, TH2FabricIndex)); } mTestSubStepIndex++; break; @@ -5855,12 +5794,6 @@ class Test_TC_ACL_2_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -6032,14 +5965,6 @@ class Test_TC_ACL_2_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -6346,12 +6271,6 @@ class Test_TC_ACL_2_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -6534,14 +6453,6 @@ class Test_TC_ACL_2_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -6634,12 +6545,6 @@ class Test_TC_ACL_2_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -6826,14 +6731,6 @@ class Test_TC_ACL_2_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -7003,12 +6900,6 @@ class Test_TC_ACL_2_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -7377,7 +7268,7 @@ class Test_TC_ACL_2_10Suite : public TestCommand class Test_TC_ACE_1_1Suite : public TestCommand { public: - Test_TC_ACE_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACE_1_1", 37, credsIssuerConfig) + Test_TC_ACE_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACE_1_1", 38, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -7398,6 +7289,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; + chip::NodeId commissionerNodeId; + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } // @@ -7406,14 +7299,6 @@ class Test_TC_ACE_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -7424,8 +7309,17 @@ class Test_TC_ACE_1_1Suite : public TestCommand break; case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeId = value.nodeId; + } + shouldContinue = true; break; case 2: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList @@ -7435,34 +7329,31 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckConstraintMaxLength("value", value, 1)); } break; - case 3: + case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 4: + case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 5: + case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 6: + case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); break; - case 7: + case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 8: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 9: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -7471,23 +7362,23 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 13: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 14: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + break; + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 15: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 16: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -7502,17 +7393,17 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 21: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + break; + case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 22: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 23: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -7527,17 +7418,17 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 28: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + break; + case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 29: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 30: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -7555,6 +7446,9 @@ class Test_TC_ACE_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 36: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + break; + case 37: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; default: @@ -7570,12 +7464,6 @@ class Test_TC_ACE_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -7586,7 +7474,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WaitForCommissionee(kIdentityAlpha, value); } case 1: { - LogStep(1, "TP2 - Write ACL giving admin privilege on all EP0"); + LogStep(1, "Read the commissioner node ID"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 2: { + LogStep(2, "TP2 - Write ACL giving admin privilege on all EP0"); ListFreer listFreer; chip::app::DataModel::List value; @@ -7630,21 +7524,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 2: { - LogStep(2, "TP3 - Read the NOC attribute (Node operational credentials - requires administer)"); + case 3: { + LogStep(3, "TP3 - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 3: { - LogStep(3, "TP4 - Write the location attribute (Basic - requires administer)"); + case 4: { + LogStep(4, "TP4 - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 4: { - LogStep(4, "TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 5: { + LogStep(5, "TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -7653,16 +7547,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 5: { - LogStep(5, "TP6 - Write NodeLabel attribute (Basic - requires manage)"); + case 6: { + LogStep(6, "TP6 - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 6: { - LogStep(6, "TP7 - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 7: { + LogStep(7, "TP7 - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -7672,13 +7566,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 7: { - LogStep(7, "TP8 - Tead the VendorID attribute (Basic - requires view)"); + case 8: { + LogStep(8, "TP8 - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 8: { - LogStep(8, "TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0"); + case 9: { + LogStep(9, "TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0"); ListFreer listFreer; chip::app::DataModel::List value; @@ -7752,21 +7646,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 9: { - LogStep(9, "TP10 - Read the NOC attribute (Node operational credentials - requires administer)"); + case 10: { + LogStep(10, "TP10 - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 10: { - LogStep(10, "TP11 - Write the location attribute (Basic - requires administer)"); + case 11: { + LogStep(11, "TP11 - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 11: { - LogStep(11, "TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 12: { + LogStep(12, "TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -7775,16 +7669,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 12: { - LogStep(12, "TP13(6) - Write NodeLabel attribute (Basic - requires manage)"); + case 13: { + LogStep(13, "TP13(6) - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 13: { - LogStep(13, "TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 14: { + LogStep(14, "TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -7794,13 +7688,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 14: { - LogStep(14, "TP13(8) - Tead the VendorID attribute (Basic - requires view)"); + case 15: { + LogStep(15, "TP13(8) - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 15: { - LogStep(15, "TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0"); + case 16: { + LogStep(16, "TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0"); ListFreer listFreer; chip::app::DataModel::List value; @@ -7874,21 +7768,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 16: { - LogStep(16, "TP15(10) - Read the NOC attribute (Node operational credentials - requires administer)"); + case 17: { + LogStep(17, "TP15(10) - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 17: { - LogStep(17, "TP15(11) - Write the location attribute (Basic - requires administer)"); + case 18: { + LogStep(18, "TP15(11) - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 18: { - LogStep(18, "TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 19: { + LogStep(19, "TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -7897,16 +7791,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 19: { - LogStep(19, "TP16 - Write NodeLabel attribute (Basic - requires manage)"); + case 20: { + LogStep(20, "TP16 - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 20: { - LogStep(20, "TP17 - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 21: { + LogStep(21, "TP17 - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -7916,13 +7810,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 21: { - LogStep(21, "TP18(8) - Tead the VendorID attribute (Basic - requires view)"); + case 22: { + LogStep(22, "TP18(8) - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 22: { - LogStep(22, "TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0"); + case 23: { + LogStep(23, "TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0"); ListFreer listFreer; chip::app::DataModel::List value; @@ -7996,21 +7890,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 23: { - LogStep(23, "TP20(10) - Read the NOC attribute (Node operational credentials - requires administer)"); + case 24: { + LogStep(24, "TP20(10) - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 24: { - LogStep(24, "TP20(11) - Write the location attribute (Basic - requires administer)"); + case 25: { + LogStep(25, "TP20(11) - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 25: { - LogStep(25, "TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 26: { + LogStep(26, "TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -8019,16 +7913,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 26: { - LogStep(26, "TP21(16) - Write NodeLabel attribute (Basic - requires manage)"); + case 27: { + LogStep(27, "TP21(16) - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 27: { - LogStep(27, "TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 28: { + LogStep(28, "TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -8038,13 +7932,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 28: { - LogStep(28, "TP22(8) - Tead the VendorID attribute (Basic - requires view)"); + case 29: { + LogStep(29, "TP22(8) - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 29: { - LogStep(29, "TP23 - Write ACL giving only admin privilege ACL cluster"); + case 30: { + LogStep(30, "TP23 - Write ACL giving only admin privilege ACL cluster"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8089,21 +7983,21 @@ class Test_TC_ACE_1_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 30: { - LogStep(30, "TP24(10) - Read the NOC attribute (Node operational credentials - requires administer)"); + case 31: { + LogStep(31, "TP24(10) - Read the NOC attribute (Node operational credentials - requires administer)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::NOCs::Id, true, chip::NullOptional); } - case 31: { - LogStep(31, "TP24(11) - Write the location attribute (Basic - requires administer)"); + case 32: { + LogStep(32, "TP24(11) - Write the location attribute (Basic - requires administer)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("XXgarbage: not in length on purpose", 2); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::Location::Id, value, chip::NullOptional, chip::NullOptional); } - case 32: { - LogStep(32, "TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); + case 33: { + LogStep(33, "TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires administer)"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::UpdateFabricLabel::Type value; value.label = chip::Span("TestFabricgarbage: not in length on purpose", 10); @@ -8112,16 +8006,16 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 33: { - LogStep(33, "TP25(16) - Write NodeLabel attribute (Basic - requires manage)"); + case 34: { + LogStep(34, "TP25(16) - Write NodeLabel attribute (Basic - requires manage)"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("TestNodegarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::NodeLabel::Id, value, chip::NullOptional, chip::NullOptional); } - case 34: { - LogStep(34, "TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage)"); + case 35: { + LogStep(35, "TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage)"); ListFreer listFreer; chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::Type value; value.enableKey = chip::ByteSpan(chip::Uint8::from_const_char("0garbage: not in length on purpose"), 1); @@ -8131,13 +8025,13 @@ class Test_TC_ACE_1_1Suite : public TestCommand ); } - case 35: { - LogStep(35, "TP26 - Tead the VendorID attribute (Basic - requires view)"); + case 36: { + LogStep(36, "TP26 - Tead the VendorID attribute (Basic - requires view)"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 36: { - LogStep(36, "TP27 - Write ACL to restore full access"); + case 37: { + LogStep(37, "TP27 - Write ACL to restore full access"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8175,7 +8069,7 @@ class Test_TC_ACE_1_1Suite : public TestCommand class Test_TC_ACE_1_5Suite : public TestCommand { public: - Test_TC_ACE_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACE_1_5", 14, credsIssuerConfig) + Test_TC_ACE_1_5Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACE_1_5", 16, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -8200,6 +8094,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand uint8_t th1FabricIndex; uint8_t th2FabricIndex; + chip::NodeId commissionerNodeIdAlpha; + chip::NodeId commissionerNodeIdBeta; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -8209,14 +8105,6 @@ class Test_TC_ACE_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -8254,11 +8142,29 @@ class Test_TC_ACE_1_5Suite : public TestCommand break; case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdAlpha = value.nodeId; + } + shouldContinue = true; break; case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdBeta = value.nodeId; + } + shouldContinue = true; + break; + case 9: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList @@ -8266,23 +8172,23 @@ class Test_TC_ACE_1_5Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 9: + case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; - case 10: + case 12: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; - case 11: + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 12: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 13: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; @@ -8302,12 +8208,6 @@ class Test_TC_ACE_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -8354,7 +8254,13 @@ class Test_TC_ACE_1_5Suite : public TestCommand OperationalCredentials::Attributes::CurrentFabricIndex::Id, true, chip::NullOptional); } case 6: { - LogStep(6, "TH1 writes ACL giving view privilege for descriptor cluster"); + LogStep(6, "Read the commissioner node ID from the alpha fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 7: { + LogStep(7, "TH1 writes ACL giving view privilege for descriptor cluster"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8372,7 +8278,7 @@ class Test_TC_ACE_1_5Suite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdAlpha; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNonNull(); @@ -8422,8 +8328,14 @@ class Test_TC_ACE_1_5Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 7: { - LogStep(7, "TH2 writes ACL giving view privilge for basic cluster"); + case 8: { + LogStep(8, "Read the commissioner node ID from the beta fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityBeta, value); + } + case 9: { + LogStep(9, "TH2 writes ACL giving view privilge for basic cluster"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8441,7 +8353,7 @@ class Test_TC_ACE_1_5Suite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdBeta; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNonNull(); @@ -8491,28 +8403,28 @@ class Test_TC_ACE_1_5Suite : public TestCommand return WriteAttribute(kIdentityBeta, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 8: { - LogStep(8, "TH1 reads descriptor cluster - expect SUCCESS"); + case 10: { + LogStep(10, "TH1 reads descriptor cluster - expect SUCCESS"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), Descriptor::Id, Descriptor::Attributes::DeviceTypeList::Id, true, chip::NullOptional); } - case 9: { - LogStep(9, "TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"); + case 11: { + LogStep(11, "TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 10: { - LogStep(10, "TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"); + case 12: { + LogStep(12, "TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), Descriptor::Id, Descriptor::Attributes::DeviceTypeList::Id, true, chip::NullOptional); } - case 11: { - LogStep(11, "TH2 reads basic cluster - expect SUCCESS"); + case 13: { + LogStep(13, "TH2 reads basic cluster - expect SUCCESS"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), BasicInformation::Id, BasicInformation::Attributes::VendorID::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "TH1 resets ACL to default"); + case 14: { + LogStep(14, "TH1 resets ACL to default"); ListFreer listFreer; chip::app::DataModel::List value; @@ -8530,7 +8442,7 @@ class Test_TC_ACE_1_5Suite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdAlpha; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNull(); @@ -8542,8 +8454,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 13: { - LogStep(13, "TH1 sends RemoveFabric command for TH2"); + case 15: { + LogStep(15, "TH1 sends RemoveFabric command for TH2"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::RemoveFabric::Type value; value.fabricIndex = th2FabricIndex; @@ -8589,14 +8501,6 @@ class Test_TC_BOOL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -8674,12 +8578,6 @@ class Test_TC_BOOL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -8751,14 +8649,6 @@ class Test_TC_BOOL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -8788,12 +8678,6 @@ class Test_TC_BOOL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -8847,14 +8731,6 @@ class Test_TC_BRBINFO_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -9058,12 +8934,6 @@ class Test_TC_BRBINFO_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -9303,14 +9173,6 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -9730,12 +9592,6 @@ class Test_TC_BRBINFO_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -10158,14 +10014,6 @@ class Test_TC_ACT_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -10250,12 +10098,6 @@ class Test_TC_ACT_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -10333,14 +10175,6 @@ class Test_TC_BIND_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -10418,12 +10252,6 @@ class Test_TC_BIND_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -10495,14 +10323,6 @@ class Test_TC_CC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -10949,12 +10769,6 @@ class Test_TC_CC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -11277,14 +11091,6 @@ class Test_TC_CC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -11726,12 +11532,6 @@ class Test_TC_CC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -12203,14 +12003,6 @@ class Test_TC_CC_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -12399,12 +12191,6 @@ class Test_TC_CC_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -12713,14 +12499,6 @@ class Test_TC_CC_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -12877,12 +12655,6 @@ class Test_TC_CC_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -13139,14 +12911,6 @@ class Test_TC_CC_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -13267,12 +13031,6 @@ class Test_TC_CC_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -13455,14 +13213,6 @@ class Test_TC_CC_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -13667,12 +13417,6 @@ class Test_TC_CC_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -14003,14 +13747,6 @@ class Test_TC_CC_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -14198,12 +13934,6 @@ class Test_TC_CC_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -14512,14 +14242,6 @@ class Test_TC_CC_4_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -14673,12 +14395,6 @@ class Test_TC_CC_4_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -14880,14 +14596,6 @@ class Test_TC_CC_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -15257,12 +14965,6 @@ class Test_TC_CC_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -15818,14 +15520,6 @@ class Test_TC_CC_5_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -15983,12 +15677,6 @@ class Test_TC_CC_5_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -16200,14 +15888,6 @@ class Test_TC_CC_5_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -16342,12 +16022,6 @@ class Test_TC_CC_5_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -16539,14 +16213,6 @@ class Test_TC_CC_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -16699,12 +16365,6 @@ class Test_TC_CC_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -16911,14 +16571,6 @@ class Test_TC_CC_6_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -17134,12 +16786,6 @@ class Test_TC_CC_6_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -17460,14 +17106,6 @@ class Test_TC_CC_6_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -17651,12 +17289,6 @@ class Test_TC_CC_6_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -17913,14 +17545,6 @@ class Test_TC_CC_7_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -18109,12 +17733,6 @@ class Test_TC_CC_7_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -18423,14 +18041,6 @@ class Test_TC_CC_7_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -18613,12 +18223,6 @@ class Test_TC_CC_7_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -18904,14 +18508,6 @@ class Test_TC_CC_7_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -19064,12 +18660,6 @@ class Test_TC_CC_7_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -19277,14 +18867,6 @@ class Test_TC_CC_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -19501,12 +19083,6 @@ class Test_TC_CC_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -19902,14 +19478,6 @@ class Test_TC_OPCREDS_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -19996,12 +19564,6 @@ class Test_TC_OPCREDS_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -20073,14 +19635,6 @@ class Test_TC_BINFO_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -20241,12 +19795,6 @@ class Test_TC_BINFO_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -20452,14 +20000,6 @@ class Test_TC_BINFO_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -20996,12 +20536,6 @@ class Test_TC_BINFO_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -21551,14 +21085,6 @@ class Test_TC_CNET_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -21729,12 +21255,6 @@ class Test_TC_CNET_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -21871,14 +21391,6 @@ class Test_TC_DESC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -21959,12 +21471,6 @@ class Test_TC_DESC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -22036,14 +21542,6 @@ class Test_TC_DLOG_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -22124,12 +21622,6 @@ class Test_TC_DLOG_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -22201,14 +21693,6 @@ class Test_TC_DGETH_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -22393,12 +21877,6 @@ class Test_TC_DGETH_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -22544,14 +22022,6 @@ class Test_TC_DGETH_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -22675,12 +22145,6 @@ class Test_TC_DGETH_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -22865,14 +22329,6 @@ class Test_TC_DGETH_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23077,12 +22533,6 @@ class Test_TC_DGETH_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23259,14 +22709,6 @@ class Test_TC_FLW_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23355,12 +22797,6 @@ class Test_TC_FLW_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23438,14 +22874,6 @@ class Test_TC_FLW_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23507,12 +22935,6 @@ class Test_TC_FLW_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23583,14 +23005,6 @@ class Test_TC_FLABEL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23668,12 +23082,6 @@ class Test_TC_FLABEL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23745,14 +23153,6 @@ class Test_TC_FLABEL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23789,12 +23189,6 @@ class Test_TC_FLABEL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -23876,14 +23270,6 @@ class Test_TC_CGEN_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -23963,12 +23349,6 @@ class Test_TC_CGEN_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24040,14 +23420,6 @@ class Test_TC_CGEN_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -24121,12 +23493,6 @@ class Test_TC_CGEN_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24220,14 +23586,6 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -24358,12 +23716,6 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24471,14 +23823,6 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -24595,12 +23939,6 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24786,14 +24124,6 @@ class Test_TC_I_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -24878,12 +24208,6 @@ class Test_TC_I_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -24961,14 +24285,6 @@ class Test_TC_I_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25010,12 +24326,6 @@ class Test_TC_I_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -25074,14 +24384,6 @@ class Test_TC_I_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25159,12 +24461,6 @@ class Test_TC_I_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -25293,14 +24589,6 @@ class Test_TC_I_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25392,12 +24680,6 @@ class Test_TC_I_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -25684,14 +24966,6 @@ class Test_TC_ILL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25789,12 +25063,6 @@ class Test_TC_ILL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -25878,14 +25146,6 @@ class Test_TC_ILL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -25957,12 +25217,6 @@ class Test_TC_ILL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -26042,14 +25296,6 @@ class Test_TC_ILL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -26123,12 +25369,6 @@ class Test_TC_ILL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -26233,14 +25473,6 @@ class Test_TC_LVL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -26435,12 +25667,6 @@ class Test_TC_LVL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -26593,14 +25819,6 @@ class Test_TC_LVL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -26826,12 +26044,6 @@ class Test_TC_LVL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -27017,14 +26229,6 @@ class Test_TC_LVL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -27206,12 +26410,6 @@ class Test_TC_LVL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -27398,14 +26596,6 @@ class Test_TC_LVL_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -27676,12 +26866,6 @@ class Test_TC_LVL_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -28141,14 +27325,6 @@ class Test_TC_LVL_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -28314,12 +27490,6 @@ class Test_TC_LVL_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -28563,14 +27733,6 @@ class Test_TC_LVL_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -28713,12 +27875,6 @@ class Test_TC_LVL_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -28952,14 +28108,6 @@ class Test_TC_LVL_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29059,12 +28207,6 @@ class Test_TC_LVL_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -29279,14 +28421,6 @@ class Test_TC_LCFG_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29365,12 +28499,6 @@ class Test_TC_LCFG_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -29442,14 +28570,6 @@ class Test_TC_LUNIT_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29544,12 +28664,6 @@ class Test_TC_LUNIT_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -29638,14 +28752,6 @@ class Test_TC_LUNIT_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29711,12 +28817,6 @@ class Test_TC_LUNIT_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -29823,14 +28923,6 @@ class Test_TC_LTIME_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -29927,12 +29019,6 @@ class Test_TC_LTIME_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30022,14 +29108,6 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30117,12 +29195,6 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30195,14 +29267,6 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30300,12 +29364,6 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30398,14 +29456,6 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30505,12 +29555,6 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30602,14 +29646,6 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30713,12 +29749,6 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30810,14 +29840,6 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -30903,12 +29925,6 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -30987,14 +30003,6 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -31140,12 +30148,6 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -31269,14 +30271,6 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -31494,12 +30488,6 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -31669,14 +30657,6 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -31753,12 +30733,6 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -31830,14 +30804,6 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -31918,12 +30884,6 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32001,14 +30961,6 @@ class Test_TC_TGTNAV_8_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32026,12 +30978,6 @@ class Test_TC_TGTNAV_8_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -32070,14 +31016,6 @@ class Test_TC_APBSC_1_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32186,12 +31124,6 @@ class Test_TC_APBSC_1_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32282,14 +31214,6 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32405,12 +31329,6 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32516,14 +31434,6 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32596,12 +31506,6 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32690,14 +31594,6 @@ class Test_TC_ALOGIN_12_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32747,12 +31643,6 @@ class Test_TC_ALOGIN_12_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32853,14 +31743,6 @@ class Test_TC_LOWPOWER_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32885,12 +31767,6 @@ class Test_TC_LOWPOWER_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -32948,14 +31824,6 @@ class Test_TC_KEYPADINPUT_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -32993,12 +31861,6 @@ class Test_TC_KEYPADINPUT_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33068,14 +31930,6 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33169,12 +32023,6 @@ class Test_TC_KEYPADINPUT_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33321,14 +32169,6 @@ class Test_TC_APPLAUNCHER_3_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33357,12 +32197,6 @@ class Test_TC_APPLAUNCHER_3_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33418,14 +32252,6 @@ class Test_TC_APPLAUNCHER_3_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33456,12 +32282,6 @@ class Test_TC_APPLAUNCHER_3_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33522,14 +32342,6 @@ class Test_TC_APPLAUNCHER_3_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33567,12 +32379,6 @@ class Test_TC_APPLAUNCHER_3_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33660,14 +32466,6 @@ class Test_TC_APPLAUNCHER_3_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33701,12 +32499,6 @@ class Test_TC_APPLAUNCHER_3_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33784,14 +32576,6 @@ class Test_TC_APPLAUNCHER_3_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33824,12 +32608,6 @@ class Test_TC_APPLAUNCHER_3_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -33903,14 +32681,6 @@ class Test_TC_MEDIAINPUT_3_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -33939,12 +32709,6 @@ class Test_TC_MEDIAINPUT_3_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34001,14 +32765,6 @@ class Test_TC_MEDIAINPUT_3_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34048,12 +32804,6 @@ class Test_TC_MEDIAINPUT_3_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34127,14 +32877,6 @@ class Test_TC_MEDIAINPUT_3_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34169,12 +32911,6 @@ class Test_TC_MEDIAINPUT_3_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34251,14 +32987,6 @@ class Test_TC_MEDIAINPUT_3_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34294,12 +33022,6 @@ class Test_TC_MEDIAINPUT_3_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34376,14 +33098,6 @@ class Test_TC_WAKEONLAN_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34420,12 +33134,6 @@ class Test_TC_WAKEONLAN_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34499,14 +33207,6 @@ class Test_TC_CHANNEL_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34535,12 +33235,6 @@ class Test_TC_CHANNEL_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34602,14 +33296,6 @@ class Test_TC_CHANNEL_5_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34658,12 +33344,6 @@ class Test_TC_CHANNEL_5_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34754,14 +33434,6 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -34830,12 +33502,6 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -34931,14 +33597,6 @@ class Test_TC_MEDIAPLAYBACK_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -35036,12 +33694,6 @@ class Test_TC_MEDIAPLAYBACK_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -35190,14 +33842,6 @@ class Test_TC_MEDIAPLAYBACK_6_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -35337,12 +33981,6 @@ class Test_TC_MEDIAPLAYBACK_6_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -35558,14 +34196,6 @@ class Test_TC_MEDIAPLAYBACK_6_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -35646,12 +34276,6 @@ class Test_TC_MEDIAPLAYBACK_6_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -35799,14 +34423,6 @@ class Test_TC_MEDIAPLAYBACK_6_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -35968,12 +34584,6 @@ class Test_TC_MEDIAPLAYBACK_6_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36232,14 +34842,6 @@ class Test_TC_AUDIOOUTPUT_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36281,12 +34883,6 @@ class Test_TC_AUDIOOUTPUT_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36362,14 +34958,6 @@ class Test_TC_AUDIOOUTPUT_7_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36408,12 +34996,6 @@ class Test_TC_AUDIOOUTPUT_7_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36496,14 +35078,6 @@ class Test_TC_TGTNAV_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36560,12 +35134,6 @@ class Test_TC_TGTNAV_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36641,14 +35209,6 @@ class Test_TC_APBSC_9_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36740,12 +35300,6 @@ class Test_TC_APBSC_9_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36841,14 +35395,6 @@ class Test_TC_CONTENTLAUNCHER_10_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -36886,12 +35432,6 @@ class Test_TC_CONTENTLAUNCHER_10_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -36950,14 +35490,6 @@ class Test_TC_MOD_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37062,12 +35594,6 @@ class Test_TC_MOD_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37175,14 +35701,6 @@ class OTA_SuccessfulTransferSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37242,12 +35760,6 @@ class OTA_SuccessfulTransferSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37439,14 +35951,6 @@ class Test_TC_OCC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37526,12 +36030,6 @@ class Test_TC_OCC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37603,14 +36101,6 @@ class Test_TC_OCC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37752,12 +36242,6 @@ class Test_TC_OCC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37880,14 +36364,6 @@ class Test_TC_OCC_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -37929,12 +36405,6 @@ class Test_TC_OCC_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -37993,14 +36463,6 @@ class Test_TC_OO_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -38109,12 +36571,6 @@ class Test_TC_OO_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -38205,14 +36661,6 @@ class Test_TC_OO_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -38278,12 +36726,6 @@ class Test_TC_OO_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -38359,14 +36801,6 @@ class Test_TC_OO_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -38508,12 +36942,6 @@ class Test_TC_OO_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -38720,14 +37148,6 @@ class Test_TC_OO_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -38887,12 +37307,6 @@ class Test_TC_OO_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -39176,14 +37590,6 @@ class Test_TC_PS_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -39341,12 +37747,6 @@ class Test_TC_PS_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -39468,14 +37868,6 @@ class Test_TC_PS_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -39790,12 +38182,6 @@ class Test_TC_PS_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -40028,14 +38414,6 @@ class Test_TC_PRS_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -40178,12 +38556,6 @@ class Test_TC_PRS_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -40298,14 +38670,6 @@ class Test_TC_PRS_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -40417,12 +38781,6 @@ class Test_TC_PRS_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -40525,14 +38883,6 @@ class Test_TC_PRS_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -40578,12 +38928,6 @@ class Test_TC_PRS_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -40659,14 +39003,6 @@ class Test_TC_PCC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -40957,12 +39293,6 @@ class Test_TC_PCC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -41175,14 +39505,6 @@ class Test_TC_PCC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -41434,12 +39756,6 @@ class Test_TC_PCC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -41624,14 +39940,6 @@ class Test_TC_PCC_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -41697,12 +40005,6 @@ class Test_TC_PCC_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -41813,14 +40115,6 @@ class Test_TC_PCC_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -41919,12 +40213,6 @@ class Test_TC_PCC_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42083,14 +40371,6 @@ class Test_TC_PCC_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42184,12 +40464,6 @@ class Test_TC_PCC_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42338,14 +40612,6 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42423,12 +40689,6 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42500,14 +40760,6 @@ class Test_TC_PSCFG_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42537,12 +40789,6 @@ class Test_TC_PSCFG_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42595,14 +40841,6 @@ class Test_TC_RH_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42691,12 +40929,6 @@ class Test_TC_RH_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42774,14 +41006,6 @@ class Test_TC_RH_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42843,12 +41067,6 @@ class Test_TC_RH_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -42890,7 +41108,7 @@ class Test_TC_RH_2_1Suite : public TestCommand class Test_TC_SC_5_1Suite : public TestCommand { public: - Test_TC_SC_5_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_5_1", 17, credsIssuerConfig) + Test_TC_SC_5_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_5_1", 18, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -42911,6 +41129,8 @@ class Test_TC_SC_5_1Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; + chip::NodeId commissionerNodeId; + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } // @@ -42919,14 +41139,6 @@ class Test_TC_SC_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -42937,6 +41149,12 @@ class Test_TC_SC_5_1Suite : public TestCommand break; case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeId = value.nodeId; + } + shouldContinue = true; break; case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -42951,13 +41169,16 @@ class Test_TC_SC_5_1Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 6: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 7: + case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; @@ -42967,7 +41188,7 @@ class Test_TC_SC_5_1Suite : public TestCommand VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Test Group", 10))); } break; - case 8: + case 9: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; @@ -42977,7 +41198,7 @@ class Test_TC_SC_5_1Suite : public TestCommand VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("", 0))); } break; - case 9: + case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value; @@ -42998,7 +41219,7 @@ class Test_TC_SC_5_1Suite : public TestCommand CheckValue("groupKeySet.epochStartTime2.Value()", value.groupKeySet.epochStartTime2.Value(), 2220002ULL)); } break; - case 10: + case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -43025,7 +41246,7 @@ class Test_TC_SC_5_1Suite : public TestCommand } } break; - case 11: + case 12: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -43052,10 +41273,10 @@ class Test_TC_SC_5_1Suite : public TestCommand } } break; - case 12: + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 13: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -43068,10 +41289,10 @@ class Test_TC_SC_5_1Suite : public TestCommand } } break; - case 14: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 15: + case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -43084,7 +41305,7 @@ class Test_TC_SC_5_1Suite : public TestCommand } } break; - case 16: + case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; default: @@ -43100,12 +41321,6 @@ class Test_TC_SC_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -43116,7 +41331,13 @@ class Test_TC_SC_5_1Suite : public TestCommand return WaitForCommissionee(kIdentityAlpha, value); } case 1: { - LogStep(1, "TH adds ACL Operate privileges for Group 0x0103"); + LogStep(1, "Read the commissioner node ID"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 2: { + LogStep(2, "TH adds ACL Operate privileges for Group 0x0103"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43161,8 +41382,8 @@ class Test_TC_SC_5_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 2: { - LogStep(2, "TH sends KeySetWrite command with incorrect key"); + case 3: { + LogStep(3, "TH sends KeySetWrite command with incorrect key"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -43190,8 +41411,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 3: { - LogStep(3, "TH sends KeySetWrite command with TH key"); + case 4: { + LogStep(4, "TH sends KeySetWrite command with TH key"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -43219,8 +41440,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 4: { - LogStep(4, "TH binds GroupId to GroupKeySet"); + case 5: { + LogStep(5, "TH binds GroupId to GroupKeySet"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43238,8 +41459,8 @@ class Test_TC_SC_5_1Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 5: { - LogStep(5, "TH sends RemoveAllGroups command"); + case 6: { + LogStep(6, "TH sends RemoveAllGroups command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -43247,8 +41468,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 6: { - LogStep(6, "TH sends AddGroup command"); + case 7: { + LogStep(7, "TH sends AddGroup command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 259U; @@ -43257,8 +41478,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 7: { - LogStep(7, "TH sends ViewGroup command"); + case 8: { + LogStep(8, "TH sends ViewGroup command"); VerifyOrDo(!ShouldSkip("G.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Groups::Commands::ViewGroup::Type value; @@ -43268,8 +41489,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 8: { - LogStep(8, "TH sends ViewGroup command"); + case 9: { + LogStep(9, "TH sends ViewGroup command"); VerifyOrDo(!ShouldSkip("!(G.S.F00)"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Groups::Commands::ViewGroup::Type value; @@ -43279,8 +41500,8 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 9: { - LogStep(9, "TH sends KeySetRead"); + case 10: { + LogStep(10, "TH sends KeySetRead"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value; value.groupKeySetID = 419U; @@ -43289,20 +41510,20 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 10: { - LogStep(10, "TH reads GroupTable attribute"); + case 11: { + LogStep(11, "TH reads GroupTable attribute"); VerifyOrDo(!ShouldSkip("G.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 11: { - LogStep(11, "TH reads GroupTable attribute"); + case 12: { + LogStep(12, "TH reads GroupTable attribute"); VerifyOrDo(!ShouldSkip("!(G.S.F00)"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "TH removes the GroupKeySet"); + case 13: { + LogStep(13, "TH removes the GroupKeySet"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value; value.groupKeySetID = 419U; @@ -43311,13 +41532,13 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 13: { - LogStep(13, "TH verifies the corresponding GroupKeyMap entry has been removed"); + case 14: { + LogStep(14, "TH verifies the corresponding GroupKeyMap entry has been removed"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, true, chip::NullOptional); } - case 14: { - LogStep(14, "TH cleans up groups using RemoveAllGroups command"); + case 15: { + LogStep(15, "TH cleans up groups using RemoveAllGroups command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -43325,13 +41546,13 @@ class Test_TC_SC_5_1Suite : public TestCommand ); } - case 15: { - LogStep(15, "TH verifies the group has been removed in the GroupTable"); + case 16: { + LogStep(16, "TH verifies the group has been removed in the GroupTable"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 16: { - LogStep(16, "TH removes ACL Operate privileges for Group 0x0103"); + case 17: { + LogStep(17, "TH removes ACL Operate privileges for Group 0x0103"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43369,7 +41590,7 @@ class Test_TC_SC_5_1Suite : public TestCommand class Test_TC_SC_5_2Suite : public TestCommand { public: - Test_TC_SC_5_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_5_2", 11, credsIssuerConfig) + Test_TC_SC_5_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_5_2", 12, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -43390,6 +41611,8 @@ class Test_TC_SC_5_2Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; + chip::NodeId commissionerNodeId; + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } // @@ -43398,14 +41621,6 @@ class Test_TC_SC_5_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -43416,6 +41631,12 @@ class Test_TC_SC_5_2Suite : public TestCommand break; case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeId = value.nodeId; + } + shouldContinue = true; break; case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -43427,13 +41648,16 @@ class Test_TC_SC_5_2Suite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 5: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 6: + case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; @@ -43443,7 +41667,7 @@ class Test_TC_SC_5_2Suite : public TestCommand VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Test Group", 10))); } break; - case 7: + case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; @@ -43453,15 +41677,15 @@ class Test_TC_SC_5_2Suite : public TestCommand VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("", 0))); } break; - case 8: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 9: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 11: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; default: LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); } @@ -43475,12 +41699,6 @@ class Test_TC_SC_5_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -43491,7 +41709,13 @@ class Test_TC_SC_5_2Suite : public TestCommand return WaitForCommissionee(kIdentityAlpha, value); } case 1: { - LogStep(1, "TH adds ACL Operate privileges for Group 0x0103"); + LogStep(1, "Read the commissioner node ID"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 2: { + LogStep(2, "TH adds ACL Operate privileges for Group 0x0103"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43536,8 +41760,8 @@ class Test_TC_SC_5_2Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 2: { - LogStep(2, "TH sends KeySetWrite command with TH key"); + case 3: { + LogStep(3, "TH sends KeySetWrite command with TH key"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -43565,8 +41789,8 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 3: { - LogStep(3, "TH binds GroupId to GroupKeySet"); + case 4: { + LogStep(4, "TH binds GroupId to GroupKeySet"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43584,8 +41808,8 @@ class Test_TC_SC_5_2Suite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 4: { - LogStep(4, "TH sends RemoveAllGroups command"); + case 5: { + LogStep(5, "TH sends RemoveAllGroups command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -43593,8 +41817,8 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 5: { - LogStep(5, "TH sends AddGroup command"); + case 6: { + LogStep(6, "TH sends AddGroup command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 259U; @@ -43603,24 +41827,24 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 6: { - LogStep(6, "TH sends ViewGroup command using group messaging"); + case 7: { + LogStep(7, "TH sends ViewGroup command using group messaging"); VerifyOrDo(!ShouldSkip("G.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Groups::Commands::ViewGroup::Type value; value.groupID = 259U; return SendGroupCommand(kIdentityAlpha, 259, Groups::Id, Groups::Commands::ViewGroup::Id, value); } - case 7: { - LogStep(7, "TH sends ViewGroup command using group messaging"); + case 8: { + LogStep(8, "TH sends ViewGroup command using group messaging"); VerifyOrDo(!ShouldSkip("!(G.S.F00)"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::Groups::Commands::ViewGroup::Type value; value.groupID = 259U; return SendGroupCommand(kIdentityAlpha, 259, Groups::Id, Groups::Commands::ViewGroup::Id, value); } - case 8: { - LogStep(8, "TH removes the GroupKeySet"); + case 9: { + LogStep(9, "TH removes the GroupKeySet"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value; value.groupKeySetID = 419U; @@ -43629,8 +41853,8 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 9: { - LogStep(9, "TH cleans up groups using RemoveAllGroups command"); + case 10: { + LogStep(10, "TH cleans up groups using RemoveAllGroups command"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -43638,8 +41862,8 @@ class Test_TC_SC_5_2Suite : public TestCommand ); } - case 10: { - LogStep(10, "TH removes ACL Operate privileges for Group 0x0103"); + case 11: { + LogStep(11, "TH removes ACL Operate privileges for Group 0x0103"); ListFreer listFreer; chip::app::DataModel::List value; @@ -43706,14 +41930,6 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -43862,12 +42078,6 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -43980,14 +42190,6 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -44040,12 +42242,6 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44108,14 +42304,6 @@ class Test_TC_TMP_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -44204,12 +42392,6 @@ class Test_TC_TMP_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44287,14 +42469,6 @@ class Test_TC_TMP_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -44356,12 +42530,6 @@ class Test_TC_TMP_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44432,14 +42600,6 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -44667,12 +42827,6 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -44852,14 +43006,6 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -45526,12 +43672,6 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -46002,14 +44142,6 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -46807,12 +44939,6 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -48335,14 +46461,6 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -48422,12 +46540,6 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -48501,14 +46613,6 @@ class Test_TC_TSUIC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -48560,12 +46664,6 @@ class Test_TC_TSUIC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -48632,14 +46730,6 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -48660,6 +46750,7 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("temperatureDisplayMode", value, 0U)); } break; case 4: @@ -48843,12 +46934,6 @@ class Test_TC_TSUIC_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -49210,14 +47295,6 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -49438,12 +47515,6 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -49578,14 +47649,6 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -49867,12 +47930,6 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -50169,14 +48226,6 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -50368,12 +48417,6 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -50523,14 +48566,6 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -50716,12 +48751,6 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -50875,14 +48904,6 @@ class Test_TC_DGTHREAD_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -50915,12 +48936,6 @@ class Test_TC_DGTHREAD_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -50983,14 +48998,6 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51068,12 +49075,6 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51145,14 +49146,6 @@ class Test_TC_ULABEL_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51182,12 +49175,6 @@ class Test_TC_ULABEL_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51240,14 +49227,6 @@ class Test_TC_ULABEL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51301,12 +49280,6 @@ class Test_TC_ULABEL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51387,14 +49360,6 @@ class Test_TC_ULABEL_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51422,12 +49387,6 @@ class Test_TC_ULABEL_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51514,14 +49473,6 @@ class Test_TC_ULABEL_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51582,12 +49533,6 @@ class Test_TC_ULABEL_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51687,14 +49632,6 @@ class Test_TC_DGWIFI_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -51835,12 +49772,6 @@ class Test_TC_DGWIFI_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -51950,14 +49881,6 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -52101,12 +50024,6 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -52231,14 +50148,6 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -52323,12 +50232,6 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -52427,14 +50330,6 @@ class Test_TC_WNCV_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -52638,12 +50533,6 @@ class Test_TC_WNCV_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -52801,14 +50690,6 @@ class Test_TC_WNCV_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53053,12 +50934,6 @@ class Test_TC_WNCV_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53246,14 +51121,6 @@ class Test_TC_WNCV_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53279,12 +51146,6 @@ class Test_TC_WNCV_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53347,14 +51208,6 @@ class Test_TC_WNCV_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53471,12 +51324,6 @@ class Test_TC_WNCV_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53659,14 +51506,6 @@ class Test_TC_WNCV_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53692,12 +51531,6 @@ class Test_TC_WNCV_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53754,14 +51587,6 @@ class Test_TC_WNCV_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -53793,12 +51618,6 @@ class Test_TC_WNCV_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -53851,14 +51670,6 @@ class Test_TC_WNCV_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -54097,12 +51908,6 @@ class Test_TC_WNCV_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -54335,14 +52140,6 @@ class Test_TC_WNCV_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -54581,12 +52378,6 @@ class Test_TC_WNCV_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -54822,14 +52613,6 @@ class Test_TC_WNCV_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -54966,12 +52749,6 @@ class Test_TC_WNCV_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -55141,14 +52918,6 @@ class Test_TC_WNCV_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -55228,12 +52997,6 @@ class Test_TC_WNCV_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -55348,14 +53111,6 @@ class Test_TC_WNCV_3_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -55435,12 +53190,6 @@ class Test_TC_WNCV_3_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -55553,14 +53302,6 @@ class Test_TC_WNCV_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -55689,12 +53430,6 @@ class Test_TC_WNCV_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -55864,14 +53599,6 @@ class Test_TC_WNCV_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56000,12 +53727,6 @@ class Test_TC_WNCV_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56175,14 +53896,6 @@ class Test_TC_WNCV_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56235,12 +53948,6 @@ class Test_TC_WNCV_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56340,14 +54047,6 @@ class Test_TC_WNCV_4_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56400,12 +54099,6 @@ class Test_TC_WNCV_4_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56506,14 +54199,6 @@ class Test_TC_WNCV_4_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56630,12 +54315,6 @@ class Test_TC_WNCV_4_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56811,14 +54490,6 @@ class TV_TargetNavigatorClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -56878,12 +54549,6 @@ class TV_TargetNavigatorClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -56953,14 +54618,6 @@ class TV_AudioOutputClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57045,12 +54702,6 @@ class TV_AudioOutputClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57134,14 +54785,6 @@ class TV_ApplicationLauncherClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57221,12 +54864,6 @@ class TV_ApplicationLauncherClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57328,14 +54965,6 @@ class TV_KeypadInputClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57365,12 +54994,6 @@ class TV_KeypadInputClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57428,14 +55051,6 @@ class TV_AccountLoginClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57471,12 +55086,6 @@ class TV_AccountLoginClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57554,14 +55163,6 @@ class TV_WakeOnLanClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57591,12 +55192,6 @@ class TV_WakeOnLanClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57649,14 +55244,6 @@ class TV_ApplicationBasicClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -57751,12 +55338,6 @@ class TV_ApplicationBasicClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -57844,14 +55425,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58083,12 +55656,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -58287,14 +55854,6 @@ class TV_ChannelClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58427,12 +55986,6 @@ class TV_ChannelClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -58525,14 +56078,6 @@ class TV_LowPowerClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58557,12 +56102,6 @@ class TV_LowPowerClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -58619,14 +56158,6 @@ class TV_ContentLauncherClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58691,12 +56222,6 @@ class TV_ContentLauncherClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -58884,14 +56409,6 @@ class TV_MediaInputClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -58979,12 +56496,6 @@ class TV_MediaInputClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -59085,14 +56596,6 @@ class TestCASERecoverySuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -59145,12 +56648,6 @@ class TestCASERecoverySuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -59256,14 +56753,6 @@ class TestClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -62577,12 +60066,6 @@ class TestClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -66608,14 +64091,6 @@ class TestClusterComplexTypesSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -66741,12 +64216,6 @@ class TestClusterComplexTypesSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -66955,14 +64424,6 @@ class TestConstraintsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -67186,12 +64647,6 @@ class TestConstraintsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -67447,14 +64902,6 @@ class TestDelayCommandsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -67480,12 +64927,6 @@ class TestDelayCommandsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -67541,14 +64982,6 @@ class TestEventsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -67736,12 +65169,6 @@ class TestEventsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -67847,6 +65274,7 @@ class TestDiscoverySuite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); AddArgument("discriminator", 0, UINT16_MAX, &mDiscriminator); + AddArgument("shortDiscriminator", 0, UINT16_MAX, &mShortDiscriminator); AddArgument("vendorId", 0, UINT16_MAX, &mVendorId); AddArgument("productId", 0, UINT16_MAX, &mProductId); AddArgument("deviceType", 0, UINT16_MAX, &mDeviceType); @@ -67871,6 +65299,7 @@ class TestDiscoverySuite : public TestCommand chip::Optional mNodeId; chip::Optional mEndpoint; chip::Optional mDiscriminator; + chip::Optional mShortDiscriminator; chip::Optional mVendorId; chip::Optional mProductId; chip::Optional mDeviceType; @@ -67887,14 +65316,6 @@ class TestDiscoverySuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -68127,12 +65548,6 @@ class TestDiscoverySuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -68206,7 +65621,7 @@ class TestDiscoverySuite : public TestCommand LogStep(8, "Check Short Discriminator (_S)"); ListFreer listFreer; chip::app::Clusters::DiscoveryCommands::Commands::FindCommissionableByShortDiscriminator::Type value; - value.value = mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840ULL; + value.value = mShortDiscriminator.HasValue() ? mShortDiscriminator.Value() : 15ULL; return FindCommissionableByShortDiscriminator(kIdentityAlpha, value); } case 9: { @@ -68372,14 +65787,6 @@ class TestLogCommandsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -68409,12 +65816,6 @@ class TestLogCommandsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -68525,14 +65926,6 @@ class TestSaveAsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -69270,12 +66663,6 @@ class TestSaveAsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70018,14 +67405,6 @@ class TestConfigVariablesSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -70065,12 +67444,6 @@ class TestConfigVariablesSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70140,14 +67513,6 @@ class TestDescriptorClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -70279,12 +67644,6 @@ class TestDescriptorClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70352,14 +67711,6 @@ class TestBasicInformationSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -70532,12 +67883,6 @@ class TestBasicInformationSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70699,14 +68044,6 @@ class TestFabricRemovalWhileSubscribedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -70775,12 +68112,6 @@ class TestFabricRemovalWhileSubscribedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -70884,14 +68215,6 @@ class TestGeneralCommissioningSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -71112,12 +68435,6 @@ class TestGeneralCommissioningSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -71383,14 +68700,6 @@ class TestIdentifyClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -71415,12 +68724,6 @@ class TestIdentifyClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -71480,14 +68783,6 @@ class TestOperationalCredentialsClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -71587,12 +68882,6 @@ class TestOperationalCredentialsClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -71688,14 +68977,6 @@ class TestModeSelectClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -71928,12 +69209,6 @@ class TestModeSelectClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -72198,14 +69473,6 @@ class TestSelfFabricRemovalSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -72253,12 +69520,6 @@ class TestSelfFabricRemovalSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -72327,14 +69588,6 @@ class TestSystemCommandsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -72440,12 +69693,6 @@ class TestSystemCommandsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -72667,14 +69914,6 @@ class TestBindingSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -72794,12 +70033,6 @@ class TestBindingSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -72957,14 +70190,6 @@ class TestUserLabelClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73066,12 +70291,6 @@ class TestUserLabelClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -73210,14 +70429,6 @@ class TestUserLabelClusterConstraintsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73245,12 +70456,6 @@ class TestUserLabelClusterConstraintsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -73333,14 +70538,6 @@ class TestArmFailSafeSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73412,12 +70609,6 @@ class TestArmFailSafeSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -73540,14 +70731,6 @@ class TestFanControlSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73729,12 +70912,6 @@ class TestFanControlSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -73928,14 +71105,6 @@ class TestAccessControlConstraintsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -73987,12 +71156,6 @@ class TestAccessControlConstraintsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -74492,14 +71655,6 @@ class TestLevelControlWithOnOffDependencySuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -74703,12 +71858,6 @@ class TestLevelControlWithOnOffDependencySuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -74980,14 +72129,6 @@ class TestCommissioningWindowSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -75207,12 +72348,6 @@ class TestCommissioningWindowSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -75399,7 +72534,7 @@ class TestCommissionerNodeIdSuite : public TestCommand { public: TestCommissionerNodeIdSuite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("TestCommissionerNodeId", 19, credsIssuerConfig) + TestCommand("TestCommissionerNodeId", 22, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); @@ -75423,8 +72558,11 @@ class TestCommissionerNodeIdSuite : public TestCommand chip::Optional mTimeout; uint8_t alphaIndex; + chip::NodeId commissionerNodeIdAlpha; uint8_t betaIndex; + chip::NodeId commissionerNodeIdBeta; uint8_t gammaIndex; + chip::NodeId commissionerNodeIdGamma; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -75434,14 +72572,6 @@ class TestCommissionerNodeIdSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -75481,6 +72611,15 @@ class TestCommissionerNodeIdSuite : public TestCommand } break; case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdAlpha = value.nodeId; + } + shouldContinue = true; + break; + case 9: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -75488,7 +72627,16 @@ class TestCommissionerNodeIdSuite : public TestCommand betaIndex = value; } break; - case 9: + case 10: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdBeta = value.nodeId; + } + shouldContinue = true; + break; + case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -75496,7 +72644,16 @@ class TestCommissionerNodeIdSuite : public TestCommand gammaIndex = value; } break; - case 10: + case 12: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeIdResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + commissionerNodeIdGamma = value.nodeId; + } + shouldContinue = true; + break; + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75513,7 +72670,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdAlpha)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75523,7 +72680,7 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 11: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75540,7 +72697,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdBeta)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75550,7 +72707,7 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 12: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75567,7 +72724,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdGamma)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75577,13 +72734,13 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 13: + case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 14: + case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 15: + case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75600,7 +72757,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdBeta)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75610,7 +72767,7 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 16: + case 19: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -75627,7 +72784,7 @@ class TestCommissionerNodeIdSuite : public TestCommand auto iter_3 = iter_0.GetValue().subjects.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes( "acl[0].subjects.Value()", iter_3, 0)); - VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeId)); + VerifyOrReturn(CheckValue("acl[0].subjects.Value()[0]", iter_3.GetValue(), commissionerNodeIdGamma)); VerifyOrReturn(CheckNoMoreListItems("acl[0].subjects.Value()", iter_3, 1)); } @@ -75637,14 +72794,14 @@ class TestCommissionerNodeIdSuite : public TestCommand } } break; - case 17: + case 20: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); } break; - case 18: + case 21: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; @@ -75664,12 +72821,6 @@ class TestCommissionerNodeIdSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -75737,32 +72888,50 @@ class TestCommissionerNodeIdSuite : public TestCommand OperationalCredentials::Attributes::CurrentFabricIndex::Id, true, chip::NullOptional); } case 8: { - LogStep(8, "Read the fabric ID from the beta fabric"); + LogStep(8, "Read the commissioner node ID from the alpha fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityAlpha, value); + } + case 9: { + LogStep(9, "Read the fabric ID from the beta fabric"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::CurrentFabricIndex::Id, true, chip::NullOptional); } - case 9: { - LogStep(9, "Read the fabric ID from the gamma fabric"); + case 10: { + LogStep(10, "Read the commissioner node ID from the beta fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityBeta, value); + } + case 11: { + LogStep(11, "Read the fabric ID from the gamma fabric"); return ReadAttribute(kIdentityGamma, GetEndpoint(0), OperationalCredentials::Id, OperationalCredentials::Attributes::CurrentFabricIndex::Id, true, chip::NullOptional); } - case 10: { - LogStep(10, "Read the ACL from alpha and check commissioner node id"); + case 12: { + LogStep(12, "Read the commissioner node ID from the gamma fabric"); + ListFreer listFreer; + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId(kIdentityGamma, value); + } + case 13: { + LogStep(13, "Read the ACL from alpha and check commissioner node id"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 11: { - LogStep(11, "Read the ACL from beta and check commissioner node id"); + case 14: { + LogStep(14, "Read the ACL from beta and check commissioner node id"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "Read the ACL from gamma and check commissioner node id"); + case 15: { + LogStep(15, "Read the ACL from gamma and check commissioner node id"); return ReadAttribute(kIdentityGamma, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 13: { - LogStep(13, "Write the ACL using the commissioner node id value"); + case 16: { + LogStep(16, "Write the ACL using the commissioner node id value"); ListFreer listFreer; chip::app::DataModel::List value; @@ -75780,7 +72949,7 @@ class TestCommissionerNodeIdSuite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdBeta; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNull(); @@ -75792,8 +72961,8 @@ class TestCommissionerNodeIdSuite : public TestCommand return WriteAttribute(kIdentityBeta, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 14: { - LogStep(14, "Write the ACL using the commissioner node id value"); + case 17: { + LogStep(17, "Write the ACL using the commissioner node id value"); ListFreer listFreer; chip::app::DataModel::List value; @@ -75811,7 +72980,7 @@ class TestCommissionerNodeIdSuite : public TestCommand { auto * listHolder_3 = new ListHolder(1); listFreer.add(listHolder_3); - listHolder_3->mList[0] = commissionerNodeId; + listHolder_3->mList[0] = commissionerNodeIdGamma; listHolder_0->mList[0].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[0].targets.SetNull(); @@ -75823,18 +72992,18 @@ class TestCommissionerNodeIdSuite : public TestCommand return WriteAttribute(kIdentityGamma, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, value, chip::NullOptional, chip::NullOptional); } - case 15: { - LogStep(15, "Read the ACL from beta and check commissioner node id"); + case 18: { + LogStep(18, "Read the ACL from beta and check commissioner node id"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 16: { - LogStep(16, "Read the ACL from gamma and check commissioner node id"); + case 19: { + LogStep(19, "Read the ACL from gamma and check commissioner node id"); return ReadAttribute(kIdentityGamma, GetEndpoint(0), AccessControl::Id, AccessControl::Attributes::Acl::Id, true, chip::NullOptional); } - case 17: { - LogStep(17, "Remove beta fabric"); + case 20: { + LogStep(20, "Remove beta fabric"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::RemoveFabric::Type value; value.fabricIndex = betaIndex; @@ -75843,8 +73012,8 @@ class TestCommissionerNodeIdSuite : public TestCommand ); } - case 18: { - LogStep(18, "Remove gamma fabric"); + case 21: { + LogStep(21, "Remove gamma fabric"); ListFreer listFreer; chip::app::Clusters::OperationalCredentials::Commands::RemoveFabric::Type value; value.fabricIndex = gammaIndex; @@ -75891,14 +73060,6 @@ class TestClientMonitoringClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -75967,12 +73128,6 @@ class TestClientMonitoringClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -76113,14 +73268,6 @@ class TestMultiAdminSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -76231,12 +73378,6 @@ class TestMultiAdminSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -76417,14 +73558,6 @@ class Test_TC_DGSW_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -76555,12 +73688,6 @@ class Test_TC_DGSW_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -76671,14 +73798,6 @@ class TestSubscribe_OnOffSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -76735,12 +73854,6 @@ class TestSubscribe_OnOffSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -76829,14 +73942,6 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -76965,12 +74070,6 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -77132,14 +74231,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -78636,12 +75727,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -80415,14 +77500,6 @@ class DL_LockUnlockSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -80645,12 +77722,6 @@ class DL_LockUnlockSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -81029,14 +78100,6 @@ class DL_SchedulesSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -82098,12 +79161,6 @@ class DL_SchedulesSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -83642,14 +80699,6 @@ class Test_TC_DRLK_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -84079,12 +81128,6 @@ class Test_TC_DRLK_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -84382,14 +81425,6 @@ class Test_TC_DRLK_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -84555,12 +81590,6 @@ class Test_TC_DRLK_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -84896,14 +81925,6 @@ class Test_TC_DRLK_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -85098,12 +82119,6 @@ class Test_TC_DRLK_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -85530,14 +82545,6 @@ class Test_TC_DRLK_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -85640,12 +82647,6 @@ class Test_TC_DRLK_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -85828,14 +82829,6 @@ class Test_TC_DRLK_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -85966,12 +82959,6 @@ class Test_TC_DRLK_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -86158,14 +83145,6 @@ class Test_TC_DRLK_2_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -86255,12 +83234,6 @@ class Test_TC_DRLK_2_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -86413,14 +83386,6 @@ class Test_TC_DRLK_2_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -86585,12 +83550,6 @@ class Test_TC_DRLK_2_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -86856,14 +83815,6 @@ class Test_TC_DRLK_2_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -87047,12 +83998,6 @@ class Test_TC_DRLK_2_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -87412,14 +84357,6 @@ class TestGroupMessagingSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -87643,12 +84580,6 @@ class TestGroupMessagingSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -88199,14 +85130,6 @@ class TestGroupsClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -88467,12 +85390,6 @@ class TestGroupsClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -88845,14 +85762,6 @@ class TestGroupKeyManagementClusterSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -89218,12 +86127,6 @@ class TestGroupKeyManagementClusterSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -89705,14 +86608,6 @@ class Test_TC_G_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -89801,12 +86696,6 @@ class Test_TC_G_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -89888,14 +86777,6 @@ class Test_TC_G_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -89954,12 +86835,6 @@ class Test_TC_G_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -90039,14 +86914,6 @@ class Test_TC_DD_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90064,12 +86931,6 @@ class Test_TC_DD_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90108,14 +86969,6 @@ class Test_TC_DD_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90133,12 +86986,6 @@ class Test_TC_DD_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90177,14 +87024,6 @@ class Test_TC_DD_1_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90202,12 +87041,6 @@ class Test_TC_DD_1_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90246,14 +87079,6 @@ class Test_TC_DD_1_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90271,12 +87096,6 @@ class Test_TC_DD_1_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90315,14 +87134,6 @@ class Test_TC_DD_1_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90340,12 +87151,6 @@ class Test_TC_DD_1_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90384,14 +87189,6 @@ class Test_TC_DD_1_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90409,12 +87206,6 @@ class Test_TC_DD_1_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90453,14 +87244,6 @@ class Test_TC_DD_1_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90478,12 +87261,6 @@ class Test_TC_DD_1_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90522,14 +87299,6 @@ class Test_TC_DD_1_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90547,12 +87316,6 @@ class Test_TC_DD_1_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90591,14 +87354,6 @@ class Test_TC_DD_1_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90616,12 +87371,6 @@ class Test_TC_DD_1_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90660,14 +87409,6 @@ class Test_TC_DD_1_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90685,12 +87426,6 @@ class Test_TC_DD_1_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90729,14 +87464,6 @@ class Test_TC_DD_1_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90754,12 +87481,6 @@ class Test_TC_DD_1_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90798,14 +87519,6 @@ class Test_TC_DD_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90823,12 +87536,6 @@ class Test_TC_DD_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90867,14 +87574,6 @@ class Test_TC_DD_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90892,12 +87591,6 @@ class Test_TC_DD_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -90936,14 +87629,6 @@ class Test_TC_DD_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -90961,12 +87646,6 @@ class Test_TC_DD_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91005,14 +87684,6 @@ class Test_TC_DD_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91030,12 +87701,6 @@ class Test_TC_DD_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91074,14 +87739,6 @@ class Test_TC_DD_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91099,12 +87756,6 @@ class Test_TC_DD_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91143,14 +87794,6 @@ class Test_TC_DD_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91168,12 +87811,6 @@ class Test_TC_DD_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91212,14 +87849,6 @@ class Test_TC_DD_3_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91237,12 +87866,6 @@ class Test_TC_DD_3_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91281,14 +87904,6 @@ class Test_TC_DD_3_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91306,12 +87921,6 @@ class Test_TC_DD_3_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91350,14 +87959,6 @@ class Test_TC_DD_3_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91375,12 +87976,6 @@ class Test_TC_DD_3_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91419,14 +88014,6 @@ class Test_TC_DD_3_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91444,12 +88031,6 @@ class Test_TC_DD_3_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91488,14 +88069,6 @@ class Test_TC_DD_3_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91513,12 +88086,6 @@ class Test_TC_DD_3_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91557,14 +88124,6 @@ class Test_TC_DD_3_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91582,12 +88141,6 @@ class Test_TC_DD_3_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91626,14 +88179,6 @@ class Test_TC_DD_3_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91651,12 +88196,6 @@ class Test_TC_DD_3_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91695,14 +88234,6 @@ class Test_TC_DD_3_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91720,12 +88251,6 @@ class Test_TC_DD_3_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91764,14 +88289,6 @@ class Test_TC_DD_3_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91789,12 +88306,6 @@ class Test_TC_DD_3_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91833,14 +88344,6 @@ class Test_TC_DD_3_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91858,12 +88361,6 @@ class Test_TC_DD_3_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91902,14 +88399,6 @@ class Test_TC_DD_3_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91927,12 +88416,6 @@ class Test_TC_DD_3_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -91971,14 +88454,6 @@ class Test_TC_DD_3_16Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -91996,12 +88471,6 @@ class Test_TC_DD_3_16Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92040,14 +88509,6 @@ class Test_TC_DD_3_17Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92065,12 +88526,6 @@ class Test_TC_DD_3_17Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92109,14 +88564,6 @@ class Test_TC_DD_3_18Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92134,12 +88581,6 @@ class Test_TC_DD_3_18Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92178,14 +88619,6 @@ class Test_TC_DD_3_19Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92203,12 +88636,6 @@ class Test_TC_DD_3_19Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92247,14 +88674,6 @@ class Test_TC_DD_3_20Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92272,12 +88691,6 @@ class Test_TC_DD_3_20Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92316,14 +88729,6 @@ class Test_TC_DD_3_21Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92341,12 +88746,6 @@ class Test_TC_DD_3_21Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92386,14 +88785,6 @@ class TestGroupDemoCommandSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92485,12 +88876,6 @@ class TestGroupDemoCommandSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -92668,14 +89053,6 @@ class TestGroupDemoConfigSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92715,12 +89092,6 @@ class TestGroupDemoConfigSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -92870,14 +89241,6 @@ class Test_TC_G_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92895,12 +89258,6 @@ class Test_TC_G_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -92939,14 +89296,6 @@ class Test_TC_G_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -92964,12 +89313,6 @@ class Test_TC_G_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93008,14 +89351,6 @@ class Test_TC_G_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93033,12 +89368,6 @@ class Test_TC_G_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93077,14 +89406,6 @@ class Test_TC_BDX_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93102,12 +89423,6 @@ class Test_TC_BDX_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93146,14 +89461,6 @@ class Test_TC_BDX_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93171,12 +89478,6 @@ class Test_TC_BDX_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93215,14 +89516,6 @@ class Test_TC_BDX_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93240,12 +89533,6 @@ class Test_TC_BDX_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93284,14 +89571,6 @@ class Test_TC_BDX_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93309,12 +89588,6 @@ class Test_TC_BDX_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93353,14 +89626,6 @@ class Test_TC_BDX_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93378,12 +89643,6 @@ class Test_TC_BDX_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93422,14 +89681,6 @@ class Test_TC_BDX_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93447,12 +89698,6 @@ class Test_TC_BDX_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93491,14 +89736,6 @@ class Test_TC_BDX_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93516,12 +89753,6 @@ class Test_TC_BDX_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93560,14 +89791,6 @@ class Test_TC_BDX_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93585,12 +89808,6 @@ class Test_TC_BDX_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93629,14 +89846,6 @@ class Test_TC_BDX_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93654,12 +89863,6 @@ class Test_TC_BDX_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93698,14 +89901,6 @@ class Test_TC_BDX_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93723,12 +89918,6 @@ class Test_TC_BDX_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93767,14 +89956,6 @@ class Test_TC_BDX_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93792,12 +89973,6 @@ class Test_TC_BDX_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93836,14 +90011,6 @@ class Test_TC_BR_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93861,12 +90028,6 @@ class Test_TC_BR_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93905,14 +90066,6 @@ class Test_TC_BR_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93930,12 +90083,6 @@ class Test_TC_BR_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -93974,14 +90121,6 @@ class Test_TC_BR_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -93999,12 +90138,6 @@ class Test_TC_BR_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94043,14 +90176,6 @@ class Test_TC_BR_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94068,12 +90193,6 @@ class Test_TC_BR_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94112,14 +90231,6 @@ class Test_TC_DA_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94137,12 +90248,6 @@ class Test_TC_DA_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94181,14 +90286,6 @@ class Test_TC_DA_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94206,12 +90303,6 @@ class Test_TC_DA_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94250,14 +90341,6 @@ class Test_TC_DA_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94275,12 +90358,6 @@ class Test_TC_DA_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94319,14 +90396,6 @@ class Test_TC_DA_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94344,12 +90413,6 @@ class Test_TC_DA_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94388,14 +90451,6 @@ class Test_TC_DA_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94413,12 +90468,6 @@ class Test_TC_DA_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94457,14 +90506,6 @@ class Test_TC_DA_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94482,12 +90523,6 @@ class Test_TC_DA_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94526,14 +90561,6 @@ class Test_TC_BINFO_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94551,12 +90578,6 @@ class Test_TC_BINFO_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94595,14 +90616,6 @@ class Test_TC_BINFO_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94620,12 +90633,6 @@ class Test_TC_BINFO_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94665,14 +90672,6 @@ class Test_TC_OPCREDS_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94690,12 +90689,6 @@ class Test_TC_OPCREDS_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94735,14 +90728,6 @@ class Test_TC_OPCREDS_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94760,12 +90745,6 @@ class Test_TC_OPCREDS_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94805,14 +90784,6 @@ class Test_TC_OPCREDS_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94830,12 +90801,6 @@ class Test_TC_OPCREDS_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94875,14 +90840,6 @@ class Test_TC_OPCREDS_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94900,12 +90857,6 @@ class Test_TC_OPCREDS_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -94944,14 +90895,6 @@ class Test_TC_CNET_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -94969,12 +90912,6 @@ class Test_TC_CNET_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95013,14 +90950,6 @@ class Test_TC_CNET_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95038,12 +90967,6 @@ class Test_TC_CNET_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95082,14 +91005,6 @@ class Test_TC_CNET_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95107,12 +91022,6 @@ class Test_TC_CNET_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95151,14 +91060,6 @@ class Test_TC_CNET_4_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95176,12 +91077,6 @@ class Test_TC_CNET_4_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95220,14 +91115,6 @@ class Test_TC_CNET_4_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95245,12 +91132,6 @@ class Test_TC_CNET_4_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95289,14 +91170,6 @@ class Test_TC_CNET_4_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95314,12 +91187,6 @@ class Test_TC_CNET_4_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95358,14 +91225,6 @@ class Test_TC_CNET_4_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95383,12 +91242,6 @@ class Test_TC_CNET_4_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95427,14 +91280,6 @@ class Test_TC_CNET_4_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95452,12 +91297,6 @@ class Test_TC_CNET_4_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95496,14 +91335,6 @@ class Test_TC_CNET_4_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95521,12 +91352,6 @@ class Test_TC_CNET_4_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95565,14 +91390,6 @@ class Test_TC_CNET_4_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95590,12 +91407,6 @@ class Test_TC_CNET_4_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95634,14 +91445,6 @@ class Test_TC_CNET_4_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95659,12 +91462,6 @@ class Test_TC_CNET_4_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95703,14 +91500,6 @@ class Test_TC_CNET_4_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95728,12 +91517,6 @@ class Test_TC_CNET_4_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95772,14 +91555,6 @@ class Test_TC_CNET_4_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95797,12 +91572,6 @@ class Test_TC_CNET_4_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95841,14 +91610,6 @@ class Test_TC_CNET_4_16Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95866,12 +91627,6 @@ class Test_TC_CNET_4_16Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95910,14 +91665,6 @@ class Test_TC_CNET_4_17Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -95935,12 +91682,6 @@ class Test_TC_CNET_4_17Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -95979,14 +91720,6 @@ class Test_TC_CNET_4_18Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96004,12 +91737,6 @@ class Test_TC_CNET_4_18Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96048,14 +91775,6 @@ class Test_TC_CNET_4_19Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96073,12 +91792,6 @@ class Test_TC_CNET_4_19Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96117,14 +91830,6 @@ class Test_TC_CNET_4_20Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96142,12 +91847,6 @@ class Test_TC_CNET_4_20Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96186,14 +91885,6 @@ class Test_TC_CNET_4_21Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96211,12 +91902,6 @@ class Test_TC_CNET_4_21Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96255,14 +91940,6 @@ class Test_TC_CNET_4_22Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96280,12 +91957,6 @@ class Test_TC_CNET_4_22Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96324,14 +91995,6 @@ class Test_TC_DLOG_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96349,12 +92012,6 @@ class Test_TC_DLOG_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96393,14 +92050,6 @@ class Test_TC_DLOG_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96418,12 +92067,6 @@ class Test_TC_DLOG_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96462,14 +92105,6 @@ class Test_TC_DLOG_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96487,12 +92122,6 @@ class Test_TC_DLOG_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96531,14 +92160,6 @@ class Test_TC_DESC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96556,12 +92177,6 @@ class Test_TC_DESC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96600,14 +92215,6 @@ class Test_TC_DGETH_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96625,12 +92232,6 @@ class Test_TC_DGETH_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96669,14 +92270,6 @@ class Test_TC_CGEN_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96694,12 +92287,6 @@ class Test_TC_CGEN_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96738,14 +92325,6 @@ class Test_TC_CGEN_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96763,12 +92342,6 @@ class Test_TC_CGEN_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96807,14 +92380,6 @@ class Test_TC_DGGEN_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96832,12 +92397,6 @@ class Test_TC_DGGEN_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96876,14 +92435,6 @@ class Test_TC_DGGEN_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96901,12 +92452,6 @@ class Test_TC_DGGEN_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -96945,14 +92490,6 @@ class Test_TC_DGGEN_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -96970,12 +92507,6 @@ class Test_TC_DGGEN_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97014,14 +92545,6 @@ class Test_TC_I_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97039,12 +92562,6 @@ class Test_TC_I_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97083,14 +92600,6 @@ class Test_TC_ILL_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97108,12 +92617,6 @@ class Test_TC_ILL_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97152,14 +92655,6 @@ class Test_TC_IDM_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97177,12 +92672,6 @@ class Test_TC_IDM_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97221,14 +92710,6 @@ class Test_TC_IDM_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97246,12 +92727,6 @@ class Test_TC_IDM_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97290,14 +92765,6 @@ class Test_TC_IDM_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97315,12 +92782,6 @@ class Test_TC_IDM_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97359,14 +92820,6 @@ class Test_TC_IDM_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97384,12 +92837,6 @@ class Test_TC_IDM_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97428,14 +92875,6 @@ class Test_TC_IDM_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97453,12 +92892,6 @@ class Test_TC_IDM_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97497,14 +92930,6 @@ class Test_TC_IDM_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97522,12 +92947,6 @@ class Test_TC_IDM_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97566,14 +92985,6 @@ class Test_TC_IDM_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97591,12 +93002,6 @@ class Test_TC_IDM_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97635,14 +93040,6 @@ class Test_TC_IDM_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97660,12 +93057,6 @@ class Test_TC_IDM_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97704,14 +93095,6 @@ class Test_TC_IDM_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97729,12 +93112,6 @@ class Test_TC_IDM_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97773,14 +93150,6 @@ class Test_TC_IDM_5_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97798,12 +93167,6 @@ class Test_TC_IDM_5_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97842,14 +93205,6 @@ class Test_TC_IDM_5_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97867,12 +93222,6 @@ class Test_TC_IDM_5_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97911,14 +93260,6 @@ class Test_TC_IDM_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -97936,12 +93277,6 @@ class Test_TC_IDM_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -97980,14 +93315,6 @@ class Test_TC_IDM_6_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98005,12 +93332,6 @@ class Test_TC_IDM_6_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98049,14 +93370,6 @@ class Test_TC_IDM_6_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98074,12 +93387,6 @@ class Test_TC_IDM_6_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98118,14 +93425,6 @@ class Test_TC_IDM_6_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98143,12 +93442,6 @@ class Test_TC_IDM_6_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98187,14 +93480,6 @@ class Test_TC_IDM_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98212,12 +93497,6 @@ class Test_TC_IDM_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98256,14 +93535,6 @@ class Test_TC_IDM_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98281,12 +93552,6 @@ class Test_TC_IDM_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98326,14 +93591,6 @@ class Test_TC_LOWPOWER_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98351,12 +93608,6 @@ class Test_TC_LOWPOWER_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98396,14 +93647,6 @@ class Test_TC_APPLAUNCHER_3_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98421,12 +93664,6 @@ class Test_TC_APPLAUNCHER_3_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98466,14 +93703,6 @@ class Test_TC_APPLAUNCHER_3_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98491,12 +93720,6 @@ class Test_TC_APPLAUNCHER_3_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98536,14 +93759,6 @@ class Test_TC_APPLAUNCHER_3_9_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98561,12 +93776,6 @@ class Test_TC_APPLAUNCHER_3_9_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98606,14 +93815,6 @@ class Test_TC_MEDIAINPUT_3_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98631,12 +93832,6 @@ class Test_TC_MEDIAINPUT_3_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98676,14 +93871,6 @@ class Test_TC_MEDIAINPUT_3_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98701,12 +93888,6 @@ class Test_TC_MEDIAINPUT_3_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98746,14 +93927,6 @@ class Test_TC_MEDIAINPUT_3_16Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98771,12 +93944,6 @@ class Test_TC_MEDIAINPUT_3_16Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98816,14 +93983,6 @@ class Test_TC_MEDIAINPUT_3_17Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98841,12 +94000,6 @@ class Test_TC_MEDIAINPUT_3_17Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98886,14 +94039,6 @@ class Test_TC_CHANNEL_5_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98911,12 +94056,6 @@ class Test_TC_CHANNEL_5_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -98956,14 +94095,6 @@ class Test_TC_CHANNEL_5_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -98981,12 +94112,6 @@ class Test_TC_CHANNEL_5_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99026,14 +94151,6 @@ class Test_TC_CHANNEL_5_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99051,12 +94168,6 @@ class Test_TC_CHANNEL_5_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99096,14 +94207,6 @@ class Test_TC_KEYPADINPUT_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99121,12 +94224,6 @@ class Test_TC_KEYPADINPUT_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99166,14 +94263,6 @@ class Test_TC_MEDIAPLAYBACK_6_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99191,12 +94280,6 @@ class Test_TC_MEDIAPLAYBACK_6_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99236,14 +94319,6 @@ class Test_TC_MEDIAPLAYBACK_6_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99261,12 +94336,6 @@ class Test_TC_MEDIAPLAYBACK_6_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99306,14 +94375,6 @@ class Test_TC_AUDIOOUTPUT_7_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99331,12 +94392,6 @@ class Test_TC_AUDIOOUTPUT_7_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99376,14 +94431,6 @@ class Test_TC_AUDIOOUTPUT_7_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99401,12 +94448,6 @@ class Test_TC_AUDIOOUTPUT_7_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99446,14 +94487,6 @@ class Test_TC_CONTENTLAUNCHER_10_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99471,12 +94504,6 @@ class Test_TC_CONTENTLAUNCHER_10_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99516,14 +94543,6 @@ class Test_TC_CONTENTLAUNCHER_10_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99541,12 +94560,6 @@ class Test_TC_CONTENTLAUNCHER_10_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99586,14 +94599,6 @@ class Test_TC_CONTENTLAUNCHER_10_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99611,12 +94616,6 @@ class Test_TC_CONTENTLAUNCHER_10_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99656,14 +94655,6 @@ class Test_TC_CONTENTLAUNCHER_10_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99681,12 +94672,6 @@ class Test_TC_CONTENTLAUNCHER_10_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99725,14 +94710,6 @@ class Test_TC_MC_11_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99750,12 +94727,6 @@ class Test_TC_MC_11_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99794,14 +94765,6 @@ class Test_TC_MC_11_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99819,12 +94782,6 @@ class Test_TC_MC_11_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99864,14 +94821,6 @@ class Test_TC_ALOGIN_12_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99889,12 +94838,6 @@ class Test_TC_ALOGIN_12_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -99933,14 +94876,6 @@ class Test_TC_CADMIN_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -99958,12 +94893,6 @@ class Test_TC_CADMIN_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100002,14 +94931,6 @@ class Test_TC_CADMIN_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100027,12 +94948,6 @@ class Test_TC_CADMIN_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100071,14 +94986,6 @@ class Test_TC_CADMIN_1_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100096,12 +95003,6 @@ class Test_TC_CADMIN_1_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100140,14 +95041,6 @@ class Test_TC_CADMIN_1_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100165,12 +95058,6 @@ class Test_TC_CADMIN_1_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100215,14 +95102,6 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100366,12 +95245,6 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -100670,14 +95543,6 @@ class Test_TC_CADMIN_1_12Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100695,12 +95560,6 @@ class Test_TC_CADMIN_1_12Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100740,14 +95599,6 @@ class Test_TC_CADMIN_1_14Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100765,12 +95616,6 @@ class Test_TC_CADMIN_1_14Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -100818,14 +95663,6 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -100988,12 +95825,6 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -101249,14 +96080,6 @@ class Test_TC_CADMIN_1_16Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101415,12 +96238,6 @@ class Test_TC_CADMIN_1_16Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -101623,14 +96440,6 @@ class Test_TC_CADMIN_1_17Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101648,12 +96457,6 @@ class Test_TC_CADMIN_1_17Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -101693,14 +96496,6 @@ class Test_TC_CADMIN_1_18Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101718,12 +96513,6 @@ class Test_TC_CADMIN_1_18Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -101763,14 +96552,6 @@ class Test_TC_CADMIN_1_19Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101788,12 +96569,6 @@ class Test_TC_CADMIN_1_19Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -101833,14 +96608,6 @@ class Test_TC_CADMIN_1_20Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101858,12 +96625,6 @@ class Test_TC_CADMIN_1_20Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -101900,14 +96661,6 @@ class Test_TC_CADMIN_1_21Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -101963,12 +96716,6 @@ class Test_TC_CADMIN_1_21Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -102077,14 +96824,6 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -102140,12 +96879,6 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -102281,14 +97014,6 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -102444,12 +97169,6 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -102704,14 +97423,6 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -102866,12 +97577,6 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -103098,14 +97803,6 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -103204,12 +97901,6 @@ class Test_TC_CADMIN_1_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -103508,14 +98199,6 @@ class Test_TC_CADMIN_1_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -103609,12 +98292,6 @@ class Test_TC_CADMIN_1_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -103844,14 +98521,6 @@ class Test_TC_CADMIN_1_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -103976,12 +98645,6 @@ class Test_TC_CADMIN_1_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -104309,14 +98972,6 @@ class Test_TC_CADMIN_1_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -104437,12 +99092,6 @@ class Test_TC_CADMIN_1_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -104747,14 +99396,6 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -104950,12 +99591,6 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -105314,14 +99949,6 @@ class Test_TC_CADMIN_1_23Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105377,12 +100004,6 @@ class Test_TC_CADMIN_1_23Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -105491,14 +100112,6 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105554,12 +100167,6 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -105692,14 +100299,6 @@ class Test_TC_MOD_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105717,12 +100316,6 @@ class Test_TC_MOD_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -105761,14 +100354,6 @@ class Test_TC_MOD_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105786,12 +100371,6 @@ class Test_TC_MOD_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -105830,14 +100409,6 @@ class Test_TC_MOD_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105855,12 +100426,6 @@ class Test_TC_MOD_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -105899,14 +100464,6 @@ class Test_TC_MOD_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105924,12 +100481,6 @@ class Test_TC_MOD_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -105968,14 +100519,6 @@ class Test_TC_MOD_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -105993,12 +100536,6 @@ class Test_TC_MOD_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106037,14 +100574,6 @@ class Test_TC_MOD_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106062,12 +100591,6 @@ class Test_TC_MOD_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106106,14 +100629,6 @@ class Test_TC_MOD_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106131,12 +100646,6 @@ class Test_TC_MOD_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106175,14 +100684,6 @@ class Test_TC_MOD_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106200,12 +100701,6 @@ class Test_TC_MOD_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106244,14 +100739,6 @@ class Test_TC_SU_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106269,12 +100756,6 @@ class Test_TC_SU_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106313,14 +100794,6 @@ class Test_TC_SU_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106338,12 +100811,6 @@ class Test_TC_SU_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106382,14 +100849,6 @@ class Test_TC_SU_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106407,12 +100866,6 @@ class Test_TC_SU_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106451,14 +100904,6 @@ class Test_TC_SU_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106476,12 +100921,6 @@ class Test_TC_SU_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106520,14 +100959,6 @@ class Test_TC_SU_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106545,12 +100976,6 @@ class Test_TC_SU_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106589,14 +101014,6 @@ class Test_TC_SU_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106614,12 +101031,6 @@ class Test_TC_SU_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106658,14 +101069,6 @@ class Test_TC_SU_2_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106683,12 +101086,6 @@ class Test_TC_SU_2_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106727,14 +101124,6 @@ class Test_TC_SU_2_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106752,12 +101141,6 @@ class Test_TC_SU_2_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106796,14 +101179,6 @@ class Test_TC_SU_2_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106821,12 +101196,6 @@ class Test_TC_SU_2_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106865,14 +101234,6 @@ class Test_TC_SU_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106890,12 +101251,6 @@ class Test_TC_SU_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -106934,14 +101289,6 @@ class Test_TC_SU_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -106959,12 +101306,6 @@ class Test_TC_SU_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107003,14 +101344,6 @@ class Test_TC_SU_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107028,12 +101361,6 @@ class Test_TC_SU_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107072,14 +101399,6 @@ class Test_TC_SU_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107097,12 +101416,6 @@ class Test_TC_SU_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107141,14 +101454,6 @@ class Test_TC_SU_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107166,12 +101471,6 @@ class Test_TC_SU_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107210,14 +101509,6 @@ class Test_TC_SU_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107235,12 +101526,6 @@ class Test_TC_SU_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107279,14 +101564,6 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107304,12 +101581,6 @@ class Test_TC_PSCFG_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107348,14 +101619,6 @@ class Test_TC_SC_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107373,12 +101636,6 @@ class Test_TC_SC_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107417,14 +101674,6 @@ class Test_TC_SC_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107442,12 +101691,6 @@ class Test_TC_SC_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107486,14 +101729,6 @@ class Test_TC_SC_1_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107511,12 +101746,6 @@ class Test_TC_SC_1_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107555,14 +101784,6 @@ class Test_TC_SC_1_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107580,12 +101801,6 @@ class Test_TC_SC_1_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107624,14 +101839,6 @@ class Test_TC_SC_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107649,12 +101856,6 @@ class Test_TC_SC_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107693,14 +101894,6 @@ class Test_TC_SC_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107718,12 +101911,6 @@ class Test_TC_SC_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107762,14 +101949,6 @@ class Test_TC_SC_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107787,12 +101966,6 @@ class Test_TC_SC_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107831,14 +102004,6 @@ class Test_TC_SC_2_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107856,12 +102021,6 @@ class Test_TC_SC_2_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107900,14 +102059,6 @@ class Test_TC_SC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107925,12 +102076,6 @@ class Test_TC_SC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -107969,14 +102114,6 @@ class Test_TC_SC_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -107994,12 +102131,6 @@ class Test_TC_SC_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108038,14 +102169,6 @@ class Test_TC_SC_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108063,12 +102186,6 @@ class Test_TC_SC_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108107,14 +102224,6 @@ class Test_TC_SC_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108132,12 +102241,6 @@ class Test_TC_SC_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108176,14 +102279,6 @@ class Test_TC_SC_4_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108201,12 +102296,6 @@ class Test_TC_SC_4_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108245,14 +102334,6 @@ class Test_TC_SC_4_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108270,12 +102351,6 @@ class Test_TC_SC_4_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108314,14 +102389,6 @@ class Test_TC_SC_4_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108339,12 +102406,6 @@ class Test_TC_SC_4_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108383,14 +102444,6 @@ class Test_TC_SC_4_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108408,12 +102461,6 @@ class Test_TC_SC_4_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108452,14 +102499,6 @@ class Test_TC_SC_4_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108477,12 +102516,6 @@ class Test_TC_SC_4_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108521,14 +102554,6 @@ class Test_TC_SC_4_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108546,12 +102571,6 @@ class Test_TC_SC_4_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108590,14 +102609,6 @@ class Test_TC_SC_4_7Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108615,12 +102626,6 @@ class Test_TC_SC_4_7Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108659,14 +102664,6 @@ class Test_TC_SC_4_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108684,12 +102681,6 @@ class Test_TC_SC_4_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108728,14 +102719,6 @@ class Test_TC_SC_4_9Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108753,12 +102736,6 @@ class Test_TC_SC_4_9Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108797,14 +102774,6 @@ class Test_TC_SC_4_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108822,12 +102791,6 @@ class Test_TC_SC_4_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108866,14 +102829,6 @@ class Test_TC_SC_5_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108891,12 +102846,6 @@ class Test_TC_SC_5_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -108935,14 +102884,6 @@ class Test_TC_SC_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -108960,12 +102901,6 @@ class Test_TC_SC_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109004,14 +102939,6 @@ class Test_TC_DGSW_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109029,12 +102956,6 @@ class Test_TC_DGSW_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109073,14 +102994,6 @@ class Test_TC_DGSW_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109098,12 +103011,6 @@ class Test_TC_DGSW_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109142,14 +103049,6 @@ class Test_TC_DGSW_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109167,12 +103066,6 @@ class Test_TC_DGSW_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109211,14 +103104,6 @@ class Test_TC_DGSW_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109236,12 +103121,6 @@ class Test_TC_DGSW_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109280,14 +103159,6 @@ class Test_TC_DGWIFI_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109305,12 +103176,6 @@ class Test_TC_DGWIFI_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109349,14 +103214,6 @@ class Test_TC_DGWIFI_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109374,12 +103231,6 @@ class Test_TC_DGWIFI_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109418,14 +103269,6 @@ class Test_TC_WNCV_6_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109443,12 +103286,6 @@ class Test_TC_WNCV_6_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109487,14 +103324,6 @@ class Test_TC_WNCV_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109512,12 +103341,6 @@ class Test_TC_WNCV_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109558,14 +103381,6 @@ class Test_TC_FLW_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109613,12 +103428,6 @@ class Test_TC_FLW_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -109689,14 +103498,6 @@ class Test_TC_OCC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109738,12 +103539,6 @@ class Test_TC_OCC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -109812,14 +103607,6 @@ class Test_TC_PS_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109837,12 +103624,6 @@ class Test_TC_PS_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109881,14 +103662,6 @@ class Test_TC_BOOL_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109906,12 +103679,6 @@ class Test_TC_BOOL_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -109950,14 +103717,6 @@ class Test_TC_CC_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -109975,12 +103734,6 @@ class Test_TC_CC_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110019,14 +103772,6 @@ class Test_TC_CC_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110044,12 +103789,6 @@ class Test_TC_CC_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110088,14 +103827,6 @@ class Test_TC_CC_4_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110113,12 +103844,6 @@ class Test_TC_CC_4_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110157,14 +103882,6 @@ class Test_TC_CC_5_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110182,12 +103899,6 @@ class Test_TC_CC_5_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110226,14 +103937,6 @@ class Test_TC_CC_6_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110251,12 +103954,6 @@ class Test_TC_CC_6_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110295,14 +103992,6 @@ class Test_TC_CC_7_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110320,12 +104009,6 @@ class Test_TC_CC_7_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110364,14 +104047,6 @@ class Test_TC_CC_9_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110389,12 +104064,6 @@ class Test_TC_CC_9_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -110430,14 +104099,6 @@ class Test_TC_CC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -110739,12 +104400,6 @@ class Test_TC_CC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -111225,14 +104880,6 @@ class Test_TC_CC_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -111539,12 +105186,6 @@ class Test_TC_CC_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -112033,14 +105674,6 @@ class Test_TC_CC_9_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -112506,12 +106139,6 @@ class Test_TC_CC_9_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -113270,14 +106897,6 @@ class Test_TC_CC_9_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -113487,12 +107106,6 @@ class Test_TC_CC_9_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -113816,14 +107429,6 @@ class Test_TC_CC_9_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114025,12 +107630,6 @@ class Test_TC_CC_9_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -114345,14 +107944,6 @@ class Test_TC_DRLK_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114370,12 +107961,6 @@ class Test_TC_DRLK_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114414,14 +107999,6 @@ class Test_TC_DRLK_2_8Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114439,12 +108016,6 @@ class Test_TC_DRLK_2_8Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114483,14 +108054,6 @@ class Test_TC_DRLK_2_10Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114508,12 +108071,6 @@ class Test_TC_DRLK_2_10Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114552,14 +108109,6 @@ class Test_TC_DRLK_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114577,12 +108126,6 @@ class Test_TC_DRLK_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114621,14 +108164,6 @@ class Test_TC_DRLK_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114646,12 +108181,6 @@ class Test_TC_DRLK_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114690,14 +108219,6 @@ class Test_TC_DRLK_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114715,12 +108236,6 @@ class Test_TC_DRLK_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114759,14 +108274,6 @@ class Test_TC_LCFG_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114784,12 +108291,6 @@ class Test_TC_LCFG_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114828,14 +108329,6 @@ class Test_TC_LVL_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114853,12 +108346,6 @@ class Test_TC_LVL_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114897,14 +108384,6 @@ class Test_TC_LVL_7_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114922,12 +108401,6 @@ class Test_TC_LVL_7_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -114966,14 +108439,6 @@ class Test_TC_LVL_8_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -114991,12 +108456,6 @@ class Test_TC_LVL_8_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -115032,14 +108491,6 @@ class Test_TC_OO_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -115871,12 +109322,6 @@ class Test_TC_OO_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -116880,14 +110325,6 @@ class Test_TC_OO_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -116905,12 +110342,6 @@ class Test_TC_OO_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -116949,14 +110380,6 @@ class Test_TC_OO_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -116974,12 +110397,6 @@ class Test_TC_OO_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117020,14 +110437,6 @@ class Test_TC_RH_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117093,12 +110502,6 @@ class Test_TC_RH_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -117179,14 +110582,6 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117204,12 +110599,6 @@ class Test_TC_SWTCH_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117248,14 +110637,6 @@ class Test_TC_SWTCH_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117273,12 +110654,6 @@ class Test_TC_SWTCH_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117319,14 +110694,6 @@ class Test_TC_TMP_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117394,12 +110761,6 @@ class Test_TC_TMP_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -117480,14 +110841,6 @@ class Test_TC_TMP_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117505,12 +110858,6 @@ class Test_TC_TMP_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117549,14 +110896,6 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117574,12 +110913,6 @@ class Test_TC_TSTAT_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117618,14 +110951,6 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117643,12 +110968,6 @@ class Test_TC_TSTAT_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117687,14 +111006,6 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117712,12 +111023,6 @@ class Test_TC_TSUIC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117757,14 +111062,6 @@ class Test_TC_DGTHREAD_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117782,12 +111079,6 @@ class Test_TC_DGTHREAD_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117827,14 +111118,6 @@ class Test_TC_DGTHREAD_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117852,12 +111135,6 @@ class Test_TC_DGTHREAD_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117897,14 +111174,6 @@ class Test_TC_DGTHREAD_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117922,12 +111191,6 @@ class Test_TC_DGTHREAD_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -117967,14 +111230,6 @@ class Test_TC_DGTHREAD_3_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -117992,12 +111247,6 @@ class Test_TC_DGTHREAD_3_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118037,14 +111286,6 @@ class Test_TC_DGTHREAD_3_4Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118062,12 +111303,6 @@ class Test_TC_DGTHREAD_3_4Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118107,14 +111342,6 @@ class Test_TC_DGTHREAD_3_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118132,12 +111359,6 @@ class Test_TC_DGTHREAD_3_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118176,14 +111397,6 @@ class Test_TC_ACT_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118201,12 +111414,6 @@ class Test_TC_ACT_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118245,14 +111452,6 @@ class Test_TC_ACT_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118270,12 +111469,6 @@ class Test_TC_ACT_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118314,14 +111507,6 @@ class Test_TC_ACT_3_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118339,12 +111524,6 @@ class Test_TC_ACT_3_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118383,14 +111562,6 @@ class Test_TC_LTIME_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118408,12 +111579,6 @@ class Test_TC_LTIME_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118452,14 +111617,6 @@ class Test_TC_LTIME_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118477,12 +111634,6 @@ class Test_TC_LTIME_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118521,14 +111672,6 @@ class Test_TC_BIND_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118546,12 +111689,6 @@ class Test_TC_BIND_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118590,14 +111727,6 @@ class Test_TC_BIND_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118615,12 +111744,6 @@ class Test_TC_BIND_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118659,14 +111782,6 @@ class Test_TC_BIND_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118684,12 +111799,6 @@ class Test_TC_BIND_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118728,14 +111837,6 @@ class Test_TC_S_1_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118753,12 +111854,6 @@ class Test_TC_S_1_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118797,14 +111892,6 @@ class Test_TC_S_2_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118822,12 +111909,6 @@ class Test_TC_S_2_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118866,14 +111947,6 @@ class Test_TC_S_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118891,12 +111964,6 @@ class Test_TC_S_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -118935,14 +112002,6 @@ class Test_TC_S_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -118960,12 +112019,6 @@ class Test_TC_S_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119004,14 +112057,6 @@ class Test_TC_S_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119029,12 +112074,6 @@ class Test_TC_S_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119073,14 +112112,6 @@ class Test_TC_PCC_3_1Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119098,12 +112129,6 @@ class Test_TC_PCC_3_1Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119142,14 +112167,6 @@ class Test_TC_ACL_2_5Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119167,12 +112184,6 @@ class Test_TC_ACL_2_5Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119211,14 +112222,6 @@ class Test_TC_ACL_2_6Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119236,12 +112239,6 @@ class Test_TC_ACL_2_6Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119281,14 +112278,6 @@ class Test_TC_BRBINFO_2_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119306,12 +112295,6 @@ class Test_TC_BRBINFO_2_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119351,14 +112334,6 @@ class Test_TC_BRBINFO_2_3Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119376,12 +112351,6 @@ class Test_TC_BRBINFO_2_3Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; @@ -119420,14 +112389,6 @@ class Test_TC_ACE_1_2Suite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -119445,12 +112406,6 @@ class Test_TC_ACE_1_2Suite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) {} return CHIP_NO_ERROR; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index aacdf5da47674e..9758f61b48976b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -271,17 +271,10 @@ class TestAccessControlCluster : public TestCommandBridge { ~TestAccessControlCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestAccessControlCluster\n"); @@ -511,7 +504,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -657,7 +649,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1046,7 +1037,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1091,7 +1081,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1138,7 +1127,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1180,7 +1168,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1217,7 +1204,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1259,7 +1245,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1296,7 +1281,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1342,7 +1326,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1379,7 +1362,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1429,7 +1411,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1466,7 +1447,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1531,7 +1511,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1568,7 +1547,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1713,7 +1691,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1750,7 +1727,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -1931,7 +1907,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2320,7 +2295,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2352,7 +2326,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2389,7 +2362,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2410,7 +2382,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2431,7 +2402,6 @@ class TestAccessControlCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2465,17 +2435,10 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { ~Test_TC_ACL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACL_1_1\n"); @@ -2590,7 +2553,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2615,7 +2577,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2640,7 +2601,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2670,7 +2630,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2692,7 +2651,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2717,7 +2675,6 @@ class Test_TC_ACL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2755,17 +2712,10 @@ class Test_TC_ACL_2_1 : public TestCommandBridge { ~Test_TC_ACL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACL_2_1\n"); @@ -2867,7 +2817,6 @@ class Test_TC_ACL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2890,7 +2839,6 @@ class Test_TC_ACL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2913,7 +2861,6 @@ class Test_TC_ACL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -2949,17 +2896,10 @@ class Test_TC_ACL_2_2 : public TestCommandBridge { ~Test_TC_ACL_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACL_2_2\n"); @@ -3048,7 +2988,6 @@ class Test_TC_ACL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3104,17 +3043,10 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { ~Test_TC_ACL_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACL_2_3\n"); @@ -3443,7 +3375,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -3468,7 +3399,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3497,7 +3427,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3531,7 +3460,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3570,7 +3498,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3611,7 +3538,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3657,7 +3583,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3702,7 +3627,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3751,7 +3675,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3801,7 +3724,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3840,7 +3762,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3885,7 +3806,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3930,7 +3850,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -3975,7 +3894,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4020,7 +3938,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4059,7 +3976,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4110,7 +4026,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4148,7 +4063,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4175,7 +4089,6 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4216,17 +4129,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ~Test_TC_ACE_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACE_1_1\n"); @@ -4250,172 +4156,176 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { err = TestWaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : TP2 - Write ACL giving admin privilege on all EP0\n"); - err = TestTp2WriteAclGivingAdminPrivilegeOnAllEp0_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Read the commissioner node ID\n"); + err = TestReadTheCommissionerNodeId_1(); break; case 2: - ChipLogProgress(chipTool, - " ***** Test Step 2 : TP3 - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp3ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : TP2 - Write ACL giving admin privilege on all EP0\n"); + err = TestTp2WriteAclGivingAdminPrivilegeOnAllEp0_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : TP4 - Write the location attribute (Basic - requires administer)\n"); - err = TestTp4WriteTheLocationAttributeBasicRequiresAdminister_3(); + ChipLogProgress(chipTool, + " ***** Test Step 3 : TP3 - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp3ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_3(); break; case 4: - ChipLogProgress(chipTool, - " ***** Test Step 4 : TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp5SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : TP4 - Write the location attribute (Basic - requires administer)\n"); + err = TestTp4WriteTheLocationAttributeBasicRequiresAdminister_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : TP6 - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp6WriteNodeLabelAttributeBasicRequiresManage_5(); + ChipLogProgress(chipTool, + " ***** Test Step 5 : TP5 - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp5SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TP7 - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp7SendTestEventTriggerGeneralDiagnosticsRequiresManage_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : TP6 - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp6WriteNodeLabelAttributeBasicRequiresManage_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : TP8 - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp8TeadTheVendorIDAttributeBasicRequiresView_7(); + ChipLogProgress(chipTool, " ***** Test Step 7 : TP7 - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp7SendTestEventTriggerGeneralDiagnosticsRequiresManage_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0\n"); - err = TestTp9WriteAclGivingAdminPrivilegeAclManageForRestOfEp0_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : TP8 - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp8TeadTheVendorIDAttributeBasicRequiresView_8(); break; case 9: - ChipLogProgress(chipTool, - " ***** Test Step 9 : TP10 - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp10ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : TP9 - Write ACL giving admin privilege ACL, manage for rest of EP0\n"); + err = TestTp9WriteAclGivingAdminPrivilegeAclManageForRestOfEp0_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : TP11 - Write the location attribute (Basic - requires administer)\n"); - err = TestTp11WriteTheLocationAttributeBasicRequiresAdminister_10(); + ChipLogProgress(chipTool, + " ***** Test Step 10 : TP10 - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp10ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_10(); break; case 11: - ChipLogProgress(chipTool, - " ***** Test Step 11 : TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp12SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : TP11 - Write the location attribute (Basic - requires administer)\n"); + err = TestTp11WriteTheLocationAttributeBasicRequiresAdminister_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : TP13(6) - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp136WriteNodeLabelAttributeBasicRequiresManage_12(); + ChipLogProgress(chipTool, + " ***** Test Step 12 : TP12 - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp12SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_12(); break; case 13: - ChipLogProgress( - chipTool, " ***** Test Step 13 : TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp137SendTestEventTriggerGeneralDiagnosticsRequiresManage_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : TP13(6) - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp136WriteNodeLabelAttributeBasicRequiresManage_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : TP13(8) - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp138TeadTheVendorIDAttributeBasicRequiresView_14(); + ChipLogProgress( + chipTool, " ***** Test Step 14 : TP13(7) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp137SendTestEventTriggerGeneralDiagnosticsRequiresManage_14(); break; case 15: - ChipLogProgress( - chipTool, " ***** Test Step 15 : TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0\n"); - err = TestTp14WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : TP13(8) - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp138TeadTheVendorIDAttributeBasicRequiresView_15(); break; case 16: - ChipLogProgress(chipTool, - " ***** Test Step 16 : TP15(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp1510ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_16(); + ChipLogProgress( + chipTool, " ***** Test Step 16 : TP14 - Write ACL giving admin privilege ACL, operate for rest of EP0\n"); + err = TestTp14WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_16(); break; case 17: - ChipLogProgress( - chipTool, " ***** Test Step 17 : TP15(11) - Write the location attribute (Basic - requires administer)\n"); - err = TestTp1511WriteTheLocationAttributeBasicRequiresAdminister_17(); + ChipLogProgress(chipTool, + " ***** Test Step 17 : TP15(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp1510ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_17(); break; case 18: - ChipLogProgress(chipTool, - " ***** Test Step 18 : TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp1512SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_18(); + ChipLogProgress( + chipTool, " ***** Test Step 18 : TP15(11) - Write the location attribute (Basic - requires administer)\n"); + err = TestTp1511WriteTheLocationAttributeBasicRequiresAdminister_18(); break; case 19: - ChipLogProgress(chipTool, " ***** Test Step 19 : TP16 - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp16WriteNodeLabelAttributeBasicRequiresManage_19(); + ChipLogProgress(chipTool, + " ***** Test Step 19 : TP15(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp1512SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_19(); break; case 20: - ChipLogProgress( - chipTool, " ***** Test Step 20 : TP17 - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp17SendTestEventTriggerGeneralDiagnosticsRequiresManage_20(); + ChipLogProgress(chipTool, " ***** Test Step 20 : TP16 - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp16WriteNodeLabelAttributeBasicRequiresManage_20(); break; case 21: - ChipLogProgress(chipTool, " ***** Test Step 21 : TP18(8) - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp188TeadTheVendorIDAttributeBasicRequiresView_21(); + ChipLogProgress( + chipTool, " ***** Test Step 21 : TP17 - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp17SendTestEventTriggerGeneralDiagnosticsRequiresManage_21(); break; case 22: - ChipLogProgress( - chipTool, " ***** Test Step 22 : TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0\n"); - err = TestTp19WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_22(); + ChipLogProgress(chipTool, " ***** Test Step 22 : TP18(8) - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp188TeadTheVendorIDAttributeBasicRequiresView_22(); break; case 23: - ChipLogProgress(chipTool, - " ***** Test Step 23 : TP20(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp2010ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_23(); + ChipLogProgress( + chipTool, " ***** Test Step 23 : TP19 - Write ACL giving admin privilege ACL, operate for rest of EP0\n"); + err = TestTp19WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_23(); break; case 24: - ChipLogProgress( - chipTool, " ***** Test Step 24 : TP20(11) - Write the location attribute (Basic - requires administer)\n"); - err = TestTp2011WriteTheLocationAttributeBasicRequiresAdminister_24(); + ChipLogProgress(chipTool, + " ***** Test Step 24 : TP20(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp2010ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_24(); break; case 25: - ChipLogProgress(chipTool, - " ***** Test Step 25 : TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp2012SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_25(); + ChipLogProgress( + chipTool, " ***** Test Step 25 : TP20(11) - Write the location attribute (Basic - requires administer)\n"); + err = TestTp2011WriteTheLocationAttributeBasicRequiresAdminister_25(); break; case 26: - ChipLogProgress(chipTool, " ***** Test Step 26 : TP21(16) - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp2116WriteNodeLabelAttributeBasicRequiresManage_26(); + ChipLogProgress(chipTool, + " ***** Test Step 26 : TP20(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp2012SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_26(); break; case 27: - ChipLogProgress( - chipTool, " ***** Test Step 27 : TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp2117SendTestEventTriggerGeneralDiagnosticsRequiresManage_27(); + ChipLogProgress(chipTool, " ***** Test Step 27 : TP21(16) - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp2116WriteNodeLabelAttributeBasicRequiresManage_27(); break; case 28: - ChipLogProgress(chipTool, " ***** Test Step 28 : TP22(8) - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp228TeadTheVendorIDAttributeBasicRequiresView_28(); + ChipLogProgress( + chipTool, " ***** Test Step 28 : TP21(17) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp2117SendTestEventTriggerGeneralDiagnosticsRequiresManage_28(); break; case 29: - ChipLogProgress(chipTool, " ***** Test Step 29 : TP23 - Write ACL giving only admin privilege ACL cluster\n"); - err = TestTp23WriteAclGivingOnlyAdminPrivilegeAclCluster_29(); + ChipLogProgress(chipTool, " ***** Test Step 29 : TP22(8) - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp228TeadTheVendorIDAttributeBasicRequiresView_29(); break; case 30: - ChipLogProgress(chipTool, - " ***** Test Step 30 : TP24(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); - err = TestTp2410ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_30(); + ChipLogProgress(chipTool, " ***** Test Step 30 : TP23 - Write ACL giving only admin privilege ACL cluster\n"); + err = TestTp23WriteAclGivingOnlyAdminPrivilegeAclCluster_30(); break; case 31: - ChipLogProgress( - chipTool, " ***** Test Step 31 : TP24(11) - Write the location attribute (Basic - requires administer)\n"); - err = TestTp2411WriteTheLocationAttributeBasicRequiresAdminister_31(); + ChipLogProgress(chipTool, + " ***** Test Step 31 : TP24(10) - Read the NOC attribute (Node operational credentials - requires administer)\n"); + err = TestTp2410ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_31(); break; case 32: - ChipLogProgress(chipTool, - " ***** Test Step 32 : TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " - "administer)\n"); - err = TestTp2412SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_32(); + ChipLogProgress( + chipTool, " ***** Test Step 32 : TP24(11) - Write the location attribute (Basic - requires administer)\n"); + err = TestTp2411WriteTheLocationAttributeBasicRequiresAdminister_32(); break; case 33: - ChipLogProgress(chipTool, " ***** Test Step 33 : TP25(16) - Write NodeLabel attribute (Basic - requires manage)\n"); - err = TestTp2516WriteNodeLabelAttributeBasicRequiresManage_33(); + ChipLogProgress(chipTool, + " ***** Test Step 33 : TP24(12) - Send the UpdateFabricLabel command (Node operational credentials - requires " + "administer)\n"); + err = TestTp2412SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_33(); break; case 34: - ChipLogProgress( - chipTool, " ***** Test Step 34 : TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); - err = TestTp2517SendTestEventTriggerGeneralDiagnosticsRequiresManage_34(); + ChipLogProgress(chipTool, " ***** Test Step 34 : TP25(16) - Write NodeLabel attribute (Basic - requires manage)\n"); + err = TestTp2516WriteNodeLabelAttributeBasicRequiresManage_34(); break; case 35: - ChipLogProgress(chipTool, " ***** Test Step 35 : TP26 - Tead the VendorID attribute (Basic - requires view)\n"); - err = TestTp26TeadTheVendorIDAttributeBasicRequiresView_35(); + ChipLogProgress( + chipTool, " ***** Test Step 35 : TP25(17) - Send TestEventTrigger (General Diagnostics - requires manage)\n"); + err = TestTp2517SendTestEventTriggerGeneralDiagnosticsRequiresManage_35(); break; case 36: - ChipLogProgress(chipTool, " ***** Test Step 36 : TP27 - Write ACL to restore full access\n"); - err = TestTp27WriteAclToRestoreFullAccess_36(); + ChipLogProgress(chipTool, " ***** Test Step 36 : TP26 - Tead the VendorID attribute (Basic - requires view)\n"); + err = TestTp26TeadTheVendorIDAttributeBasicRequiresView_36(); + break; + case 37: + ChipLogProgress(chipTool, " ***** Test Step 37 : TP27 - Write ACL to restore full access\n"); + err = TestTp27WriteAclToRestoreFullAccess_37(); break; } @@ -4447,16 +4357,16 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 6: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 7: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); break; case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 9: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -4465,19 +4375,19 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 13: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 14: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); break; case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 16: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -4492,13 +4402,13 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 21: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 23: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -4513,13 +4423,13 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 28: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 30: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); @@ -4537,6 +4447,9 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 36: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + break; + case 37: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; } @@ -4552,7 +4465,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 37; + const uint16_t mTestCount = 38; chip::Optional mNodeId; chip::Optional mCluster; @@ -4566,12 +4479,24 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } + NSNumber * _Nonnull commissionerNodeId; - CHIP_ERROR TestTp2WriteAclGivingAdminPrivilegeOnAllEp0_1() + CHIP_ERROR TestReadTheCommissionerNodeId_1() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeId = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } + + CHIP_ERROR TestTp2WriteAclGivingAdminPrivilegeOnAllEp0_2() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4583,7 +4508,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -4611,11 +4536,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp3ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_2() + CHIP_ERROR TestTp3ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_3() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4640,11 +4564,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp4WriteTheLocationAttributeBasicRequiresAdminister_3() + CHIP_ERROR TestTp4WriteTheLocationAttributeBasicRequiresAdminister_4() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4662,11 +4585,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp5SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_4() + CHIP_ERROR TestTp5SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_5() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4689,11 +4611,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp6WriteNodeLabelAttributeBasicRequiresManage_5() + CHIP_ERROR TestTp6WriteNodeLabelAttributeBasicRequiresManage_6() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4711,11 +4632,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp7SendTestEventTriggerGeneralDiagnosticsRequiresManage_6() + CHIP_ERROR TestTp7SendTestEventTriggerGeneralDiagnosticsRequiresManage_7() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4739,11 +4659,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp8TeadTheVendorIDAttributeBasicRequiresView_7() + CHIP_ERROR TestTp8TeadTheVendorIDAttributeBasicRequiresView_8() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4758,11 +4677,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp9WriteAclGivingAdminPrivilegeAclManageForRestOfEp0_8() + CHIP_ERROR TestTp9WriteAclGivingAdminPrivilegeAclManageForRestOfEp0_9() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4774,7 +4692,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -4793,7 +4711,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = temp_3; } { @@ -4821,11 +4739,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp10ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_9() + CHIP_ERROR TestTp10ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_10() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4850,11 +4767,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp11WriteTheLocationAttributeBasicRequiresAdminister_10() + CHIP_ERROR TestTp11WriteTheLocationAttributeBasicRequiresAdminister_11() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4876,11 +4792,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp12SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_11() + CHIP_ERROR TestTp12SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_12() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4906,11 +4821,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp136WriteNodeLabelAttributeBasicRequiresManage_12() + CHIP_ERROR TestTp136WriteNodeLabelAttributeBasicRequiresManage_13() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4928,11 +4842,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp137SendTestEventTriggerGeneralDiagnosticsRequiresManage_13() + CHIP_ERROR TestTp137SendTestEventTriggerGeneralDiagnosticsRequiresManage_14() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -4957,11 +4870,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp138TeadTheVendorIDAttributeBasicRequiresView_14() + CHIP_ERROR TestTp138TeadTheVendorIDAttributeBasicRequiresView_15() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4976,11 +4888,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp14WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_15() + CHIP_ERROR TestTp14WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_16() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -4992,7 +4903,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -5011,7 +4922,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = temp_3; } { @@ -5039,11 +4950,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp1510ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_16() + CHIP_ERROR TestTp1510ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_17() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5068,11 +4978,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp1511WriteTheLocationAttributeBasicRequiresAdminister_17() + CHIP_ERROR TestTp1511WriteTheLocationAttributeBasicRequiresAdminister_18() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5094,11 +5003,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp1512SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_18() + CHIP_ERROR TestTp1512SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_19() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5124,11 +5032,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp16WriteNodeLabelAttributeBasicRequiresManage_19() + CHIP_ERROR TestTp16WriteNodeLabelAttributeBasicRequiresManage_20() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5150,11 +5057,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp17SendTestEventTriggerGeneralDiagnosticsRequiresManage_20() + CHIP_ERROR TestTp17SendTestEventTriggerGeneralDiagnosticsRequiresManage_21() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5178,11 +5084,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp188TeadTheVendorIDAttributeBasicRequiresView_21() + CHIP_ERROR TestTp188TeadTheVendorIDAttributeBasicRequiresView_22() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5197,11 +5102,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp19WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_22() + CHIP_ERROR TestTp19WriteAclGivingAdminPrivilegeAclOperateForRestOfEp0_23() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5213,7 +5117,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -5232,7 +5136,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = temp_3; } { @@ -5260,11 +5164,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2010ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_23() + CHIP_ERROR TestTp2010ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_24() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5289,11 +5192,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2011WriteTheLocationAttributeBasicRequiresAdminister_24() + CHIP_ERROR TestTp2011WriteTheLocationAttributeBasicRequiresAdminister_25() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5315,11 +5217,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2012SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_25() + CHIP_ERROR TestTp2012SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_26() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5345,11 +5246,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2116WriteNodeLabelAttributeBasicRequiresManage_26() + CHIP_ERROR TestTp2116WriteNodeLabelAttributeBasicRequiresManage_27() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5371,11 +5271,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2117SendTestEventTriggerGeneralDiagnosticsRequiresManage_27() + CHIP_ERROR TestTp2117SendTestEventTriggerGeneralDiagnosticsRequiresManage_28() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5400,11 +5299,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp228TeadTheVendorIDAttributeBasicRequiresView_28() + CHIP_ERROR TestTp228TeadTheVendorIDAttributeBasicRequiresView_29() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5419,11 +5317,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp23WriteAclGivingOnlyAdminPrivilegeAclCluster_29() + CHIP_ERROR TestTp23WriteAclGivingOnlyAdminPrivilegeAclCluster_30() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5435,7 +5332,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -5463,11 +5360,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2410ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_30() + CHIP_ERROR TestTp2410ReadTheNocAttributeNodeOperationalCredentialsRequiresAdminister_31() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5492,11 +5388,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2411WriteTheLocationAttributeBasicRequiresAdminister_31() + CHIP_ERROR TestTp2411WriteTheLocationAttributeBasicRequiresAdminister_32() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5518,11 +5413,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2412SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_32() + CHIP_ERROR TestTp2412SendTheUpdateFabricLabelCommandNodeOperationalCredentialsRequiresAdminister_33() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5548,11 +5442,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2516WriteNodeLabelAttributeBasicRequiresManage_33() + CHIP_ERROR TestTp2516WriteNodeLabelAttributeBasicRequiresManage_34() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5574,11 +5467,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp2517SendTestEventTriggerGeneralDiagnosticsRequiresManage_34() + CHIP_ERROR TestTp2517SendTestEventTriggerGeneralDiagnosticsRequiresManage_35() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5603,11 +5495,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp26TeadTheVendorIDAttributeBasicRequiresView_35() + CHIP_ERROR TestTp26TeadTheVendorIDAttributeBasicRequiresView_36() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5623,11 +5514,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTp27WriteAclToRestoreFullAccess_36() + CHIP_ERROR TestTp27WriteAclToRestoreFullAccess_37() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5639,7 +5529,7 @@ class Test_TC_ACE_1_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -5677,17 +5567,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { ~Test_TC_ACE_1_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACE_1_5\n"); @@ -5731,36 +5614,44 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { err = TestTh2ReadsTheFabricIndex_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TH1 writes ACL giving view privilege for descriptor cluster\n"); - err = TestTh1WritesAclGivingViewPrivilegeForDescriptorCluster_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : Read the commissioner node ID from the alpha fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheAlphaFabric_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : TH2 writes ACL giving view privilge for basic cluster\n"); - err = TestTh2WritesAclGivingViewPrivilgeForBasicCluster_7(); + ChipLogProgress(chipTool, " ***** Test Step 7 : TH1 writes ACL giving view privilege for descriptor cluster\n"); + err = TestTh1WritesAclGivingViewPrivilegeForDescriptorCluster_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : TH1 reads descriptor cluster - expect SUCCESS\n"); - err = TestTh1ReadsDescriptorClusterExpectSuccess_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : Read the commissioner node ID from the beta fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheBetaFabric_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : TH1 reads basic cluster - expect UNSUPPORTED_ACCESS\n"); - err = TestTh1ReadsBasicClusterExpectUnsupportedAccess_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : TH2 writes ACL giving view privilge for basic cluster\n"); + err = TestTh2WritesAclGivingViewPrivilgeForBasicCluster_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS\n"); - err = TestTh2ReadsDescriptorClusterExpectUnsupportedAccess_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : TH1 reads descriptor cluster - expect SUCCESS\n"); + err = TestTh1ReadsDescriptorClusterExpectSuccess_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : TH2 reads basic cluster - expect SUCCESS\n"); - err = TestTh2ReadsBasicClusterExpectSuccess_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : TH1 reads basic cluster - expect UNSUPPORTED_ACCESS\n"); + err = TestTh1ReadsBasicClusterExpectUnsupportedAccess_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : TH1 resets ACL to default\n"); - err = TestTh1ResetsAclToDefault_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS\n"); + err = TestTh2ReadsDescriptorClusterExpectUnsupportedAccess_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : TH1 sends RemoveFabric command for TH2\n"); - err = TestTh1SendsRemoveFabricCommandForTh2_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : TH2 reads basic cluster - expect SUCCESS\n"); + err = TestTh2ReadsBasicClusterExpectSuccess_13(); + break; + case 14: + ChipLogProgress(chipTool, " ***** Test Step 14 : TH1 resets ACL to default\n"); + err = TestTh1ResetsAclToDefault_14(); + break; + case 15: + ChipLogProgress(chipTool, " ***** Test Step 15 : TH1 sends RemoveFabric command for TH2\n"); + err = TestTh1SendsRemoveFabricCommandForTh2_15(); break; } @@ -5801,20 +5692,26 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 9: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 10: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 11: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); break; case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 14: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 15: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -5828,7 +5725,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 14; + const uint16_t mTestCount = 16; chip::Optional mNodeId; chip::Optional mCluster; @@ -5849,7 +5746,6 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5874,7 +5770,6 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5916,7 +5811,6 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -5936,12 +5830,24 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdAlpha; - CHIP_ERROR TestTh1WritesAclGivingViewPrivilegeForDescriptorCluster_6() + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheAlphaFabric_6() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdAlpha = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } + + CHIP_ERROR TestTh1WritesAclGivingViewPrivilegeForDescriptorCluster_7() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -5953,7 +5859,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdAlpha copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -5995,12 +5901,24 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdBeta; - CHIP_ERROR TestTh2WritesAclGivingViewPrivilgeForBasicCluster_7() + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheBetaFabric_8() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("beta", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdBeta = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } + + CHIP_ERROR TestTh2WritesAclGivingViewPrivilgeForBasicCluster_9() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6012,7 +5930,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdBeta copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } { @@ -6055,11 +5973,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh1ReadsDescriptorClusterExpectSuccess_8() + CHIP_ERROR TestTh1ReadsDescriptorClusterExpectSuccess_10() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6074,11 +5991,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh1ReadsBasicClusterExpectUnsupportedAccess_9() + CHIP_ERROR TestTh1ReadsBasicClusterExpectUnsupportedAccess_11() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6094,11 +6010,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh2ReadsDescriptorClusterExpectUnsupportedAccess_10() + CHIP_ERROR TestTh2ReadsDescriptorClusterExpectUnsupportedAccess_12() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6114,11 +6029,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh2ReadsBasicClusterExpectSuccess_11() + CHIP_ERROR TestTh2ReadsBasicClusterExpectSuccess_13() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6133,11 +6047,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh1ResetsAclToDefault_12() + CHIP_ERROR TestTh1ResetsAclToDefault_14() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6149,7 +6062,7 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdAlpha copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -6169,11 +6082,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTh1SendsRemoveFabricCommandForTh2_13() + CHIP_ERROR TestTh1SendsRemoveFabricCommandForTh2_15() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -6211,17 +6123,10 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { ~Test_TC_BOOL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BOOL_1_1\n"); @@ -6325,7 +6230,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6350,7 +6254,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6375,7 +6278,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6402,7 +6304,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6427,7 +6328,6 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6465,17 +6365,10 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge { ~Test_TC_BOOL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BOOL_2_1\n"); @@ -6555,7 +6448,6 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBooleanState alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -6588,17 +6480,10 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { ~Test_TC_BRBINFO_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BRBINFO_1_1\n"); @@ -6857,7 +6742,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6884,7 +6768,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6911,7 +6794,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6940,7 +6822,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6964,7 +6845,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -6988,7 +6868,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7012,7 +6891,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7036,7 +6914,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7060,7 +6937,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7084,7 +6960,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7108,7 +6983,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7132,7 +7006,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7156,7 +7029,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7180,7 +7052,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7204,7 +7075,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7228,7 +7098,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7252,7 +7121,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7276,7 +7144,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7303,7 +7170,6 @@ class Test_TC_BRBINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBridgedDeviceBasicInformation alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -7343,17 +7209,10 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { ~Test_TC_ACT_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ACT_1_1\n"); @@ -7468,7 +7327,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7493,7 +7351,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7518,7 +7375,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7546,7 +7402,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7568,7 +7423,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7589,7 +7443,6 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7627,17 +7480,10 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { ~Test_TC_BIND_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BIND_1_1\n"); @@ -7741,7 +7587,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7766,7 +7611,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7791,7 +7635,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7818,7 +7661,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7843,7 +7685,6 @@ class Test_TC_BIND_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -7881,17 +7722,10 @@ class Test_TC_CC_1_1 : public TestCommandBridge { ~Test_TC_CC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_1_1\n"); @@ -8467,7 +8301,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8492,7 +8325,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8517,7 +8349,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8537,7 +8368,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8557,7 +8387,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8577,7 +8406,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8597,7 +8425,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8617,7 +8444,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8647,7 +8473,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8669,7 +8494,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8691,7 +8515,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8713,7 +8536,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8735,7 +8557,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8757,7 +8578,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8779,7 +8599,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8801,7 +8620,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8823,7 +8641,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8845,7 +8662,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8867,7 +8683,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8889,7 +8704,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8911,7 +8725,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8933,7 +8746,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8955,7 +8767,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8977,7 +8788,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -8999,7 +8809,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9021,7 +8830,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9043,7 +8851,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9065,7 +8872,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9087,7 +8893,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9109,7 +8914,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9131,7 +8935,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9153,7 +8956,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9175,7 +8977,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9197,7 +8998,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9219,7 +9019,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9241,7 +9040,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9263,7 +9061,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9285,7 +9082,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9307,7 +9103,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9329,7 +9124,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9351,7 +9145,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9373,7 +9166,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9395,7 +9187,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9417,7 +9208,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9439,7 +9229,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9461,7 +9250,6 @@ class Test_TC_CC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -9499,17 +9287,10 @@ class Test_TC_CC_2_1 : public TestCommandBridge { ~Test_TC_CC_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_2_1\n"); @@ -10194,7 +9975,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10217,7 +9997,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10240,7 +10019,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10263,7 +10041,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10286,7 +10063,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10309,7 +10085,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10332,7 +10107,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10353,7 +10127,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10376,7 +10149,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10399,7 +10171,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10422,7 +10193,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10445,7 +10215,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10468,7 +10237,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10491,7 +10259,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10514,7 +10281,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10537,7 +10303,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10560,7 +10325,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10584,7 +10348,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10607,7 +10370,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10635,7 +10397,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10658,7 +10419,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10681,7 +10441,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10705,7 +10464,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10732,7 +10490,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10956,7 +10713,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -10979,7 +10735,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11002,7 +10757,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11025,7 +10779,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11048,7 +10801,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11074,7 +10826,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11097,7 +10848,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11120,7 +10870,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11146,7 +10895,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11169,7 +10917,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11192,7 +10939,6 @@ class Test_TC_CC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11231,17 +10977,10 @@ class Test_TC_CC_3_2 : public TestCommandBridge { ~Test_TC_CC_3_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_3_2\n"); @@ -11648,7 +11387,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11670,7 +11408,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11689,7 +11426,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11725,7 +11461,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11758,7 +11493,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11788,7 +11522,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11818,7 +11551,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11843,7 +11575,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11873,7 +11604,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11895,7 +11625,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11931,7 +11660,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11964,7 +11692,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -11994,7 +11721,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12024,7 +11750,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12049,7 +11774,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12079,7 +11803,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12101,7 +11824,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12128,7 +11850,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12155,7 +11876,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12174,7 +11894,6 @@ class Test_TC_CC_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12211,17 +11930,10 @@ class Test_TC_CC_3_3 : public TestCommandBridge { ~Test_TC_CC_3_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_3_3\n"); @@ -12562,7 +12274,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12584,7 +12295,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12603,7 +12313,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12639,7 +12348,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12675,7 +12383,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12705,7 +12412,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12735,7 +12441,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12757,7 +12462,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12793,7 +12497,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12829,7 +12532,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12859,7 +12561,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12889,7 +12590,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12911,7 +12611,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12938,7 +12637,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12965,7 +12663,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -12984,7 +12681,6 @@ class Test_TC_CC_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13022,17 +12718,10 @@ class Test_TC_CC_4_1 : public TestCommandBridge { ~Test_TC_CC_4_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_4_1\n"); @@ -13292,7 +12981,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13314,7 +13002,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13333,7 +13020,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13368,7 +13054,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13403,7 +13088,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13433,7 +13117,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13463,7 +13146,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13493,7 +13175,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13515,7 +13196,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13542,7 +13222,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13569,7 +13248,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13588,7 +13266,6 @@ class Test_TC_CC_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -13625,17 +13302,10 @@ class Test_TC_CC_4_2 : public TestCommandBridge { ~Test_TC_CC_4_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_4_2\n"); @@ -14077,7 +13747,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14099,7 +13768,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14118,7 +13786,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14153,7 +13820,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14189,7 +13855,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14219,7 +13884,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14249,7 +13913,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14271,7 +13934,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14306,7 +13968,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14341,7 +14002,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14371,7 +14031,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14401,7 +14060,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14423,7 +14081,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14458,7 +14115,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14494,7 +14150,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14516,7 +14171,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14543,7 +14197,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14573,7 +14226,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14595,7 +14247,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14622,7 +14273,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14649,7 +14299,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14668,7 +14317,6 @@ class Test_TC_CC_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -14705,17 +14353,10 @@ class Test_TC_CC_4_3 : public TestCommandBridge { ~Test_TC_CC_4_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_4_3\n"); @@ -15126,7 +14767,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15148,7 +14788,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15167,7 +14806,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15202,7 +14840,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15238,7 +14875,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15268,7 +14904,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15298,7 +14933,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15320,7 +14954,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15356,7 +14989,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15378,7 +15010,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15413,7 +15044,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15449,7 +15079,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15479,7 +15108,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15509,7 +15137,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15531,7 +15158,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15567,7 +15193,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15591,7 +15216,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15618,7 +15242,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15645,7 +15268,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15664,7 +15286,6 @@ class Test_TC_CC_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -15701,17 +15322,10 @@ class Test_TC_CC_4_4 : public TestCommandBridge { ~Test_TC_CC_4_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_4_4\n"); @@ -16004,7 +15618,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16026,7 +15639,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16045,7 +15657,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16081,7 +15692,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16103,7 +15713,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16125,7 +15734,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16161,7 +15769,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16183,7 +15790,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16213,7 +15819,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16235,7 +15840,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16266,7 +15870,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16288,7 +15891,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16310,7 +15912,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16337,7 +15938,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16364,7 +15964,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16383,7 +15982,6 @@ class Test_TC_CC_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -16420,17 +16018,10 @@ class Test_TC_CC_5_1 : public TestCommandBridge { ~Test_TC_CC_5_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_5_1\n"); @@ -17157,7 +16748,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17179,7 +16769,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17198,7 +16787,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17234,7 +16822,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17256,7 +16843,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17278,7 +16864,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17314,7 +16899,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17336,7 +16920,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17366,7 +16949,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17388,7 +16970,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17418,7 +16999,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17440,7 +17020,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17462,7 +17041,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17484,7 +17062,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17508,7 +17085,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17527,7 +17103,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17563,7 +17138,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17585,7 +17159,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17607,7 +17180,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17626,7 +17198,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17662,7 +17233,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17686,7 +17256,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17710,7 +17279,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17746,7 +17314,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17770,7 +17337,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17794,7 +17360,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17830,7 +17395,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17852,7 +17416,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17874,7 +17437,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17896,7 +17458,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17920,7 +17481,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17939,7 +17499,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17975,7 +17534,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -17997,7 +17555,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18019,7 +17576,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18038,7 +17594,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18074,7 +17629,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18096,7 +17650,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18118,7 +17671,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18154,7 +17706,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18178,7 +17729,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18202,7 +17752,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18238,7 +17787,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18260,7 +17808,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18282,7 +17829,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18309,7 +17855,6 @@ class Test_TC_CC_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18349,17 +17894,10 @@ class Test_TC_CC_5_2 : public TestCommandBridge { ~Test_TC_CC_5_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_5_2\n"); @@ -18661,7 +18199,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18683,7 +18220,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18702,7 +18238,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18738,7 +18273,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18771,7 +18305,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18793,7 +18326,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18823,7 +18355,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18845,7 +18376,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18876,7 +18406,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18902,7 +18431,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18927,7 +18455,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18950,7 +18477,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18972,7 +18498,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -18994,7 +18519,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19021,7 +18545,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19048,7 +18571,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19067,7 +18589,6 @@ class Test_TC_CC_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19104,17 +18625,10 @@ class Test_TC_CC_5_3 : public TestCommandBridge { ~Test_TC_CC_5_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_5_3\n"); @@ -19385,7 +18899,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19407,7 +18920,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19426,7 +18938,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19462,7 +18973,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19498,7 +19008,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19520,7 +19029,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19550,7 +19058,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19572,7 +19079,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19602,7 +19108,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19624,7 +19129,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19646,7 +19150,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19673,7 +19176,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19700,7 +19202,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19719,7 +19220,6 @@ class Test_TC_CC_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -19756,17 +19256,10 @@ class Test_TC_CC_6_1 : public TestCommandBridge { ~Test_TC_CC_6_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_6_1\n"); @@ -20059,7 +19552,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20081,7 +19573,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20101,7 +19592,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20128,7 +19618,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20154,7 +19643,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20179,7 +19667,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20214,7 +19701,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20249,7 +19735,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20279,7 +19764,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20309,7 +19793,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20339,7 +19822,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20361,7 +19843,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20388,7 +19869,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20415,7 +19895,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20434,7 +19913,6 @@ class Test_TC_CC_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20471,17 +19949,10 @@ class Test_TC_CC_7_3 : public TestCommandBridge { ~Test_TC_CC_7_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_7_3\n"); @@ -20866,7 +20337,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20888,7 +20358,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20908,7 +20377,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20944,7 +20412,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -20980,7 +20447,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21010,7 +20476,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21040,7 +20505,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21070,7 +20534,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21093,7 +20556,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21129,7 +20591,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21165,7 +20626,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21195,7 +20655,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21225,7 +20684,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21255,7 +20713,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21277,7 +20734,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21304,7 +20760,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21331,7 +20786,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21350,7 +20804,6 @@ class Test_TC_CC_7_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21387,17 +20840,10 @@ class Test_TC_CC_7_4 : public TestCommandBridge { ~Test_TC_CC_7_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CC_7_4\n"); @@ -21690,7 +21136,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21712,7 +21157,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21732,7 +21176,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21770,7 +21213,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21792,7 +21234,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21814,7 +21255,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21850,7 +21290,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21873,7 +21312,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21903,7 +21341,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21926,7 +21363,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21956,7 +21392,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -21980,7 +21415,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22004,7 +21438,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22031,7 +21464,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22058,7 +21490,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22077,7 +21508,6 @@ class Test_TC_CC_7_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22114,17 +21544,10 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { ~Test_TC_OPCREDS_1_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OPCREDS_1_2\n"); @@ -22228,7 +21651,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22255,7 +21677,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22282,7 +21703,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22316,7 +21736,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22347,7 +21766,6 @@ class Test_TC_OPCREDS_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -22387,17 +21805,10 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { ~Test_TC_BINFO_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_BINFO_1_1\n"); @@ -22589,7 +22000,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22614,7 +22024,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22639,7 +22048,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22677,7 +22085,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22699,7 +22106,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22721,7 +22127,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22743,7 +22148,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22765,7 +22169,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22787,7 +22190,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22809,7 +22211,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22831,7 +22232,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22853,7 +22253,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22878,7 +22277,6 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -22916,17 +22314,10 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { ~Test_TC_CNET_1_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CNET_1_3\n"); @@ -23164,7 +22555,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23191,7 +22581,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23217,7 +22606,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23243,7 +22631,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23269,7 +22656,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23295,7 +22681,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23323,7 +22708,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23353,7 +22737,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23377,7 +22760,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23401,7 +22783,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23429,7 +22810,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23453,7 +22833,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23477,7 +22856,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23503,7 +22881,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23531,7 +22908,6 @@ class Test_TC_CNET_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -23571,17 +22947,10 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { ~Test_TC_DESC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DESC_1_1\n"); @@ -23685,7 +23054,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23710,7 +23078,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23735,7 +23102,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23765,7 +23131,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23790,7 +23155,6 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23828,17 +23192,10 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { ~Test_TC_DLOG_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DLOG_1_1\n"); @@ -23942,7 +23299,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23967,7 +23323,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -23992,7 +23347,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -24018,7 +23372,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -24044,7 +23397,6 @@ class Test_TC_DLOG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDiagnosticLogs alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -24083,17 +23435,10 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { ~Test_TC_DGETH_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGETH_1_1\n"); @@ -24347,7 +23692,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24374,7 +23718,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24401,7 +23744,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24423,7 +23765,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24445,7 +23786,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24473,7 +23813,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24497,7 +23836,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24521,7 +23859,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24547,7 +23884,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24573,7 +23909,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24599,7 +23934,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24625,7 +23959,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24651,7 +23984,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24675,7 +24007,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24699,7 +24030,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24723,7 +24053,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24750,7 +24079,6 @@ class Test_TC_DGETH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -24790,17 +24118,10 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { ~Test_TC_DGETH_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGETH_2_1\n"); @@ -25059,7 +24380,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25087,7 +24407,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25113,7 +24432,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25145,7 +24463,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25177,7 +24494,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25210,7 +24526,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25243,7 +24558,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25276,7 +24590,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25313,7 +24626,6 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25358,17 +24670,10 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { ~Test_TC_DGETH_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGETH_2_2\n"); @@ -25668,7 +24973,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25696,7 +25000,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25724,7 +25027,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25752,7 +25054,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25780,7 +25081,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25808,7 +25108,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25836,7 +25135,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25864,7 +25162,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25892,7 +25189,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25920,7 +25216,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25949,7 +25244,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -25975,7 +25269,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26001,7 +25294,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26027,7 +25319,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26053,7 +25344,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26078,7 +25368,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26099,7 +25388,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26122,7 +25410,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26145,7 +25432,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26168,7 +25454,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26191,7 +25476,6 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterEthernetNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -26227,17 +25511,10 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { ~Test_TC_FLW_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_FLW_1_1\n"); @@ -26352,7 +25629,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26377,7 +25653,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26402,7 +25677,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26431,7 +25705,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26453,7 +25726,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26478,7 +25750,6 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26516,17 +25787,10 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { ~Test_TC_FLW_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_FLW_2_1\n"); @@ -26639,7 +25903,6 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26665,7 +25928,6 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26691,7 +25953,6 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26717,7 +25978,6 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFlowMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26753,17 +26013,10 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { ~Test_TC_FLABEL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_FLABEL_1_1\n"); @@ -26867,7 +26120,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26892,7 +26144,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26917,7 +26168,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26944,7 +26194,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -26969,7 +26218,6 @@ class Test_TC_FLABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFixedLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -27007,17 +26255,10 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { ~Test_TC_CGEN_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CGEN_1_1\n"); @@ -27121,7 +26362,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27148,7 +26388,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27175,7 +26414,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27208,7 +26446,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27234,7 +26471,6 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27273,17 +26509,10 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { ~Test_TC_CGEN_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CGEN_2_1\n"); @@ -27432,7 +26661,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27454,7 +26682,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27478,7 +26705,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27504,7 +26730,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27528,7 +26753,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27553,7 +26777,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27578,7 +26801,6 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27613,17 +26835,10 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { ~Test_TC_DGGEN_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGGEN_1_1\n"); @@ -27793,7 +27008,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27820,7 +27034,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27847,7 +27060,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27878,7 +27090,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27902,7 +27113,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27926,7 +27136,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27950,7 +27159,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27974,7 +27182,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -27998,7 +27205,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28022,7 +27228,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28046,7 +27251,6 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28086,17 +27290,10 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { ~Test_TC_DGGEN_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGGEN_2_1\n"); @@ -28346,7 +27543,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28368,7 +27564,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28437,7 +27632,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28461,7 +27655,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28512,7 +27705,6 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -28589,17 +27781,10 @@ class Test_TC_I_1_1 : public TestCommandBridge { ~Test_TC_I_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_I_1_1\n"); @@ -28714,7 +27899,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28739,7 +27923,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28764,7 +27947,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28792,7 +27974,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28814,7 +27995,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28836,7 +28016,6 @@ class Test_TC_I_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28874,17 +28053,10 @@ class Test_TC_I_2_1 : public TestCommandBridge { ~Test_TC_I_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_I_2_1\n"); @@ -28975,7 +28147,6 @@ class Test_TC_I_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -28998,7 +28169,6 @@ class Test_TC_I_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29034,17 +28204,10 @@ class Test_TC_I_2_2 : public TestCommandBridge { ~Test_TC_I_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_I_2_2\n"); @@ -29220,7 +28383,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29243,7 +28405,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29273,7 +28434,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29306,7 +28466,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29330,7 +28489,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29354,7 +28512,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29385,7 +28542,6 @@ class Test_TC_I_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29420,17 +28576,10 @@ class Test_TC_I_2_3 : public TestCommandBridge { ~Test_TC_I_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_I_2_3\n"); @@ -29740,7 +28889,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29776,7 +28924,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29812,7 +28959,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29848,7 +28994,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29884,7 +29029,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29920,7 +29064,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29956,7 +29099,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -29992,7 +29134,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -30028,7 +29169,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -30064,7 +29204,6 @@ class Test_TC_I_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -30112,17 +29251,10 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { ~Test_TC_ILL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ILL_1_1\n"); @@ -30248,7 +29380,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30275,7 +29406,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30302,7 +29432,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30333,7 +29462,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30357,7 +29485,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30381,7 +29508,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30408,7 +29534,6 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30448,17 +29573,10 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { ~Test_TC_ILL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ILL_2_1\n"); @@ -30582,7 +29700,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30610,7 +29727,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30638,7 +29754,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30666,7 +29781,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30691,7 +29805,6 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30732,17 +29845,10 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { ~Test_TC_ILL_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ILL_2_2\n"); @@ -30892,7 +29998,6 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30922,7 +30027,6 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -30969,7 +30073,6 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -31014,7 +30117,6 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIlluminanceMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -31054,17 +30156,10 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { ~Test_TC_LVL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_1_1\n"); @@ -31308,7 +30403,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31333,7 +30427,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31358,7 +30451,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31378,7 +30470,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31398,7 +30489,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31418,7 +30508,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31447,7 +30536,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31470,7 +30558,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31494,7 +30581,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31516,7 +30602,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31538,7 +30623,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31560,7 +30644,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31582,7 +30665,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31604,7 +30686,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31626,7 +30707,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31655,7 +30735,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31677,7 +30756,6 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -31715,17 +30793,10 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { ~Test_TC_LVL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_2_1\n"); @@ -32015,7 +31086,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32044,7 +31114,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32068,7 +31137,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32098,7 +31166,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32125,7 +31192,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32156,7 +31222,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32183,7 +31248,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32209,7 +31273,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32237,7 +31300,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32261,7 +31323,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32288,7 +31349,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32314,7 +31374,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32337,7 +31396,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32360,7 +31418,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32386,7 +31443,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32414,7 +31470,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32440,7 +31495,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32466,7 +31520,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32492,7 +31545,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32512,7 +31564,6 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32557,17 +31608,10 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { ~Test_TC_LVL_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_2_2\n"); @@ -32852,7 +31896,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32878,7 +31921,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32902,7 +31944,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32931,7 +31972,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32960,7 +32000,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -32983,7 +32022,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33015,7 +32053,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33044,7 +32081,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33068,7 +32104,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33100,7 +32135,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33129,7 +32163,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33153,7 +32186,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33185,7 +32217,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33214,7 +32245,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33238,7 +32268,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33270,7 +32299,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33299,7 +32327,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33323,7 +32350,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33354,7 +32380,6 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33390,17 +32415,10 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { ~Test_TC_LVL_3_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_3_1\n"); @@ -33953,7 +32971,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33972,7 +32989,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -33996,7 +33012,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34021,7 +33036,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34043,7 +33057,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34062,7 +33075,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34089,7 +33101,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34113,7 +33124,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34138,7 +33148,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34157,7 +33166,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34185,7 +33193,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34211,7 +33218,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34246,7 +33252,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34279,7 +33284,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34312,7 +33316,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34345,7 +33348,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34370,7 +33372,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34395,7 +33396,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34417,7 +33417,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34441,7 +33440,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34460,7 +33458,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34485,7 +33482,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34510,7 +33506,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34529,7 +33524,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34554,7 +33548,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34579,7 +33572,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34604,7 +33596,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34629,7 +33620,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34654,7 +33644,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34679,7 +33668,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34701,7 +33689,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34725,7 +33712,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34744,7 +33730,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34769,7 +33754,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34794,7 +33778,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34813,7 +33796,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34838,7 +33820,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34863,7 +33844,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34888,7 +33868,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34913,7 +33892,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34938,7 +33916,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -34976,17 +33953,10 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { ~Test_TC_LVL_4_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_4_1\n"); @@ -35313,7 +34283,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35332,7 +34301,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35356,7 +34324,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35381,7 +34348,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35403,7 +34369,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35426,7 +34391,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35445,7 +34409,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35472,7 +34435,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35497,7 +34459,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35532,7 +34493,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35557,7 +34517,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35576,7 +34535,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35604,7 +34562,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35629,7 +34586,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35662,7 +34618,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35695,7 +34650,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35728,7 +34682,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35761,7 +34714,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35786,7 +34738,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35805,7 +34756,6 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -35842,17 +34792,10 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { ~Test_TC_LVL_5_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_5_1\n"); @@ -36153,7 +35096,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36172,7 +35114,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36196,7 +35137,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36221,7 +35161,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36243,7 +35182,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36262,7 +35200,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36290,7 +35227,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36314,7 +35250,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36333,7 +35268,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36361,7 +35295,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36386,7 +35319,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36422,7 +35354,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36455,7 +35386,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36488,7 +35418,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36521,7 +35450,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36546,7 +35474,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36571,7 +35498,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36590,7 +35516,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36627,17 +35552,10 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { ~Test_TC_LVL_6_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LVL_6_1\n"); @@ -36890,7 +35808,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36915,7 +35832,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36937,7 +35853,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36956,7 +35871,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -36984,7 +35898,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37009,7 +35922,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37044,7 +35956,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37077,7 +35988,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37102,7 +36012,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37137,7 +36046,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37170,7 +36078,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37195,7 +36102,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37214,7 +36120,6 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37251,17 +36156,10 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { ~Test_TC_LCFG_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LCFG_1_1\n"); @@ -37365,7 +36263,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37392,7 +36289,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37419,7 +36315,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37449,7 +36344,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37476,7 +36370,6 @@ class Test_TC_LCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLocalizationConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -37516,17 +36409,10 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { ~Test_TC_LUNIT_1_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LUNIT_1_2\n"); @@ -37672,7 +36558,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37697,7 +36582,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37722,7 +36606,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37742,7 +36625,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37768,7 +36650,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37790,7 +36671,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37815,7 +36695,6 @@ class Test_TC_LUNIT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -37853,17 +36732,10 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { ~Test_TC_LUNIT_3_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LUNIT_3_1\n"); @@ -38020,7 +36892,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38040,7 +36911,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38062,7 +36932,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38086,7 +36955,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38108,7 +36976,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38132,7 +36999,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38154,7 +37020,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38178,7 +37043,6 @@ class Test_TC_LUNIT_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38217,17 +37081,10 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { ~Test_TC_LTIME_1_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LTIME_1_2\n"); @@ -38375,7 +37232,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38402,7 +37258,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38427,7 +37282,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38456,7 +37310,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38480,7 +37333,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38504,7 +37356,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38531,7 +37382,6 @@ class Test_TC_LTIME_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTimeFormatLocalization alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -38571,17 +37421,10 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { ~Test_TC_LOWPOWER_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LOWPOWER_1_1\n"); @@ -38685,7 +37528,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38710,7 +37552,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38735,7 +37576,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38765,7 +37605,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38791,7 +37630,6 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -38829,17 +37667,10 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { ~Test_TC_KEYPADINPUT_1_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_KEYPADINPUT_1_2\n"); @@ -38980,7 +37811,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39005,7 +37835,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39030,7 +37859,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39050,7 +37878,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39070,7 +37897,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39090,7 +37916,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39116,7 +37941,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39138,7 +37962,6 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39173,17 +37996,10 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { ~Test_TC_APPLAUNCHER_1_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APPLAUNCHER_1_3\n"); @@ -39324,7 +38140,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39351,7 +38166,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39378,7 +38192,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39405,7 +38218,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39433,7 +38245,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39457,7 +38268,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39481,7 +38291,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39507,7 +38316,6 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -39544,17 +38352,10 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_1_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_1_4\n"); @@ -39695,7 +38496,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39720,7 +38520,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39745,7 +38544,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39765,7 +38563,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39791,7 +38588,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39813,7 +38609,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39835,7 +38630,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39860,7 +38654,6 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -39898,17 +38691,10 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { ~Test_TC_WAKEONLAN_1_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WAKEONLAN_1_5\n"); @@ -40023,7 +38809,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40048,7 +38833,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40073,7 +38857,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40099,7 +38882,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40121,7 +38903,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40146,7 +38927,6 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40184,17 +38964,10 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { ~Test_TC_CHANNEL_1_6() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CHANNEL_1_6\n"); @@ -40399,7 +39172,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40424,7 +39196,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40449,7 +39220,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40469,7 +39239,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40489,7 +39258,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40515,7 +39283,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40537,7 +39304,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40559,7 +39325,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40581,7 +39346,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40603,7 +39367,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40625,7 +39388,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40647,7 +39409,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40672,7 +39433,6 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -40707,17 +39467,10 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_1_7() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_1_7\n"); @@ -41001,7 +39754,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41026,7 +39778,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41051,7 +39802,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41071,7 +39821,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41091,7 +39840,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41118,7 +39866,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41140,7 +39887,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41162,7 +39908,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41184,7 +39929,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41206,7 +39950,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41228,7 +39971,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41250,7 +39992,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41274,7 +40015,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41296,7 +40036,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41318,7 +40057,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41340,7 +40078,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41362,7 +40099,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41384,7 +40120,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41406,7 +40141,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41428,7 +40162,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41450,7 +40183,6 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41485,17 +40217,10 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { ~Test_TC_AUDIOOUTPUT_1_8() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_AUDIOOUTPUT_1_8\n"); @@ -41599,7 +40324,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41624,7 +40348,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41647,7 +40370,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41675,7 +40397,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41697,7 +40418,6 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41735,17 +40455,10 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { ~Test_TC_TGTNAV_1_9() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TGTNAV_1_9\n"); @@ -41860,7 +40573,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41885,7 +40597,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41910,7 +40621,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41937,7 +40647,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41959,7 +40668,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -41981,7 +40689,6 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42016,17 +40723,10 @@ class Test_TC_TGTNAV_8_2 : public TestCommandBridge { ~Test_TC_TGTNAV_8_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TGTNAV_8_2\n"); @@ -42093,17 +40793,10 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { ~Test_TC_APBSC_1_10() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APBSC_1_10\n"); @@ -42240,7 +40933,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42265,7 +40957,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42290,7 +40981,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42321,7 +41011,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42343,7 +41032,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42365,7 +41053,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42387,7 +41074,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42412,7 +41098,6 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42450,17 +41135,10 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { ~Test_TC_CONTENTLAUNCHER_1_11() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CONTENTLAUNCHER_1_11\n"); @@ -42632,7 +41310,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42657,7 +41334,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42682,7 +41358,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42702,7 +41377,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42722,7 +41396,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42748,7 +41421,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42770,7 +41442,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42792,7 +41463,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42814,7 +41484,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42836,7 +41505,6 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -42871,17 +41539,10 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { ~Test_TC_ALOGIN_1_12() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ALOGIN_1_12\n"); @@ -42985,7 +41646,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43010,7 +41670,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43035,7 +41694,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43061,7 +41719,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43085,7 +41742,6 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43123,17 +41779,10 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { ~Test_TC_ALOGIN_12_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ALOGIN_12_1\n"); @@ -43252,7 +41901,6 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; @@ -43293,7 +41941,6 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43326,7 +41973,6 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43354,7 +42000,6 @@ class Test_TC_ALOGIN_12_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43386,17 +42031,10 @@ class Test_TC_LOWPOWER_2_1 : public TestCommandBridge { ~Test_TC_LOWPOWER_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_LOWPOWER_2_1\n"); @@ -43476,7 +42114,6 @@ class Test_TC_LOWPOWER_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43508,17 +42145,10 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge { ~Test_TC_KEYPADINPUT_3_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_KEYPADINPUT_3_2\n"); @@ -43609,7 +42239,6 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43636,7 +42265,6 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43676,17 +42304,10 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { ~Test_TC_KEYPADINPUT_3_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_KEYPADINPUT_3_3\n"); @@ -43854,7 +42475,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43881,7 +42501,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43908,7 +42527,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43935,7 +42553,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43962,7 +42579,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -43989,7 +42605,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44016,7 +42631,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44043,7 +42657,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44070,7 +42683,6 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44110,17 +42722,10 @@ class Test_TC_APPLAUNCHER_3_5 : public TestCommandBridge { ~Test_TC_APPLAUNCHER_3_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APPLAUNCHER_3_5\n"); @@ -44203,7 +42808,6 @@ class Test_TC_APPLAUNCHER_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -44239,17 +42843,10 @@ class Test_TC_APPLAUNCHER_3_6 : public TestCommandBridge { ~Test_TC_APPLAUNCHER_3_6() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APPLAUNCHER_3_6\n"); @@ -44333,7 +42930,6 @@ class Test_TC_APPLAUNCHER_3_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -44371,17 +42967,10 @@ class Test_TC_MEDIAINPUT_3_10 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_3_10() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_3_10\n"); @@ -44465,7 +43054,6 @@ class Test_TC_MEDIAINPUT_3_10 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44500,17 +43088,10 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_3_11() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_3_11\n"); @@ -44616,7 +43197,6 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44638,7 +43218,6 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44660,7 +43239,6 @@ class Test_TC_MEDIAINPUT_3_11 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44697,17 +43275,10 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_3_12() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_3_12\n"); @@ -44813,7 +43384,6 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44835,7 +43405,6 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44854,7 +43423,6 @@ class Test_TC_MEDIAINPUT_3_12 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -44886,17 +43454,10 @@ class Test_TC_MEDIAINPUT_3_13 : public TestCommandBridge { ~Test_TC_MEDIAINPUT_3_13() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAINPUT_3_13\n"); @@ -45000,7 +43561,6 @@ class Test_TC_MEDIAINPUT_3_13 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45019,7 +43579,6 @@ class Test_TC_MEDIAINPUT_3_13 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45065,17 +43624,10 @@ class Test_TC_WAKEONLAN_4_1 : public TestCommandBridge { ~Test_TC_WAKEONLAN_4_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WAKEONLAN_4_1\n"); @@ -45178,7 +43730,6 @@ class Test_TC_WAKEONLAN_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45198,7 +43749,6 @@ class Test_TC_WAKEONLAN_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45240,17 +43790,10 @@ class Test_TC_CHANNEL_5_1 : public TestCommandBridge { ~Test_TC_CHANNEL_5_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CHANNEL_5_1\n"); @@ -45335,7 +43878,6 @@ class Test_TC_CHANNEL_5_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45373,17 +43915,10 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { ~Test_TC_CHANNEL_5_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CHANNEL_5_2\n"); @@ -45498,7 +44033,6 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45518,7 +44052,6 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45554,7 +44087,6 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45600,17 +44132,10 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { ~Test_TC_CHANNEL_5_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CHANNEL_5_3\n"); @@ -45752,7 +44277,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45773,7 +44297,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45793,7 +44316,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45822,7 +44344,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45855,7 +44376,6 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -45901,17 +44421,10 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_6_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_6_1\n"); @@ -46102,7 +44615,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46126,7 +44638,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46150,7 +44661,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46184,7 +44694,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46208,7 +44717,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46242,7 +44750,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46266,7 +44773,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46300,7 +44806,6 @@ class Test_TC_MEDIAPLAYBACK_6_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46337,17 +44842,10 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_6_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_6_2\n"); @@ -46604,7 +45102,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46628,7 +45125,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46652,7 +45148,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46686,7 +45181,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46710,7 +45204,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46745,7 +45238,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46780,7 +45272,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46816,7 +45307,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46855,7 +45345,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46884,7 +45373,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46923,7 +45411,6 @@ class Test_TC_MEDIAPLAYBACK_6_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -46966,17 +45453,10 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_6_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_6_3\n"); @@ -47159,7 +45639,6 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47183,7 +45662,6 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47221,7 +45699,6 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47290,7 +45767,6 @@ class Test_TC_MEDIAPLAYBACK_6_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47341,17 +45817,10 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { ~Test_TC_MEDIAPLAYBACK_6_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MEDIAPLAYBACK_6_4\n"); @@ -47665,7 +46134,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47689,7 +46157,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47713,7 +46180,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47737,7 +46203,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47772,7 +46237,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47796,7 +46260,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47820,7 +46283,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47856,7 +46318,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47880,7 +46341,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47915,7 +46375,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47950,7 +46409,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -47996,7 +46454,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48031,7 +46488,6 @@ class Test_TC_MEDIAPLAYBACK_6_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48089,17 +46545,10 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { ~Test_TC_AUDIOOUTPUT_7_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_AUDIOOUTPUT_7_1\n"); @@ -48202,7 +46651,6 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48222,7 +46670,6 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48244,7 +46691,6 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48282,17 +46728,10 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge { ~Test_TC_AUDIOOUTPUT_7_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_AUDIOOUTPUT_7_2\n"); @@ -48398,7 +46837,6 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48422,7 +46860,6 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48469,17 +46906,10 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { ~Test_TC_TGTNAV_8_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TGTNAV_8_1\n"); @@ -48593,7 +47023,6 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48617,7 +47046,6 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48641,7 +47069,6 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48665,7 +47092,6 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48702,17 +47128,10 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { ~Test_TC_APBSC_9_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_APBSC_9_1\n"); @@ -48869,7 +47288,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48890,7 +47308,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48910,7 +47327,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48931,7 +47347,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48954,7 +47369,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48975,7 +47389,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -48997,7 +47410,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49018,7 +47430,6 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49051,17 +47462,10 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge { ~Test_TC_CONTENTLAUNCHER_10_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_CONTENTLAUNCHER_10_1\n"); @@ -49152,7 +47556,6 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49172,7 +47575,6 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49205,17 +47607,10 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { ~Test_TC_MOD_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_MOD_1_1\n"); @@ -49358,7 +47753,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49383,7 +47777,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49408,7 +47801,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49433,7 +47825,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49463,7 +47854,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49485,7 +47875,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49507,7 +47896,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49529,7 +47917,6 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49575,17 +47962,10 @@ class OTA_SuccessfulTransfer : public TestCommandBridge { ~OTA_SuccessfulTransfer() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: OTA_SuccessfulTransfer\n"); @@ -49773,7 +48153,6 @@ class OTA_SuccessfulTransfer : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -49849,7 +48228,6 @@ class OTA_SuccessfulTransfer : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOTASoftwareUpdateRequestor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -49911,17 +48289,10 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { ~Test_TC_OCC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_1_1\n"); @@ -50025,7 +48396,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50050,7 +48420,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50075,7 +48444,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50104,7 +48472,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50129,7 +48496,6 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50167,17 +48533,10 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { ~Test_TC_OCC_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_2_1\n"); @@ -50382,7 +48741,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50405,7 +48763,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50428,7 +48785,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50451,7 +48807,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50474,7 +48829,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50497,7 +48851,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50521,7 +48874,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50547,7 +48899,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50573,7 +48924,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50599,7 +48949,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50625,7 +48974,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50651,7 +48999,6 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50690,17 +49037,10 @@ class Test_TC_OCC_2_3 : public TestCommandBridge { ~Test_TC_OCC_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OCC_2_3\n"); @@ -50791,7 +49131,6 @@ class Test_TC_OCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50814,7 +49153,6 @@ class Test_TC_OCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOccupancySensing alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -50850,17 +49188,10 @@ class Test_TC_OO_1_1 : public TestCommandBridge { ~Test_TC_OO_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_1_1\n"); @@ -51002,7 +49333,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51027,7 +49357,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51052,7 +49381,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51072,7 +49400,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51099,7 +49426,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51124,7 +49450,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51148,7 +49473,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51172,7 +49496,6 @@ class Test_TC_OO_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51210,17 +49533,10 @@ class Test_TC_OO_2_1 : public TestCommandBridge { ~Test_TC_OO_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_1\n"); @@ -51344,7 +49660,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51364,7 +49679,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51384,7 +49698,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51407,7 +49720,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51430,7 +49742,6 @@ class Test_TC_OO_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51467,17 +49778,10 @@ class Test_TC_OO_2_2 : public TestCommandBridge { ~Test_TC_OO_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_2\n"); @@ -51780,7 +50084,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51799,7 +50102,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51823,7 +50125,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51842,7 +50143,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51866,7 +50166,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51885,7 +50184,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51909,7 +50207,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51928,7 +50225,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51952,7 +50248,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51971,7 +50266,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -51995,7 +50289,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52022,7 +50315,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52046,7 +50338,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52073,7 +50364,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52107,7 +50397,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52141,7 +50430,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52165,7 +50453,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52184,7 +50471,6 @@ class Test_TC_OO_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52221,17 +50507,10 @@ class Test_TC_OO_2_4 : public TestCommandBridge { ~Test_TC_OO_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_OO_2_4\n"); @@ -52606,7 +50885,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52625,7 +50903,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52673,7 +50950,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52697,7 +50973,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52745,7 +51020,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52769,7 +51043,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52817,7 +51090,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52867,7 +51139,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52891,7 +51162,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52939,7 +51209,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -52963,7 +51232,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53008,7 +51276,6 @@ class Test_TC_OO_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53045,17 +51312,10 @@ class Test_TC_PS_1_1 : public TestCommandBridge { ~Test_TC_PS_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PS_1_1\n"); @@ -53254,7 +51514,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53279,7 +51538,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53304,7 +51562,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53324,7 +51581,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53344,7 +51600,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53364,7 +51619,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53384,7 +51638,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53413,7 +51666,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53435,7 +51687,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53459,7 +51710,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53482,7 +51732,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53505,7 +51754,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53530,7 +51778,6 @@ class Test_TC_PS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -53568,17 +51815,10 @@ class Test_TC_PS_2_1 : public TestCommandBridge { ~Test_TC_PS_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PS_2_1\n"); @@ -53994,7 +52234,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54017,7 +52256,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54040,7 +52278,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54060,7 +52297,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54087,7 +52323,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54114,7 +52349,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54137,7 +52371,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54163,7 +52396,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54186,7 +52418,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54209,7 +52440,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54229,7 +52459,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54250,7 +52479,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54276,7 +52504,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54302,7 +52529,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54328,7 +52554,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54351,7 +52576,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54371,7 +52595,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54394,7 +52617,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54414,7 +52636,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54435,7 +52656,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54456,7 +52676,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54479,7 +52698,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54500,7 +52718,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54521,7 +52738,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54544,7 +52760,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54567,7 +52782,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54590,7 +52804,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54613,7 +52826,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54639,7 +52851,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54659,7 +52870,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54685,7 +52895,6 @@ class Test_TC_PS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSource alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -54718,17 +52927,10 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { ~Test_TC_PRS_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_1_1\n"); @@ -54913,7 +53115,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -54940,7 +53141,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -54967,7 +53167,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -54989,7 +53188,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55020,7 +53218,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55044,7 +53241,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55068,7 +53264,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55092,7 +53287,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55116,7 +53310,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55140,7 +53333,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55164,7 +53356,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55191,7 +53382,6 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55231,17 +53421,10 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { ~Test_TC_PRS_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_2_1\n"); @@ -55409,7 +53592,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55437,7 +53619,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55465,7 +53646,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55493,7 +53673,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55518,7 +53697,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55546,7 +53724,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55574,7 +53751,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55602,7 +53778,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55627,7 +53802,6 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55665,17 +53839,10 @@ class Test_TC_PRS_2_2 : public TestCommandBridge { ~Test_TC_PRS_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PRS_2_2\n"); @@ -55786,7 +53953,6 @@ class Test_TC_PRS_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55829,7 +53995,6 @@ class Test_TC_PRS_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPressureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -55867,17 +54032,10 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { ~Test_TC_PCC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_1_1\n"); @@ -56256,7 +54414,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56283,7 +54440,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56310,7 +54466,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56332,7 +54487,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56354,7 +54508,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56376,7 +54529,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56398,7 +54550,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56420,7 +54571,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56442,7 +54592,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56464,7 +54613,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56499,7 +54647,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56523,7 +54670,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56547,7 +54693,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56571,7 +54716,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56595,7 +54739,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56619,7 +54762,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56643,7 +54785,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56667,7 +54808,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56691,7 +54831,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56715,7 +54854,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56739,7 +54877,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56763,7 +54900,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56787,7 +54923,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56811,7 +54946,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56835,7 +54969,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56859,7 +54992,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56883,7 +55015,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56910,7 +55041,6 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -56950,17 +55080,10 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { ~Test_TC_PCC_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_1\n"); @@ -57282,7 +55405,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57310,7 +55432,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57338,7 +55459,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57366,7 +55486,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57394,7 +55513,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57422,7 +55540,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57450,7 +55567,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57478,7 +55594,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57506,7 +55621,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57534,7 +55648,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57562,7 +55675,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57590,7 +55702,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57618,7 +55729,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57646,7 +55756,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57671,7 +55780,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57696,7 +55804,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57721,7 +55828,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57749,7 +55855,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57777,7 +55882,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57805,7 +55909,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57833,7 +55936,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57861,7 +55963,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57886,7 +55987,6 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -57924,17 +56024,10 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { ~Test_TC_PCC_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_2\n"); @@ -58092,7 +56185,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58116,7 +56208,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58142,7 +56233,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58166,7 +56256,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58192,7 +56281,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58218,7 +56306,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58244,7 +56331,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58268,7 +56354,6 @@ class Test_TC_PCC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58307,17 +56392,10 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { ~Test_TC_PCC_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_3\n"); @@ -58540,7 +56618,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58564,7 +56641,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58590,7 +56666,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58614,7 +56689,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58640,7 +56714,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58664,7 +56737,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58690,7 +56762,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58714,7 +56785,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58740,7 +56810,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58764,7 +56833,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58790,7 +56858,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58814,7 +56881,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58840,7 +56906,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58864,7 +56929,6 @@ class Test_TC_PCC_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -58903,17 +56967,10 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { ~Test_TC_PCC_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PCC_2_4\n"); @@ -59114,7 +57171,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59138,7 +57194,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59165,7 +57220,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59189,7 +57243,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59216,7 +57269,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59240,7 +57292,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59267,7 +57318,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59292,7 +57342,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59319,7 +57368,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59344,7 +57392,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59371,7 +57418,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59396,7 +57442,6 @@ class Test_TC_PCC_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59436,17 +57481,10 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { ~Test_TC_PSCFG_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PSCFG_1_1\n"); @@ -59550,7 +57588,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59577,7 +57614,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59604,7 +57640,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59633,7 +57668,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59660,7 +57694,6 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59700,17 +57733,10 @@ class Test_TC_PSCFG_2_1 : public TestCommandBridge { ~Test_TC_PSCFG_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_PSCFG_2_1\n"); @@ -59790,7 +57816,6 @@ class Test_TC_PSCFG_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterPowerSourceConfiguration alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -59825,17 +57850,10 @@ class Test_TC_RH_1_1 : public TestCommandBridge { ~Test_TC_RH_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_RH_1_1\n"); @@ -59950,7 +57968,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -59977,7 +57994,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60004,7 +58020,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60035,7 +58050,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60059,7 +58073,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60086,7 +58099,6 @@ class Test_TC_RH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60126,17 +58138,10 @@ class Test_TC_RH_2_1 : public TestCommandBridge { ~Test_TC_RH_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_RH_2_1\n"); @@ -60249,7 +58254,6 @@ class Test_TC_RH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60277,7 +58281,6 @@ class Test_TC_RH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60305,7 +58308,6 @@ class Test_TC_RH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60333,7 +58335,6 @@ class Test_TC_RH_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterRelativeHumidityMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -60371,17 +58372,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { ~Test_TC_SC_5_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_SC_5_1\n"); @@ -60405,84 +58399,88 @@ class Test_TC_SC_5_1 : public TestCommandBridge { err = TestWaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : TH adds ACL Operate privileges for Group 0x0103\n"); - err = TestThAddsAclOperatePrivilegesForGroup0x0103_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Read the commissioner node ID\n"); + err = TestReadTheCommissionerNodeId_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : TH sends KeySetWrite command with incorrect key\n"); - err = TestThSendsKeySetWriteCommandWithIncorrectKey_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : TH adds ACL Operate privileges for Group 0x0103\n"); + err = TestThAddsAclOperatePrivilegesForGroup0x0103_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : TH sends KeySetWrite command with TH key\n"); - err = TestThSendsKeySetWriteCommandWithThKey_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : TH sends KeySetWrite command with incorrect key\n"); + err = TestThSendsKeySetWriteCommandWithIncorrectKey_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : TH binds GroupId to GroupKeySet\n"); - err = TestThBindsGroupIdToGroupKeySet_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : TH sends KeySetWrite command with TH key\n"); + err = TestThSendsKeySetWriteCommandWithThKey_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : TH sends RemoveAllGroups command\n"); - err = TestThSendsRemoveAllGroupsCommand_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : TH binds GroupId to GroupKeySet\n"); + err = TestThBindsGroupIdToGroupKeySet_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends AddGroup command\n"); - err = TestThSendsAddGroupCommand_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends RemoveAllGroups command\n"); + err = TestThSendsRemoveAllGroupsCommand_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : TH sends ViewGroup command\n"); - if (ShouldSkip("G.S.F00")) { - NextTest(); - return; - } - err = TestThSendsViewGroupCommand_7(); + ChipLogProgress(chipTool, " ***** Test Step 7 : TH sends AddGroup command\n"); + err = TestThSendsAddGroupCommand_7(); break; case 8: ChipLogProgress(chipTool, " ***** Test Step 8 : TH sends ViewGroup command\n"); - if (ShouldSkip("!(G.S.F00)")) { + if (ShouldSkip("G.S.F00")) { NextTest(); return; } err = TestThSendsViewGroupCommand_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : TH sends KeySetRead\n"); - err = TestThSendsKeySetRead_9(); - break; - case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads GroupTable attribute\n"); - if (ShouldSkip("G.S.F00")) { + ChipLogProgress(chipTool, " ***** Test Step 9 : TH sends ViewGroup command\n"); + if (ShouldSkip("!(G.S.F00)")) { NextTest(); return; } - err = TestThReadsGroupTableAttribute_10(); + err = TestThSendsViewGroupCommand_9(); + break; + case 10: + ChipLogProgress(chipTool, " ***** Test Step 10 : TH sends KeySetRead\n"); + err = TestThSendsKeySetRead_10(); break; case 11: ChipLogProgress(chipTool, " ***** Test Step 11 : TH reads GroupTable attribute\n"); - if (ShouldSkip("!(G.S.F00)")) { + if (ShouldSkip("G.S.F00")) { NextTest(); return; } err = TestThReadsGroupTableAttribute_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : TH removes the GroupKeySet\n"); - err = TestThRemovesTheGroupKeySet_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : TH reads GroupTable attribute\n"); + if (ShouldSkip("!(G.S.F00)")) { + NextTest(); + return; + } + err = TestThReadsGroupTableAttribute_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : TH verifies the corresponding GroupKeyMap entry has been removed\n"); - err = TestThVerifiesTheCorrespondingGroupKeyMapEntryHasBeenRemoved_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : TH removes the GroupKeySet\n"); + err = TestThRemovesTheGroupKeySet_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : TH cleans up groups using RemoveAllGroups command\n"); - err = TestThCleansUpGroupsUsingRemoveAllGroupsCommand_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : TH verifies the corresponding GroupKeyMap entry has been removed\n"); + err = TestThVerifiesTheCorrespondingGroupKeyMapEntryHasBeenRemoved_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : TH verifies the group has been removed in the GroupTable\n"); - err = TestThVerifiesTheGroupHasBeenRemovedInTheGroupTable_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : TH cleans up groups using RemoveAllGroups command\n"); + err = TestThCleansUpGroupsUsingRemoveAllGroupsCommand_15(); break; case 16: - ChipLogProgress(chipTool, " ***** Test Step 16 : TH removes ACL Operate privileges for Group 0x0103\n"); - err = TestThRemovesAclOperatePrivilegesForGroup0x0103_16(); + ChipLogProgress(chipTool, " ***** Test Step 16 : TH verifies the group has been removed in the GroupTable\n"); + err = TestThVerifiesTheGroupHasBeenRemovedInTheGroupTable_16(); + break; + case 17: + ChipLogProgress(chipTool, " ***** Test Step 17 : TH removes ACL Operate privileges for Group 0x0103\n"); + err = TestThRemovesAclOperatePrivilegesForGroup0x0103_17(); break; } @@ -60546,6 +58544,9 @@ class Test_TC_SC_5_1 : public TestCommandBridge { case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 17: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -60559,7 +58560,7 @@ class Test_TC_SC_5_1 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 17; + const uint16_t mTestCount = 18; chip::Optional mNodeId; chip::Optional mCluster; @@ -60573,12 +58574,24 @@ class Test_TC_SC_5_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } + NSNumber * _Nonnull commissionerNodeId; - CHIP_ERROR TestThAddsAclOperatePrivilegesForGroup0x0103_1() + CHIP_ERROR TestReadTheCommissionerNodeId_1() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeId = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } + + CHIP_ERROR TestThAddsAclOperatePrivilegesForGroup0x0103_2() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60590,7 +58603,7 @@ class Test_TC_SC_5_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -60621,11 +58634,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsKeySetWriteCommandWithIncorrectKey_2() + CHIP_ERROR TestThSendsKeySetWriteCommandWithIncorrectKey_3() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60662,11 +58674,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsKeySetWriteCommandWithThKey_3() + CHIP_ERROR TestThSendsKeySetWriteCommandWithThKey_4() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60703,11 +58714,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThBindsGroupIdToGroupKeySet_4() + CHIP_ERROR TestThBindsGroupIdToGroupKeySet_5() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60735,11 +58745,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsRemoveAllGroupsCommand_5() + CHIP_ERROR TestThSendsRemoveAllGroupsCommand_6() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60754,11 +58763,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsAddGroupCommand_6() + CHIP_ERROR TestThSendsAddGroupCommand_7() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60777,11 +58785,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsViewGroupCommand_7() + CHIP_ERROR TestThSendsViewGroupCommand_8() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60814,11 +58821,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsViewGroupCommand_8() + CHIP_ERROR TestThSendsViewGroupCommand_9() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -60851,11 +58857,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsKeySetRead_9() + CHIP_ERROR TestThSendsKeySetRead_10() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60903,11 +58908,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsGroupTableAttribute_10() + CHIP_ERROR TestThReadsGroupTableAttribute_11() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60945,11 +58949,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsGroupTableAttribute_11() + CHIP_ERROR TestThReadsGroupTableAttribute_12() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -60986,11 +58989,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThRemovesTheGroupKeySet_12() + CHIP_ERROR TestThRemovesTheGroupKeySet_13() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61010,11 +59012,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThVerifiesTheCorrespondingGroupKeyMapEntryHasBeenRemoved_13() + CHIP_ERROR TestThVerifiesTheCorrespondingGroupKeyMapEntryHasBeenRemoved_14() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61041,11 +59042,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThCleansUpGroupsUsingRemoveAllGroupsCommand_14() + CHIP_ERROR TestThCleansUpGroupsUsingRemoveAllGroupsCommand_15() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61060,11 +59060,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThVerifiesTheGroupHasBeenRemovedInTheGroupTable_15() + CHIP_ERROR TestThVerifiesTheGroupHasBeenRemovedInTheGroupTable_16() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61090,11 +59089,10 @@ class Test_TC_SC_5_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThRemovesAclOperatePrivilegesForGroup0x0103_16() + CHIP_ERROR TestThRemovesAclOperatePrivilegesForGroup0x0103_17() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61106,7 +59104,7 @@ class Test_TC_SC_5_1 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -61143,17 +59141,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { ~Test_TC_SC_5_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_SC_5_2\n"); @@ -61177,52 +59168,56 @@ class Test_TC_SC_5_2 : public TestCommandBridge { err = TestWaitForTheCommissionedDeviceToBeRetrieved_0(); break; case 1: - ChipLogProgress(chipTool, " ***** Test Step 1 : TH adds ACL Operate privileges for Group 0x0103\n"); - err = TestThAddsAclOperatePrivilegesForGroup0x0103_1(); + ChipLogProgress(chipTool, " ***** Test Step 1 : Read the commissioner node ID\n"); + err = TestReadTheCommissionerNodeId_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : TH sends KeySetWrite command with TH key\n"); - err = TestThSendsKeySetWriteCommandWithThKey_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : TH adds ACL Operate privileges for Group 0x0103\n"); + err = TestThAddsAclOperatePrivilegesForGroup0x0103_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : TH binds GroupId to GroupKeySet\n"); - err = TestThBindsGroupIdToGroupKeySet_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : TH sends KeySetWrite command with TH key\n"); + err = TestThSendsKeySetWriteCommandWithThKey_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : TH sends RemoveAllGroups command\n"); - err = TestThSendsRemoveAllGroupsCommand_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : TH binds GroupId to GroupKeySet\n"); + err = TestThBindsGroupIdToGroupKeySet_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : TH sends AddGroup command\n"); - err = TestThSendsAddGroupCommand_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : TH sends RemoveAllGroups command\n"); + err = TestThSendsRemoveAllGroupsCommand_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends ViewGroup command using group messaging\n"); - if (ShouldSkip("G.S.F00")) { - NextTest(); - return; - } - err = TestThSendsViewGroupCommandUsingGroupMessaging_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : TH sends AddGroup command\n"); + err = TestThSendsAddGroupCommand_6(); break; case 7: ChipLogProgress(chipTool, " ***** Test Step 7 : TH sends ViewGroup command using group messaging\n"); - if (ShouldSkip("!(G.S.F00)")) { + if (ShouldSkip("G.S.F00")) { NextTest(); return; } err = TestThSendsViewGroupCommandUsingGroupMessaging_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : TH removes the GroupKeySet\n"); - err = TestThRemovesTheGroupKeySet_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : TH sends ViewGroup command using group messaging\n"); + if (ShouldSkip("!(G.S.F00)")) { + NextTest(); + return; + } + err = TestThSendsViewGroupCommandUsingGroupMessaging_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : TH cleans up groups using RemoveAllGroups command\n"); - err = TestThCleansUpGroupsUsingRemoveAllGroupsCommand_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : TH removes the GroupKeySet\n"); + err = TestThRemovesTheGroupKeySet_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : TH removes ACL Operate privileges for Group 0x0103\n"); - err = TestThRemovesAclOperatePrivilegesForGroup0x0103_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : TH cleans up groups using RemoveAllGroups command\n"); + err = TestThCleansUpGroupsUsingRemoveAllGroupsCommand_10(); + break; + case 11: + ChipLogProgress(chipTool, " ***** Test Step 11 : TH removes ACL Operate privileges for Group 0x0103\n"); + err = TestThRemovesAclOperatePrivilegesForGroup0x0103_11(); break; } @@ -61268,6 +59263,9 @@ class Test_TC_SC_5_2 : public TestCommandBridge { case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 11: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -61281,7 +59279,7 @@ class Test_TC_SC_5_2 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 11; + const uint16_t mTestCount = 12; chip::Optional mNodeId; chip::Optional mCluster; @@ -61295,12 +59293,24 @@ class Test_TC_SC_5_2 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } + NSNumber * _Nonnull commissionerNodeId; + + CHIP_ERROR TestReadTheCommissionerNodeId_1() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeId = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } - CHIP_ERROR TestThAddsAclOperatePrivilegesForGroup0x0103_1() + CHIP_ERROR TestThAddsAclOperatePrivilegesForGroup0x0103_2() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61312,7 +59322,7 @@ class Test_TC_SC_5_2 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -61343,11 +59353,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsKeySetWriteCommandWithThKey_2() + CHIP_ERROR TestThSendsKeySetWriteCommandWithThKey_3() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61384,11 +59393,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThBindsGroupIdToGroupKeySet_3() + CHIP_ERROR TestThBindsGroupIdToGroupKeySet_4() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61416,11 +59424,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsRemoveAllGroupsCommand_4() + CHIP_ERROR TestThSendsRemoveAllGroupsCommand_5() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61435,11 +59442,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsAddGroupCommand_5() + CHIP_ERROR TestThSendsAddGroupCommand_6() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61458,11 +59464,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsViewGroupCommandUsingGroupMessaging_6() + CHIP_ERROR TestThSendsViewGroupCommandUsingGroupMessaging_7() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61495,11 +59500,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsViewGroupCommandUsingGroupMessaging_7() + CHIP_ERROR TestThSendsViewGroupCommandUsingGroupMessaging_8() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61532,11 +59536,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThRemovesTheGroupKeySet_8() + CHIP_ERROR TestThRemovesTheGroupKeySet_9() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -61556,11 +59559,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThCleansUpGroupsUsingRemoveAllGroupsCommand_9() + CHIP_ERROR TestThCleansUpGroupsUsingRemoveAllGroupsCommand_10() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61575,11 +59577,10 @@ class Test_TC_SC_5_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThRemovesAclOperatePrivilegesForGroup0x0103_10() + CHIP_ERROR TestThRemovesAclOperatePrivilegesForGroup0x0103_11() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61591,7 +59592,7 @@ class Test_TC_SC_5_2 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeId copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -61628,17 +59629,10 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { ~Test_TC_SWTCH_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_SWTCH_1_1\n"); @@ -61817,7 +59811,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61842,7 +59835,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61867,7 +59859,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61887,7 +59878,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61907,7 +59897,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61927,7 +59916,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61947,7 +59935,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61967,7 +59954,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -61996,7 +59982,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62024,7 +60009,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62044,7 +60028,6 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62082,17 +60065,10 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { ~Test_TC_TMP_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TMP_1_1\n"); @@ -62207,7 +60183,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62234,7 +60209,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62261,7 +60235,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62292,7 +60265,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62316,7 +60288,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62343,7 +60314,6 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62383,17 +60353,10 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { ~Test_TC_TMP_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TMP_2_1\n"); @@ -62506,7 +60469,6 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62534,7 +60496,6 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62562,7 +60523,6 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62590,7 +60550,6 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTemperatureMeasurement alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -62628,17 +60587,10 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { ~Test_TC_TSTAT_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSTAT_1_1\n"); @@ -62935,7 +60887,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62960,7 +60911,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -62985,7 +60935,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63005,7 +60954,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63025,7 +60973,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63045,7 +60992,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63065,7 +61011,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63085,7 +61030,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63105,7 +61049,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63134,7 +61077,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63156,7 +61098,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63178,7 +61119,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63200,7 +61140,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63222,7 +61161,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63244,7 +61182,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63268,7 +61205,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63292,7 +61228,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63316,7 +61251,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63340,7 +61274,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63362,7 +61295,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63387,7 +61319,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -63420,17 +61351,10 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { ~Test_TC_TSUIC_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_1_1\n"); @@ -63534,7 +61458,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63561,7 +61484,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63588,7 +61510,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63619,7 +61540,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63646,7 +61566,6 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63686,17 +61605,10 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { ~Test_TC_TSUIC_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_2_1\n"); @@ -63798,7 +61710,6 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63823,7 +61734,6 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63848,7 +61758,6 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -63886,17 +61795,10 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { ~Test_TC_TSUIC_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_TSUIC_2_2\n"); @@ -64367,7 +62269,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64404,7 +62305,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64415,6 +62315,11 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + { + id actualValue = value; + VerifyOrReturn(CheckValue("TemperatureDisplayMode", actualValue, 0U)); + } + NextTest(); }]; @@ -64425,7 +62330,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64462,7 +62366,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64488,7 +62391,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64518,7 +62420,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64544,7 +62445,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64578,7 +62478,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64604,7 +62503,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64638,7 +62536,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64664,7 +62561,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64698,7 +62594,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64724,7 +62619,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64758,7 +62652,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64784,7 +62677,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64818,7 +62710,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64844,7 +62735,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64878,7 +62768,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64904,7 +62793,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64934,7 +62822,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64960,7 +62847,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -64996,7 +62882,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65022,7 +62907,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65058,7 +62942,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65084,7 +62967,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65114,7 +62996,6 @@ class Test_TC_TSUIC_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -65153,17 +63034,10 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { ~Test_TC_DGTHREAD_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGTHREAD_1_1\n"); @@ -65388,7 +63262,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65415,7 +63288,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65442,7 +63314,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65464,7 +63335,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65486,7 +63356,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65508,7 +63377,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65530,7 +63398,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65575,7 +63442,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65599,7 +63465,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65630,7 +63495,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65687,7 +63551,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65711,7 +63574,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65735,7 +63597,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65759,7 +63620,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65783,7 +63643,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -65823,17 +63682,10 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { ~Test_TC_ULABEL_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_1_1\n"); @@ -65937,7 +63789,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -65962,7 +63813,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -65987,7 +63837,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66014,7 +63863,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66039,7 +63887,6 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66077,17 +63924,10 @@ class Test_TC_ULABEL_2_1 : public TestCommandBridge { ~Test_TC_ULABEL_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_1\n"); @@ -66167,7 +64007,6 @@ class Test_TC_ULABEL_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66200,17 +64039,10 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge { ~Test_TC_ULABEL_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_2\n"); @@ -66301,7 +64133,6 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66342,7 +64173,6 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66391,17 +64221,10 @@ class Test_TC_ULABEL_2_3 : public TestCommandBridge { ~Test_TC_ULABEL_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_3\n"); @@ -66492,7 +64315,6 @@ class Test_TC_ULABEL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66525,7 +64347,6 @@ class Test_TC_ULABEL_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66571,17 +64392,10 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { ~Test_TC_ULABEL_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_ULABEL_2_4\n"); @@ -66694,7 +64508,6 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66727,7 +64540,6 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66757,7 +64569,6 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66786,7 +64597,6 @@ class Test_TC_ULABEL_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -66825,17 +64635,10 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { ~Test_TC_DGWIFI_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGWIFI_1_1\n"); @@ -67019,7 +64822,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67046,7 +64848,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67073,7 +64874,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67095,7 +64895,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67117,7 +64916,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67150,7 +64948,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67178,7 +64975,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67203,7 +64999,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67227,7 +65022,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67254,7 +65048,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67278,7 +65071,6 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67318,17 +65110,10 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { ~Test_TC_DGWIFI_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGWIFI_2_1\n"); @@ -67540,7 +65325,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67566,7 +65350,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67592,7 +65375,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67620,7 +65402,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67648,7 +65429,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67676,7 +65456,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67704,7 +65483,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67732,7 +65510,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67760,7 +65537,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67788,7 +65564,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67816,7 +65591,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67844,7 +65618,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67870,7 +65643,6 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -67909,17 +65681,10 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { ~Test_TC_DGWIFI_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGWIFI_2_3\n"); @@ -68065,7 +65830,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68086,7 +65850,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68114,7 +65877,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68142,7 +65904,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68170,7 +65931,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68198,7 +65958,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68226,7 +65985,6 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWiFiNetworkDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -68267,17 +66025,10 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { ~Test_TC_WNCV_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_1_1\n"); @@ -68553,7 +66304,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68581,7 +66331,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68606,7 +66355,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68626,7 +66374,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68646,7 +66393,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68666,7 +66412,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68686,7 +66431,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68706,7 +66450,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68737,7 +66480,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68759,7 +66501,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68782,7 +66523,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68805,7 +66545,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68828,7 +66567,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68851,7 +66589,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68875,7 +66612,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68897,7 +66633,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68919,7 +66654,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68941,7 +66675,6 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -68979,17 +66712,10 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { ~Test_TC_WNCV_2_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_1\n"); @@ -69321,7 +67047,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69344,7 +67069,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69367,7 +67091,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69390,7 +67113,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69413,7 +67135,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69436,7 +67157,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69458,7 +67178,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69486,7 +67205,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69514,7 +67232,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69543,7 +67260,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69572,7 +67288,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69595,7 +67310,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69618,7 +67332,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69641,7 +67354,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69664,7 +67376,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69687,7 +67398,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69710,7 +67420,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69733,7 +67442,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69759,7 +67467,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69785,7 +67492,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69808,7 +67514,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69831,7 +67536,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69859,7 +67563,6 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -69900,17 +67603,10 @@ class Test_TC_WNCV_2_2 : public TestCommandBridge { ~Test_TC_WNCV_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_2\n"); @@ -70015,17 +67711,10 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { ~Test_TC_WNCV_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_3\n"); @@ -70282,7 +67971,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70304,7 +67992,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70326,7 +68013,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70348,7 +68034,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70370,7 +68055,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70393,7 +68077,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70418,7 +68101,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70438,7 +68120,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70460,7 +68141,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70482,7 +68162,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70504,7 +68183,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70523,7 +68201,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70545,7 +68222,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70566,7 +68242,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70591,7 +68266,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70613,7 +68287,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70632,7 +68305,6 @@ class Test_TC_WNCV_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70667,17 +68339,10 @@ class Test_TC_WNCV_2_4 : public TestCommandBridge { ~Test_TC_WNCV_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_4\n"); @@ -70780,17 +68445,10 @@ class Test_TC_WNCV_2_5 : public TestCommandBridge { ~Test_TC_WNCV_2_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_2_5\n"); @@ -70870,7 +68528,6 @@ class Test_TC_WNCV_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -70906,17 +68563,10 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { ~Test_TC_WNCV_3_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_1\n"); @@ -71291,7 +68941,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71318,7 +68967,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71347,7 +68995,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71375,7 +69022,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71404,7 +69050,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71434,7 +69079,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71455,7 +69099,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71489,7 +69132,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71516,7 +69158,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71541,7 +69182,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71574,7 +69214,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71594,7 +69233,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71614,7 +69252,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71634,7 +69271,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71654,7 +69290,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71682,7 +69317,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71711,7 +69345,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71739,7 +69372,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71768,7 +69400,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71796,7 +69427,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71823,7 +69453,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71855,7 +69484,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71883,7 +69511,6 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -71924,17 +69551,10 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { ~Test_TC_WNCV_3_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_2\n"); @@ -72309,7 +69929,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72336,7 +69955,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72365,7 +69983,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72393,7 +70010,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72422,7 +70038,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72452,7 +70067,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72473,7 +70087,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72507,7 +70120,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72534,7 +70146,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72559,7 +70170,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72592,7 +70202,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72612,7 +70221,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72632,7 +70240,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72652,7 +70259,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72672,7 +70278,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72700,7 +70305,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72729,7 +70333,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72757,7 +70360,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72786,7 +70388,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72814,7 +70415,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72841,7 +70441,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72873,7 +70472,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72901,7 +70499,6 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -72942,17 +70539,10 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { ~Test_TC_WNCV_3_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_3\n"); @@ -73190,7 +70780,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73217,7 +70806,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73244,7 +70832,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73275,7 +70862,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73296,7 +70882,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73330,7 +70915,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73357,7 +70941,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73389,7 +70972,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73414,7 +70996,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73446,7 +71027,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73478,7 +71058,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73510,7 +71089,6 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73556,17 +71134,10 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { ~Test_TC_WNCV_3_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_4\n"); @@ -73735,7 +71306,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73762,7 +71332,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73789,7 +71358,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73813,7 +71381,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73839,7 +71406,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73864,7 +71430,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73890,7 +71455,6 @@ class Test_TC_WNCV_3_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -73930,17 +71494,10 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { ~Test_TC_WNCV_3_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_3_5\n"); @@ -74109,7 +71666,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74136,7 +71692,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74163,7 +71718,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74187,7 +71741,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74213,7 +71766,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74238,7 +71790,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74264,7 +71815,6 @@ class Test_TC_WNCV_3_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74303,17 +71853,10 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { ~Test_TC_WNCV_4_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_1\n"); @@ -74558,7 +72101,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74585,7 +72127,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74609,7 +72150,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74639,7 +72179,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74672,7 +72211,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74696,7 +72234,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74722,7 +72259,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74747,7 +72283,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74777,7 +72312,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74810,7 +72344,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74834,7 +72367,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74860,7 +72392,6 @@ class Test_TC_WNCV_4_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -74899,17 +72430,10 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { ~Test_TC_WNCV_4_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_2\n"); @@ -75154,7 +72678,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75181,7 +72704,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75205,7 +72727,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75235,7 +72756,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75268,7 +72788,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75292,7 +72811,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75318,7 +72836,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75343,7 +72860,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75373,7 +72889,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75406,7 +72921,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75430,7 +72944,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75456,7 +72969,6 @@ class Test_TC_WNCV_4_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75494,17 +73006,10 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { ~Test_TC_WNCV_4_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_3\n"); @@ -75632,7 +73137,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75664,7 +73168,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75699,7 +73202,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75724,7 +73226,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75749,7 +73250,6 @@ class Test_TC_WNCV_4_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75787,17 +73287,10 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { ~Test_TC_WNCV_4_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_4\n"); @@ -75925,7 +73418,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75957,7 +73449,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -75992,7 +73483,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76017,7 +73507,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76042,7 +73531,6 @@ class Test_TC_WNCV_4_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76080,17 +73568,10 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { ~Test_TC_WNCV_4_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_WNCV_4_5\n"); @@ -76313,7 +73794,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76332,7 +73812,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76363,7 +73842,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76390,7 +73868,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76421,7 +73898,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76449,7 +73925,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76477,7 +73952,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76530,7 +74004,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76561,7 +74034,6 @@ class Test_TC_WNCV_4_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWindowCovering alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76605,17 +74077,10 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { ~TV_TargetNavigatorCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_TargetNavigatorCluster\n"); @@ -76705,7 +74170,6 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76737,7 +74201,6 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76761,7 +74224,6 @@ class TV_TargetNavigatorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterTargetNavigator alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76808,17 +74270,10 @@ class TV_AudioOutputCluster : public TestCommandBridge { ~TV_AudioOutputCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_AudioOutputCluster\n"); @@ -76922,7 +74377,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76958,7 +74412,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -76982,7 +74435,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77004,7 +74456,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77027,7 +74478,6 @@ class TV_AudioOutputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAudioOutput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77076,17 +74526,10 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { ~TV_ApplicationLauncherCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_ApplicationLauncherCluster\n"); @@ -77190,7 +74633,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77218,7 +74660,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77245,7 +74686,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77286,7 +74726,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77325,7 +74764,6 @@ class TV_ApplicationLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; @@ -77377,17 +74815,10 @@ class TV_KeypadInputCluster : public TestCommandBridge { ~TV_KeypadInputCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_KeypadInputCluster\n"); @@ -77463,7 +74894,6 @@ class TV_KeypadInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterKeypadInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77503,17 +74933,10 @@ class TV_AccountLoginCluster : public TestCommandBridge { ~TV_AccountLoginCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_AccountLoginCluster\n"); @@ -77603,7 +75026,6 @@ class TV_AccountLoginCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77631,7 +75053,6 @@ class TV_AccountLoginCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77654,7 +75075,6 @@ class TV_AccountLoginCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccountLogin alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77686,17 +75106,10 @@ class TV_WakeOnLanCluster : public TestCommandBridge { ~TV_WakeOnLanCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_WakeOnLanCluster\n"); @@ -77772,7 +75185,6 @@ class TV_WakeOnLanCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterWakeOnLAN alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77809,17 +75221,10 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { ~TV_ApplicationBasicCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_ApplicationBasicCluster\n"); @@ -77944,7 +75349,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77968,7 +75372,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -77992,7 +75395,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78016,7 +75418,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78040,7 +75441,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78064,7 +75464,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78092,7 +75491,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78116,7 +75514,6 @@ class TV_ApplicationBasicCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterApplicationBasic alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78155,17 +75552,10 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { ~TV_MediaPlaybackCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_MediaPlaybackCluster\n"); @@ -78381,7 +75771,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78405,7 +75794,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78430,7 +75818,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78455,7 +75842,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78486,7 +75872,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78510,7 +75895,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78535,7 +75919,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78560,7 +75943,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78589,7 +75971,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78618,7 +75999,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78647,7 +76027,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78677,7 +76056,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78707,7 +76085,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78736,7 +76113,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78765,7 +76141,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78795,7 +76170,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78828,7 +76202,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78859,7 +76232,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78892,7 +76264,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78923,7 +76294,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78955,7 +76325,6 @@ class TV_MediaPlaybackCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaPlayback alloc] initWithDevice:device endpointID:@(3) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -78999,17 +76368,10 @@ class TV_ChannelCluster : public TestCommandBridge { ~TV_ChannelCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_ChannelCluster\n"); @@ -79120,7 +76482,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79174,7 +76535,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79206,7 +76566,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79238,7 +76597,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79271,7 +76629,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79294,7 +76651,6 @@ class TV_ChannelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterChannel alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79329,17 +76685,10 @@ class TV_LowPowerCluster : public TestCommandBridge { ~TV_LowPowerCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_LowPowerCluster\n"); @@ -79415,7 +76764,6 @@ class TV_LowPowerCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLowPower alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79447,17 +76795,10 @@ class TV_ContentLauncherCluster : public TestCommandBridge { ~TV_ContentLauncherCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_ContentLauncherCluster\n"); @@ -79554,7 +76895,6 @@ class TV_ContentLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79580,7 +76920,6 @@ class TV_ContentLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79604,7 +76943,6 @@ class TV_ContentLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79656,7 +76994,6 @@ class TV_ContentLauncherCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterContentLauncher alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -79900,17 +77237,10 @@ class TV_MediaInputCluster : public TestCommandBridge { ~TV_MediaInputCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TV_MediaInputCluster\n"); @@ -80028,7 +77358,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80064,7 +77393,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80088,7 +77416,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80110,7 +77437,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80129,7 +77455,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80148,7 +77473,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80171,7 +77495,6 @@ class TV_MediaInputCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterMediaInput alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80221,17 +77544,10 @@ class TestCASERecovery : public TestCommandBridge { ~TestCASERecovery() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestCASERecovery\n"); @@ -80342,7 +77658,6 @@ class TestCASERecovery : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80383,7 +77698,6 @@ class TestCASERecovery : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80413,7 +77727,6 @@ class TestCASERecovery : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -80450,17 +77763,10 @@ class TestCluster : public TestCommandBridge { ~TestCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestCluster\n"); @@ -84065,7 +81371,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84084,7 +81389,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84104,7 +81408,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84129,7 +81432,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84158,7 +81460,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84185,7 +81486,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84209,7 +81509,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84231,7 +81530,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84255,7 +81553,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84277,7 +81574,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84301,7 +81597,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84325,7 +81620,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84347,7 +81641,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84371,7 +81664,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84393,7 +81685,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84417,7 +81708,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84441,7 +81731,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84463,7 +81752,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84487,7 +81775,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84509,7 +81796,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84533,7 +81819,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84557,7 +81842,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84579,7 +81863,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84603,7 +81886,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84625,7 +81907,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84649,7 +81930,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84673,7 +81953,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84695,7 +81974,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84719,7 +81997,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84741,7 +82018,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84765,7 +82041,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84789,7 +82064,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84811,7 +82085,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84835,7 +82108,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84857,7 +82129,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84881,7 +82152,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84905,7 +82175,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84927,7 +82196,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84951,7 +82219,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84973,7 +82240,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -84997,7 +82263,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85021,7 +82286,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85043,7 +82307,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85067,7 +82330,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85089,7 +82351,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85113,7 +82374,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85137,7 +82397,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85159,7 +82418,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85183,7 +82441,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85205,7 +82462,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85229,7 +82485,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85253,7 +82508,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85275,7 +82529,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85299,7 +82552,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85321,7 +82573,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85345,7 +82596,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85367,7 +82617,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85391,7 +82640,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85415,7 +82663,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85437,7 +82684,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85461,7 +82707,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85483,7 +82728,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85507,7 +82751,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85529,7 +82772,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85553,7 +82795,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85577,7 +82818,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85599,7 +82839,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85623,7 +82862,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85645,7 +82883,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85669,7 +82906,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85691,7 +82927,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85715,7 +82950,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85739,7 +82973,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85761,7 +82994,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85785,7 +83017,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85807,7 +83038,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85831,7 +83061,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85853,7 +83082,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85877,7 +83105,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85901,7 +83128,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85923,7 +83149,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85947,7 +83172,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85969,7 +83193,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -85993,7 +83216,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86015,7 +83237,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86039,7 +83260,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86061,7 +83281,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86085,7 +83304,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86109,7 +83327,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86131,7 +83348,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86155,7 +83371,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86177,7 +83392,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86201,7 +83415,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86223,7 +83436,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86247,7 +83459,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86269,7 +83480,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86293,7 +83503,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86317,7 +83526,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86339,7 +83547,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86363,7 +83570,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86385,7 +83591,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86409,7 +83614,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86433,7 +83637,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86455,7 +83658,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86479,7 +83681,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86501,7 +83702,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86525,7 +83725,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86549,7 +83748,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86571,7 +83769,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86596,7 +83793,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86618,7 +83814,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86643,7 +83838,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86665,7 +83859,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86690,7 +83883,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86712,7 +83904,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86737,7 +83928,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86763,7 +83953,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86788,7 +83977,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86810,7 +83998,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86834,7 +84021,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86860,7 +84046,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86890,7 +84075,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86912,7 +84096,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86936,7 +84119,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86958,7 +84140,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -86982,7 +84163,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87008,7 +84188,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87032,7 +84211,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87054,7 +84232,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87078,7 +84255,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87103,7 +84279,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87130,7 +84305,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87152,7 +84326,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87212,7 +84385,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87278,7 +84450,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87347,7 +84518,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87405,7 +84575,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87429,7 +84598,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87451,7 +84619,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87475,7 +84642,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87497,7 +84663,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87521,7 +84686,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87545,7 +84709,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87567,7 +84730,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87591,7 +84753,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87613,7 +84774,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87637,7 +84797,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87666,7 +84825,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87693,7 +84851,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(200) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87713,7 +84870,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87733,7 +84889,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87757,7 +84912,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87779,7 +84933,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87803,7 +84956,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87825,7 +84977,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87859,7 +85010,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87893,7 +85043,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87930,7 +85079,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -87967,7 +85115,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88017,7 +85164,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88066,7 +85212,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88160,7 +85305,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88254,7 +85398,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88308,7 +85451,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88350,7 +85492,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88393,7 +85534,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88443,7 +85583,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88476,7 +85615,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88529,7 +85667,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88582,7 +85719,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88682,7 +85818,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88782,7 +85917,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88812,7 +85946,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88840,7 +85973,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88869,7 +86001,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88897,7 +86028,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88940,7 +86070,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -88976,7 +86105,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89020,7 +86148,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89047,7 +86174,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89079,7 +86205,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89117,7 +86242,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89156,7 +86280,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89179,7 +86302,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89206,7 +86328,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89228,7 +86349,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89253,7 +86373,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89276,7 +86395,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89298,7 +86416,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89323,7 +86440,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89350,7 +86466,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89378,7 +86493,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89400,7 +86514,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89424,7 +86537,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89447,7 +86559,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89469,7 +86580,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89494,7 +86604,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89520,7 +86629,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89545,7 +86653,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89567,7 +86674,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89591,7 +86697,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89613,7 +86718,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89638,7 +86742,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89664,7 +86767,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89689,7 +86791,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89711,7 +86812,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89735,7 +86835,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89757,7 +86856,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89782,7 +86880,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89808,7 +86905,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89833,7 +86929,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89855,7 +86950,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89879,7 +86973,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89901,7 +86994,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89926,7 +87018,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89948,7 +87039,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89973,7 +87063,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -89999,7 +87088,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90024,7 +87112,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90047,7 +87134,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90069,7 +87155,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90093,7 +87178,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90118,7 +87202,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90141,7 +87224,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90163,7 +87245,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90188,7 +87269,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90211,7 +87291,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90233,7 +87312,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90258,7 +87336,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90280,7 +87357,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90305,7 +87381,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90331,7 +87406,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90356,7 +87430,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90378,7 +87451,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90402,7 +87474,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90427,7 +87498,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90450,7 +87520,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90472,7 +87541,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90497,7 +87565,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90520,7 +87587,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90542,7 +87608,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90567,7 +87632,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90589,7 +87653,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90614,7 +87677,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90640,7 +87702,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90665,7 +87726,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90687,7 +87747,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90711,7 +87770,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90736,7 +87794,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90759,7 +87816,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90781,7 +87837,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90806,7 +87861,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90829,7 +87883,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90851,7 +87904,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90876,7 +87928,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90898,7 +87949,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90923,7 +87973,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90949,7 +87998,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90974,7 +88022,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -90996,7 +88043,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91020,7 +88066,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91046,7 +88091,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91069,7 +88113,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91091,7 +88134,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91117,7 +88159,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91140,7 +88181,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91162,7 +88202,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91187,7 +88226,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91213,7 +88251,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91238,7 +88275,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91260,7 +88296,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91284,7 +88319,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91309,7 +88343,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91332,7 +88365,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91354,7 +88386,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91379,7 +88410,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91402,7 +88432,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91424,7 +88453,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91449,7 +88477,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91475,7 +88502,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91500,7 +88526,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91522,7 +88547,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91546,7 +88570,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91571,7 +88594,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91594,7 +88616,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91616,7 +88637,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91641,7 +88661,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91664,7 +88683,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91686,7 +88704,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91711,7 +88728,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91737,7 +88753,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91762,7 +88777,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91784,7 +88798,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91808,7 +88821,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91833,7 +88845,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91856,7 +88867,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91878,7 +88888,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91903,7 +88912,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91926,7 +88934,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91948,7 +88955,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91973,7 +88979,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -91999,7 +89004,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92024,7 +89028,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92046,7 +89049,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92070,7 +89072,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92095,7 +89096,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92118,7 +89118,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92140,7 +89139,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92165,7 +89163,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92188,7 +89185,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92210,7 +89206,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92235,7 +89230,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92257,7 +89251,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92282,7 +89275,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92304,7 +89296,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92329,7 +89320,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92351,7 +89341,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92375,7 +89364,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92397,7 +89385,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92422,7 +89409,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92444,7 +89430,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92469,7 +89454,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92491,7 +89475,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92516,7 +89499,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92538,7 +89520,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92563,7 +89544,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92585,7 +89565,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92609,7 +89588,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92631,7 +89609,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92656,7 +89633,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92678,7 +89654,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92703,7 +89678,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92725,7 +89699,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92750,7 +89723,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92776,7 +89748,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92801,7 +89772,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92823,7 +89793,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92847,7 +89816,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92869,7 +89837,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92894,7 +89861,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92916,7 +89882,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92941,7 +89906,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92967,7 +89931,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -92992,7 +89955,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93014,7 +89976,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93038,7 +89999,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93060,7 +90020,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93085,7 +90044,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93107,7 +90065,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93132,7 +90089,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93159,7 +90115,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93187,7 +90142,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93209,7 +90163,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93233,7 +90186,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93256,7 +90208,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93282,7 +90233,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93305,7 +90255,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93334,7 +90283,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93356,7 +90304,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93380,7 +90327,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93402,7 +90348,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93428,7 +90373,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93451,7 +90395,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93476,7 +90419,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93499,7 +90441,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93527,7 +90468,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93556,7 +90496,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93578,7 +90517,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93602,7 +90540,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93624,7 +90561,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93649,7 +90585,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93672,7 +90607,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(200) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93692,7 +90626,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93712,7 +90645,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93739,7 +90671,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93765,7 +90696,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93794,7 +90724,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93828,7 +90757,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93857,7 +90785,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93885,7 +90812,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93909,7 +90835,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93937,7 +90862,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93965,7 +90889,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -93993,7 +90916,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94021,7 +90943,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94045,7 +90966,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94069,7 +90989,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94093,7 +91012,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94117,7 +91035,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94141,7 +91058,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94165,7 +91081,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94189,7 +91104,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94213,7 +91127,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94241,7 +91154,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94269,7 +91181,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94297,7 +91208,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94325,7 +91235,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94349,7 +91258,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94373,7 +91281,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94397,7 +91304,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94421,7 +91327,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94445,7 +91350,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94469,7 +91373,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94493,7 +91396,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94517,7 +91419,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94544,7 +91445,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94572,7 +91472,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94600,7 +91499,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94627,7 +91525,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94651,7 +91548,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94676,7 +91572,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94700,7 +91595,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94725,7 +91619,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94749,7 +91642,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94773,7 +91665,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94797,7 +91688,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94821,7 +91711,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94849,7 +91738,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94877,7 +91765,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94905,7 +91792,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94933,7 +91819,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94957,7 +91842,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -94981,7 +91865,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95005,7 +91888,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95029,7 +91911,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95053,7 +91934,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95077,7 +91957,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95101,7 +91980,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95126,7 +92004,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95154,7 +92031,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95182,7 +92058,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95210,7 +92085,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95238,7 +92112,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95263,7 +92136,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95287,7 +92159,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95312,7 +92183,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95336,7 +92206,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95361,7 +92230,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95385,7 +92253,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95410,7 +92277,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95434,7 +92300,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95458,7 +92323,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95483,7 +92347,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95511,7 +92374,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95539,7 +92401,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95567,7 +92428,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95595,7 +92455,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95620,7 +92479,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95644,7 +92502,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95669,7 +92526,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95693,7 +92549,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95718,7 +92573,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95742,7 +92596,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95767,7 +92620,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95791,7 +92643,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95815,7 +92666,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95840,7 +92690,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95868,7 +92717,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95896,7 +92744,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95924,7 +92771,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95952,7 +92798,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -95977,7 +92822,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96001,7 +92845,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96026,7 +92869,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96050,7 +92892,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96075,7 +92916,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96099,7 +92939,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96124,7 +92963,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96148,7 +92986,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96172,7 +93009,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96197,7 +93033,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96225,7 +93060,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96253,7 +93087,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96281,7 +93114,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96309,7 +93141,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96334,7 +93165,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96358,7 +93188,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96383,7 +93212,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96407,7 +93235,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96432,7 +93259,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96456,7 +93282,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96481,7 +93306,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96505,7 +93329,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96529,7 +93352,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96555,7 +93377,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96583,7 +93404,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96603,7 +93423,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96623,7 +93442,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96665,7 +93483,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96698,7 +93515,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96729,7 +93545,6 @@ class TestCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -96775,17 +93590,10 @@ class TestConstraints : public TestCommandBridge { ~TestConstraints() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestConstraints\n"); @@ -97087,7 +93895,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97116,7 +93923,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97139,7 +93945,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97161,7 +93966,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97186,7 +93990,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97210,7 +94013,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97232,7 +94034,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97256,7 +94057,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97280,7 +94080,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97304,7 +94103,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97328,7 +94126,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97350,7 +94147,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97372,7 +94168,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97393,7 +94188,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97414,7 +94208,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97435,7 +94228,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97457,7 +94249,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97479,7 +94270,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97499,7 +94289,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97519,7 +94308,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97539,7 +94327,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97559,7 +94346,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97581,7 +94367,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97602,7 +94387,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97624,7 +94408,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97645,7 +94428,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97667,7 +94449,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97688,7 +94469,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97710,7 +94490,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97730,7 +94509,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97752,7 +94530,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97772,7 +94549,6 @@ class TestConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -97807,17 +94583,10 @@ class TestDelayCommands : public TestCommandBridge { ~TestDelayCommands() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestDelayCommands\n"); @@ -97914,17 +94683,10 @@ class TestLogCommands : public TestCommandBridge { ~TestLogCommands() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestLogCommands\n"); @@ -98036,17 +94798,10 @@ class TestSaveAs : public TestCommandBridge { ~TestSaveAs() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSaveAs\n"); @@ -98885,7 +95640,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -98917,7 +95671,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -98946,7 +95699,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -98974,7 +95726,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99001,7 +95752,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99023,7 +95773,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99044,7 +95793,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99066,7 +95814,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99091,7 +95838,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99118,7 +95864,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99140,7 +95885,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99161,7 +95905,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99183,7 +95926,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99208,7 +95950,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99235,7 +95976,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99257,7 +95997,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99278,7 +96017,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99300,7 +96038,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99325,7 +96062,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99352,7 +96088,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99374,7 +96109,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99395,7 +96129,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99417,7 +96150,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99442,7 +96174,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99469,7 +96200,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99491,7 +96221,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99512,7 +96241,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99534,7 +96262,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99559,7 +96286,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99586,7 +96312,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99608,7 +96333,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99629,7 +96353,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99651,7 +96374,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99676,7 +96398,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99703,7 +96424,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99725,7 +96445,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99746,7 +96465,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99768,7 +96486,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99793,7 +96510,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99820,7 +96536,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99842,7 +96557,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99863,7 +96577,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99885,7 +96598,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99910,7 +96622,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99937,7 +96648,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99959,7 +96669,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -99980,7 +96689,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100002,7 +96710,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100027,7 +96734,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100054,7 +96760,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100076,7 +96781,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100097,7 +96801,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100119,7 +96822,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100144,7 +96846,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100171,7 +96872,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100193,7 +96893,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100214,7 +96913,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100236,7 +96934,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100261,7 +96958,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100288,7 +96984,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100310,7 +97005,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100331,7 +97025,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100353,7 +97046,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100378,7 +97070,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100405,7 +97096,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100427,7 +97117,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100448,7 +97137,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100470,7 +97158,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100495,7 +97182,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100522,7 +97208,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100544,7 +97229,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100565,7 +97249,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100587,7 +97270,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100612,7 +97294,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100639,7 +97320,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100661,7 +97341,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100682,7 +97361,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100704,7 +97382,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100729,7 +97406,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100756,7 +97432,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100778,7 +97453,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100799,7 +97473,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100821,7 +97494,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100846,7 +97518,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100873,7 +97544,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100895,7 +97565,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100916,7 +97585,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100938,7 +97606,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100963,7 +97630,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -100990,7 +97656,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101012,7 +97677,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101033,7 +97697,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101055,7 +97718,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101080,7 +97742,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101107,7 +97768,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101131,7 +97791,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101154,7 +97813,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101183,7 +97841,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101209,7 +97866,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101231,7 +97887,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101255,7 +97910,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101278,7 +97932,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101305,7 +97958,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101329,7 +97981,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101352,7 +98003,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101382,7 +98032,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101408,7 +98057,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101431,7 +98079,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101456,7 +98103,6 @@ class TestSaveAs : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101493,17 +98139,10 @@ class TestConfigVariables : public TestCommandBridge { ~TestConfigVariables() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestConfigVariables\n"); @@ -101589,7 +98228,6 @@ class TestConfigVariables : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101621,7 +98259,6 @@ class TestConfigVariables : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101664,17 +98301,10 @@ class TestDescriptorCluster : public TestCommandBridge { ~TestDescriptorCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestDescriptorCluster\n"); @@ -101771,7 +98401,6 @@ class TestDescriptorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101798,7 +98427,6 @@ class TestDescriptorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101850,7 +98478,6 @@ class TestDescriptorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101875,7 +98502,6 @@ class TestDescriptorCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -101914,17 +98540,10 @@ class TestBasicInformation : public TestCommandBridge { ~TestBasicInformation() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestBasicInformation\n"); @@ -102112,7 +98731,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102136,7 +98754,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102158,7 +98775,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102182,7 +98798,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102204,7 +98819,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102253,7 +98867,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102277,7 +98890,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102299,7 +98911,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102323,7 +98934,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102347,7 +98957,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102369,7 +98978,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102408,7 +99016,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102432,7 +99039,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102454,7 +99060,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102478,7 +99083,6 @@ class TestBasicInformation : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -102515,17 +99119,10 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { ~TestFabricRemovalWhileSubscribed() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestFabricRemovalWhileSubscribed\n"); @@ -102652,7 +99249,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102680,7 +99276,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102707,7 +99302,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102750,7 +99344,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102773,7 +99366,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102809,7 +99401,6 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -102849,17 +99440,10 @@ class TestGeneralCommissioning : public TestCommandBridge { ~TestGeneralCommissioning() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestGeneralCommissioning\n"); @@ -103143,7 +99727,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103167,7 +99750,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103193,7 +99775,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103217,7 +99798,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103258,7 +99838,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103284,7 +99863,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103308,7 +99886,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103334,7 +99911,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103361,7 +99937,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103387,7 +99962,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103411,7 +99985,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103442,7 +100015,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103468,7 +100040,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103509,7 +100080,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103540,7 +100110,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103566,7 +100135,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103597,7 +100165,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103623,7 +100190,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103650,7 +100216,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103676,7 +100241,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103703,7 +100267,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103729,7 +100292,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103760,7 +100322,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103786,7 +100347,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103817,7 +100377,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103843,7 +100402,6 @@ class TestGeneralCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -103878,17 +100436,10 @@ class TestIdentifyCluster : public TestCommandBridge { ~TestIdentifyCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestIdentifyCluster\n"); @@ -103964,7 +100515,6 @@ class TestIdentifyCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterIdentify alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -103999,17 +100549,10 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { ~TestOperationalCredentialsCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestOperationalCredentialsCluster\n"); @@ -104127,7 +100670,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104151,7 +100693,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104176,7 +100717,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104203,7 +100743,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104233,7 +100772,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104269,7 +100807,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104304,7 +100841,6 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -104353,17 +100889,10 @@ class TestModeSelectCluster : public TestCommandBridge { ~TestModeSelectCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestModeSelectCluster\n"); @@ -104650,7 +101179,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104674,7 +101202,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104699,7 +101226,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104756,7 +101282,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104780,7 +101305,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104805,7 +101329,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104829,7 +101352,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104852,7 +101374,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104879,7 +101400,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104904,7 +101424,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104923,7 +101442,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104942,7 +101460,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104966,7 +101483,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -104992,7 +101508,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105015,7 +101530,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105043,7 +101557,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105062,7 +101575,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105081,7 +101593,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105105,7 +101616,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105131,7 +101641,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105153,7 +101662,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105178,7 +101686,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105200,7 +101707,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105222,7 +101728,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105259,7 +101764,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105283,7 +101787,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105320,7 +101823,6 @@ class TestModeSelectCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -105357,17 +101859,10 @@ class TestSelfFabricRemoval : public TestCommandBridge { ~TestSelfFabricRemoval() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSelfFabricRemoval\n"); @@ -105457,7 +101952,6 @@ class TestSelfFabricRemoval : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -105485,7 +101979,6 @@ class TestSelfFabricRemoval : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -105512,7 +102005,6 @@ class TestSelfFabricRemoval : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -105551,17 +102043,10 @@ class TestSystemCommands : public TestCommandBridge { ~TestSystemCommands() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSystemCommands\n"); @@ -105988,17 +102473,10 @@ class TestBinding : public TestCommandBridge { ~TestBinding() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestBinding\n"); @@ -106123,7 +102601,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106148,7 +102625,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106175,7 +102651,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106214,7 +102689,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106254,7 +102728,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106299,7 +102772,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106329,7 +102801,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106362,7 +102833,6 @@ class TestBinding : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBinding alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106420,17 +102890,10 @@ class TestUserLabelCluster : public TestCommandBridge { ~TestUserLabelCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestUserLabelCluster\n"); @@ -106555,7 +103018,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106596,7 +103058,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106631,7 +103092,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106656,7 +103116,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106680,7 +103139,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106736,7 +103194,6 @@ class TestUserLabelCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106784,17 +103241,10 @@ class TestUserLabelClusterConstraints : public TestCommandBridge { ~TestUserLabelClusterConstraints() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestUserLabelClusterConstraints\n"); @@ -106877,7 +103327,6 @@ class TestUserLabelClusterConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106910,7 +103359,6 @@ class TestUserLabelClusterConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterUserLabel alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -106955,17 +103403,10 @@ class TestArmFailSafe : public TestCommandBridge { ~TestArmFailSafe() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestArmFailSafe\n"); @@ -107096,7 +103537,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107132,7 +103572,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGeneralCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107163,7 +103602,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107187,7 +103625,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107215,7 +103652,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107245,7 +103681,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107272,7 +103707,6 @@ class TestArmFailSafe : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -107314,17 +103748,10 @@ class TestFanControl : public TestCommandBridge { ~TestFanControl() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestFanControl\n"); @@ -107561,7 +103988,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107583,7 +104009,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107607,7 +104032,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107629,7 +104053,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107653,7 +104076,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107675,7 +104097,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107700,7 +104121,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107725,7 +104145,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107749,7 +104168,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107771,7 +104189,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107796,7 +104213,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107818,7 +104234,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107843,7 +104258,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107868,7 +104282,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107892,7 +104305,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107914,7 +104326,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107939,7 +104350,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107961,7 +104371,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -107986,7 +104395,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108010,7 +104418,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108035,7 +104442,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108059,7 +104465,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108081,7 +104486,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108105,7 +104509,6 @@ class TestFanControl : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108142,17 +104545,10 @@ class TestAccessControlConstraints : public TestCommandBridge { ~TestAccessControlConstraints() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestAccessControlConstraints\n"); @@ -108296,7 +104692,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108345,7 +104740,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108396,7 +104790,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108445,7 +104838,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108495,7 +104887,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108549,7 +104940,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108605,7 +104995,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108651,7 +105040,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108703,7 +105091,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108755,7 +105142,6 @@ class TestAccessControlConstraints : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -108820,17 +105206,10 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { ~TestLevelControlWithOnOffDependency() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestLevelControlWithOnOffDependency\n"); @@ -109123,7 +105502,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109156,7 +105534,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109181,7 +105558,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109211,7 +105587,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109235,7 +105610,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109265,7 +105639,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109290,7 +105663,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109314,7 +105686,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109333,7 +105704,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109365,7 +105735,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109390,7 +105759,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109409,7 +105777,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109441,7 +105808,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109466,7 +105832,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109499,7 +105864,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109524,7 +105888,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109554,7 +105917,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109578,7 +105940,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109597,7 +105958,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109629,7 +105989,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109654,7 +106013,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109673,7 +106031,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109705,7 +106062,6 @@ class TestLevelControlWithOnOffDependency : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -109746,17 +106102,10 @@ class TestCommissioningWindow : public TestCommandBridge { ~TestCommissioningWindow() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestCommissioningWindow\n"); @@ -110018,7 +106367,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110043,7 +106391,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110069,7 +106416,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110095,7 +106441,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110121,7 +106466,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110145,7 +106489,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110171,7 +106514,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110202,7 +106544,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110227,7 +106568,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110248,7 +106588,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110274,7 +106613,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110300,7 +106638,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110326,7 +106663,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110367,7 +106703,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110393,7 +106728,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110419,7 +106753,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110446,7 +106779,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110471,7 +106803,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110495,7 +106826,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110521,7 +106851,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110553,7 +106882,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110581,7 +106909,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110606,7 +106933,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110632,7 +106958,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110658,7 +106983,6 @@ class TestCommissioningWindow : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110703,17 +107027,10 @@ class TestCommissionerNodeId : public TestCommandBridge { ~TestCommissionerNodeId() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestCommissionerNodeId\n"); @@ -110765,48 +107082,60 @@ class TestCommissionerNodeId : public TestCommandBridge { err = TestReadTheFabricIdFromTheAlphaFabric_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : Read the fabric ID from the beta fabric\n"); - err = TestReadTheFabricIdFromTheBetaFabric_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : Read the commissioner node ID from the alpha fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheAlphaFabric_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : Read the fabric ID from the gamma fabric\n"); - err = TestReadTheFabricIdFromTheGammaFabric_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : Read the fabric ID from the beta fabric\n"); + err = TestReadTheFabricIdFromTheBetaFabric_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : Read the ACL from alpha and check commissioner node id\n"); - err = TestReadTheAclFromAlphaAndCheckCommissionerNodeId_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : Read the commissioner node ID from the beta fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheBetaFabric_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : Read the ACL from beta and check commissioner node id\n"); - err = TestReadTheAclFromBetaAndCheckCommissionerNodeId_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : Read the fabric ID from the gamma fabric\n"); + err = TestReadTheFabricIdFromTheGammaFabric_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : Read the ACL from gamma and check commissioner node id\n"); - err = TestReadTheAclFromGammaAndCheckCommissionerNodeId_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : Read the commissioner node ID from the gamma fabric\n"); + err = TestReadTheCommissionerNodeIdFromTheGammaFabric_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : Write the ACL using the commissioner node id value\n"); - err = TestWriteTheAclUsingTheCommissionerNodeIdValue_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : Read the ACL from alpha and check commissioner node id\n"); + err = TestReadTheAclFromAlphaAndCheckCommissionerNodeId_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : Write the ACL using the commissioner node id value\n"); - err = TestWriteTheAclUsingTheCommissionerNodeIdValue_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : Read the ACL from beta and check commissioner node id\n"); + err = TestReadTheAclFromBetaAndCheckCommissionerNodeId_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : Read the ACL from beta and check commissioner node id\n"); - err = TestReadTheAclFromBetaAndCheckCommissionerNodeId_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : Read the ACL from gamma and check commissioner node id\n"); + err = TestReadTheAclFromGammaAndCheckCommissionerNodeId_15(); break; case 16: - ChipLogProgress(chipTool, " ***** Test Step 16 : Read the ACL from gamma and check commissioner node id\n"); - err = TestReadTheAclFromGammaAndCheckCommissionerNodeId_16(); + ChipLogProgress(chipTool, " ***** Test Step 16 : Write the ACL using the commissioner node id value\n"); + err = TestWriteTheAclUsingTheCommissionerNodeIdValue_16(); break; case 17: - ChipLogProgress(chipTool, " ***** Test Step 17 : Remove beta fabric\n"); - err = TestRemoveBetaFabric_17(); + ChipLogProgress(chipTool, " ***** Test Step 17 : Write the ACL using the commissioner node id value\n"); + err = TestWriteTheAclUsingTheCommissionerNodeIdValue_17(); break; case 18: - ChipLogProgress(chipTool, " ***** Test Step 18 : Remove gamma fabric\n"); - err = TestRemoveGammaFabric_18(); + ChipLogProgress(chipTool, " ***** Test Step 18 : Read the ACL from beta and check commissioner node id\n"); + err = TestReadTheAclFromBetaAndCheckCommissionerNodeId_18(); + break; + case 19: + ChipLogProgress(chipTool, " ***** Test Step 19 : Read the ACL from gamma and check commissioner node id\n"); + err = TestReadTheAclFromGammaAndCheckCommissionerNodeId_19(); + break; + case 20: + ChipLogProgress(chipTool, " ***** Test Step 20 : Remove beta fabric\n"); + err = TestRemoveBetaFabric_20(); + break; + case 21: + ChipLogProgress(chipTool, " ***** Test Step 21 : Remove gamma fabric\n"); + err = TestRemoveGammaFabric_21(); break; } @@ -110876,6 +107205,15 @@ class TestCommissionerNodeId : public TestCommandBridge { case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 19: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 20: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 21: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -110889,7 +107227,7 @@ class TestCommissionerNodeId : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 19; + const uint16_t mTestCount = 22; chip::Optional mNodeId; chip::Optional mEndpoint; @@ -110909,7 +107247,6 @@ class TestCommissionerNodeId : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110950,7 +107287,6 @@ class TestCommissionerNodeId : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -110992,7 +107328,6 @@ class TestCommissionerNodeId : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111012,13 +107347,25 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdAlpha; + + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheAlphaFabric_8() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("alpha", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdAlpha = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } NSNumber * _Nonnull betaIndex; - CHIP_ERROR TestReadTheFabricIdFromTheBetaFabric_8() + CHIP_ERROR TestReadTheFabricIdFromTheBetaFabric_9() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111038,13 +107385,25 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdBeta; + + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheBetaFabric_10() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("beta", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdBeta = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } NSNumber * _Nonnull gammaIndex; - CHIP_ERROR TestReadTheFabricIdFromTheGammaFabric_9() + CHIP_ERROR TestReadTheFabricIdFromTheGammaFabric_11() { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111064,12 +107423,24 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nonnull commissionerNodeIdGamma; + + CHIP_ERROR TestReadTheCommissionerNodeIdFromTheGammaFabric_12() + { + + chip::app::Clusters::CommissionerCommands::Commands::GetCommissionerNodeId::Type value; + return GetCommissionerNodeId("gamma", value, ^(const chip::GetCommissionerNodeIdResponse & values) { + { + commissionerNodeIdGamma = [[NSNumber alloc] initWithUnsignedLongLong:values.nodeId]; + } + NextTest(); + }); + } - CHIP_ERROR TestReadTheAclFromAlphaAndCheckCommissionerNodeId_10() + CHIP_ERROR TestReadTheAclFromAlphaAndCheckCommissionerNodeId_13() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111095,7 +107466,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdAlpha)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111109,11 +107480,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheAclFromBetaAndCheckCommissionerNodeId_11() + CHIP_ERROR TestReadTheAclFromBetaAndCheckCommissionerNodeId_14() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111139,7 +107509,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdBeta)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111153,11 +107523,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheAclFromGammaAndCheckCommissionerNodeId_12() + CHIP_ERROR TestReadTheAclFromGammaAndCheckCommissionerNodeId_15() { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111183,7 +107552,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdGamma)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111197,11 +107566,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteTheAclUsingTheCommissionerNodeIdValue_13() + CHIP_ERROR TestWriteTheAclUsingTheCommissionerNodeIdValue_16() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111213,7 +107581,7 @@ class TestCommissionerNodeId : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdBeta copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -111233,11 +107601,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteTheAclUsingTheCommissionerNodeIdValue_14() + CHIP_ERROR TestWriteTheAclUsingTheCommissionerNodeIdValue_17() { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111249,7 +107616,7 @@ class TestCommissionerNodeId : public TestCommandBridge { ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2U]; { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; - temp_3[0] = [NSNumber numberWithUnsignedLongLong:commissionerNodeId]; + temp_3[0] = [commissionerNodeIdGamma copy]; ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = temp_3; } ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil; @@ -111269,11 +107636,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheAclFromBetaAndCheckCommissionerNodeId_15() + CHIP_ERROR TestReadTheAclFromBetaAndCheckCommissionerNodeId_18() { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111299,7 +107665,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdBeta)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111313,11 +107679,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheAclFromGammaAndCheckCommissionerNodeId_16() + CHIP_ERROR TestReadTheAclFromGammaAndCheckCommissionerNodeId_19() { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111343,7 +107708,7 @@ class TestCommissionerNodeId : public TestCommandBridge { static_cast(1))); VerifyOrReturn(CheckValue("", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).subjects[0], - commissionerNodeId)); + commissionerNodeIdGamma)); VerifyOrReturn(CheckValueNull("Targets", ((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", @@ -111357,11 +107722,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRemoveBetaFabric_17() + CHIP_ERROR TestRemoveBetaFabric_20() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111382,11 +107746,10 @@ class TestCommissionerNodeId : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRemoveGammaFabric_18() + CHIP_ERROR TestRemoveGammaFabric_21() { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111428,17 +107791,10 @@ class TestMultiAdmin : public TestCommandBridge { ~TestMultiAdmin() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestMultiAdmin\n"); @@ -111656,7 +108012,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111689,7 +108044,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111721,7 +108075,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111742,7 +108095,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111783,7 +108135,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -111825,7 +108176,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111852,7 +108202,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("beta"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111874,7 +108223,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("gamma"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111895,7 +108243,6 @@ class TestMultiAdmin : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -111930,17 +108277,10 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { ~Test_TC_DGSW_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DGSW_1_1\n"); @@ -112120,7 +108460,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112147,7 +108486,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112174,7 +108512,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112196,7 +108533,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112224,7 +108560,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112248,7 +108583,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112272,7 +108606,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112296,7 +108629,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112320,7 +108652,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112344,7 +108675,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112371,7 +108701,6 @@ class Test_TC_DGSW_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterSoftwareDiagnostics alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112411,17 +108740,10 @@ class TestSubscribe_OnOff : public TestCommandBridge { ~TestSubscribe_OnOff() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSubscribe_OnOff\n"); @@ -112539,7 +108861,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112560,7 +108881,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112585,7 +108905,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112619,7 +108938,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112638,7 +108956,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112662,7 +108979,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112681,7 +108997,6 @@ class TestSubscribe_OnOff : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -112719,17 +109034,10 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { ~TestSubscribe_AdministratorCommissioning() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestSubscribe_AdministratorCommissioning\n"); @@ -112933,7 +109241,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterOperationalCredentials alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112960,7 +109267,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -112988,7 +109294,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113024,7 +109329,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113048,7 +109352,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113075,7 +109378,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113096,7 +109398,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113125,7 +109426,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113153,7 +109453,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113189,7 +109488,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113213,7 +109511,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113241,7 +109538,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113262,7 +109558,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113291,7 +109586,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113319,7 +109613,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113355,7 +109648,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113379,7 +109671,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113411,7 +109702,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113432,7 +109722,6 @@ class TestSubscribe_AdministratorCommissioning : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterAdministratorCommissioning alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -113472,17 +109761,10 @@ class DL_UsersAndCredentials : public TestCommandBridge { ~DL_UsersAndCredentials() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: DL_UsersAndCredentials\n"); @@ -114419,7 +110701,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114492,7 +110773,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114519,7 +110799,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114543,7 +110822,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114567,7 +110845,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114595,7 +110872,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114673,7 +110949,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114703,7 +110978,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114731,7 +111005,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114809,7 +111082,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114837,7 +111109,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114916,7 +111187,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -114944,7 +111214,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115023,7 +111292,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115051,7 +111319,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115130,7 +111397,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115158,7 +111424,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115237,7 +111502,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115265,7 +111529,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115344,7 +111607,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115372,7 +111634,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115451,7 +111712,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115481,7 +111741,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115553,7 +111812,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115583,7 +111841,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115655,7 +111912,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115683,7 +111939,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115762,7 +112017,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115790,7 +112044,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115868,7 +112121,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115898,7 +112150,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115928,7 +112179,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -115950,7 +112200,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116023,7 +112272,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116051,7 +112299,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116130,7 +112377,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116155,7 +112401,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116180,7 +112425,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116202,7 +112446,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116274,7 +112517,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116347,7 +112589,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116374,7 +112615,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116425,7 +112665,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116476,7 +112715,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116529,7 +112767,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116576,7 +112813,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116623,7 +112859,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116671,7 +112906,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116754,7 +112988,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116808,7 +113041,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116855,7 +113087,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116903,7 +113134,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116930,7 +113160,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -116981,7 +113210,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117029,7 +113257,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117082,7 +113309,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117133,7 +113359,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117180,7 +113405,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117267,7 +113491,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117321,7 +113544,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117368,7 +113590,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117415,7 +113636,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117462,7 +113682,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117509,7 +113728,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117556,7 +113774,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117603,7 +113820,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117650,7 +113866,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117697,7 +113912,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117744,7 +113958,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117791,7 +114004,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117838,7 +114050,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117885,7 +114096,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117933,7 +114143,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -117980,7 +114189,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118027,7 +114235,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118119,7 +114326,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118166,7 +114372,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118262,7 +114467,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118287,7 +114491,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118339,7 +114542,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118431,7 +114633,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118456,7 +114657,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118508,7 +114708,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118580,7 +114779,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118628,7 +114826,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118653,7 +114850,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118704,7 +114900,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118755,7 +114950,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118806,7 +115000,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118890,7 +115083,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -118962,7 +115154,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119010,7 +115201,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119058,7 +115248,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119106,7 +115295,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119128,7 +115316,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119179,7 +115366,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119230,7 +115416,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119281,7 +115466,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119353,7 +115537,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119425,7 +115608,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119497,7 +115679,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119569,7 +115750,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119615,7 +115795,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119662,7 +115841,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119745,7 +115923,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119799,7 +115976,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119845,7 +116021,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119873,7 +116048,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119901,7 +116075,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119929,7 +116102,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119958,7 +116130,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -119986,7 +116157,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120015,7 +116185,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120037,7 +116206,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120109,7 +116277,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120160,7 +116327,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120208,7 +116374,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120255,7 +116420,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120302,7 +116466,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120349,7 +116512,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120396,7 +116558,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120443,7 +116604,6 @@ class DL_UsersAndCredentials : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120478,17 +116638,10 @@ class DL_LockUnlock : public TestCommandBridge { ~DL_LockUnlock() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: DL_LockUnlock\n"); @@ -120818,7 +116971,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120839,7 +116991,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120864,7 +117015,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120885,7 +117035,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120910,7 +117059,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120958,7 +117106,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -120982,7 +117129,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121007,7 +117153,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121032,7 +117177,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121054,7 +117198,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121079,7 +117222,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121104,7 +117246,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121129,7 +117270,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121151,7 +117291,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121176,7 +117315,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121198,7 +117336,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121222,7 +117359,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121244,7 +117380,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121268,7 +117403,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121293,7 +117427,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121318,7 +117451,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121343,7 +117475,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121368,7 +117499,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121401,7 +117531,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121423,7 +117552,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121448,7 +117576,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121470,7 +117597,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121518,7 +117644,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121543,7 +117668,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121568,7 +117692,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121590,7 +117713,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121615,7 +117737,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121640,7 +117761,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121665,7 +117785,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121687,7 +117806,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121712,7 +117830,6 @@ class DL_LockUnlock : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -121747,17 +117864,10 @@ class DL_Schedules : public TestCommandBridge { ~DL_Schedules() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: DL_Schedules\n"); @@ -122716,7 +118826,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122765,7 +118874,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122793,7 +118901,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122822,7 +118929,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122851,7 +118957,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122879,7 +118984,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122910,7 +119014,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122941,7 +119044,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -122972,7 +119074,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123003,7 +119104,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123034,7 +119134,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123065,7 +119164,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123096,7 +119194,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123127,7 +119224,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123158,7 +119254,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123189,7 +119284,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123220,7 +119314,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123251,7 +119344,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123282,7 +119374,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123315,7 +119406,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123354,7 +119444,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123393,7 +119482,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123433,7 +119521,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123472,7 +119559,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123512,7 +119598,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123551,7 +119636,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123579,7 +119663,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123607,7 +119690,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123635,7 +119717,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123663,7 +119744,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123691,7 +119771,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123719,7 +119798,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123758,7 +119836,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123797,7 +119874,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123837,7 +119913,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123876,7 +119951,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123916,7 +119990,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123955,7 +120028,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -123983,7 +120055,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124011,7 +120082,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124039,7 +120109,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124067,7 +120136,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124100,7 +120168,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124133,7 +120200,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124167,7 +120233,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124192,7 +120257,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124240,7 +120304,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124268,7 +120331,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124332,7 +120394,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124357,7 +120418,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124406,7 +120466,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124433,7 +120492,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124460,7 +120518,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124487,7 +120544,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124514,7 +120570,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124541,7 +120596,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124605,7 +120659,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124654,7 +120707,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124702,7 +120754,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124729,7 +120780,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124756,7 +120806,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124783,7 +120832,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124810,7 +120858,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124837,7 +120884,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124901,7 +120947,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124950,7 +120995,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -124998,7 +121042,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125024,7 +121067,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125050,7 +121092,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125114,7 +121155,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125163,7 +121203,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125211,7 +121250,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125239,7 +121277,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125303,7 +121340,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125328,7 +121364,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125377,7 +121412,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125402,7 +121436,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125450,7 +121483,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125473,7 +121505,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125512,7 +121543,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125535,7 +121565,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125574,7 +121603,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125623,7 +121651,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125672,7 +121699,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125720,7 +121746,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125768,7 +121793,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125796,7 +121820,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125819,7 +121842,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125858,7 +121880,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125881,7 +121902,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125920,7 +121940,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -125984,7 +122003,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126007,7 +122025,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126035,7 +122052,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126063,7 +122079,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126127,7 +122142,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126152,7 +122166,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126201,7 +122214,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126229,7 +122241,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126293,7 +122304,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126318,7 +122328,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126367,7 +122376,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126389,7 +122397,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126428,7 +122435,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126467,7 +122473,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126506,7 +122511,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126545,7 +122549,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126593,7 +122596,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126641,7 +122643,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126666,7 +122667,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126715,7 +122715,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126763,7 +122762,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126791,7 +122789,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126816,7 +122813,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126838,7 +122834,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126886,7 +122881,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126919,7 +122913,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -126968,7 +122961,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127032,7 +123024,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127081,7 +123072,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127103,7 +123093,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127136,7 +123125,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127169,7 +123157,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127203,7 +123190,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127267,7 +123253,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127316,7 +123301,6 @@ class DL_Schedules : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127351,17 +123335,10 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { ~Test_TC_DRLK_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_1_1\n"); @@ -127897,7 +123874,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127922,7 +123898,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127947,7 +123922,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127967,7 +123941,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -127987,7 +123960,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128007,7 +123979,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128027,7 +123998,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128047,7 +124017,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128067,7 +124036,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128087,7 +124055,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128107,7 +124074,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128127,7 +124093,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128147,7 +124112,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128178,7 +124142,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128200,7 +124163,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128224,7 +124186,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128248,7 +124209,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128272,7 +124232,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128294,7 +124253,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128316,7 +124274,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128338,7 +124295,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128361,7 +124317,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128383,7 +124338,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128405,7 +124359,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128427,7 +124380,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128449,7 +124401,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128471,7 +124422,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128493,7 +124443,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128515,7 +124464,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128537,7 +124485,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128559,7 +124506,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128581,7 +124527,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128603,7 +124548,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128626,7 +124570,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128650,7 +124593,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128674,7 +124616,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128698,7 +124639,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128725,7 +124665,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128747,7 +124686,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128769,7 +124707,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128791,7 +124728,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128813,7 +124749,6 @@ class Test_TC_DRLK_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -128850,17 +124785,10 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { ~Test_TC_DRLK_2_2() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_2\n"); @@ -129215,7 +125143,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129243,7 +125170,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129322,7 +125248,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129369,7 +125294,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129423,7 +125347,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129447,7 +125370,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129477,7 +125399,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129501,7 +125422,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129522,7 +125442,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129544,7 +125463,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129568,7 +125486,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129598,7 +125515,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129622,7 +125538,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129644,7 +125559,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129669,7 +125583,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129693,7 +125606,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129747,7 +125659,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129771,7 +125682,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129799,7 +125709,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129822,7 +125731,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129848,7 +125756,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129877,7 +125784,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129899,7 +125805,6 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -129937,17 +125842,10 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { ~Test_TC_DRLK_2_3() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_3\n"); @@ -130398,7 +126296,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130426,7 +126323,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130505,7 +126401,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130552,7 +126447,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130606,7 +126500,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130630,7 +126523,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130660,7 +126552,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130684,7 +126575,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130705,7 +126595,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130727,7 +126616,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130751,7 +126639,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130781,7 +126668,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130805,7 +126691,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130827,7 +126712,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130852,7 +126736,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130876,7 +126759,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130900,7 +126782,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130928,7 +126809,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130953,7 +126833,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -130982,7 +126861,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131007,7 +126885,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131032,7 +126909,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131057,7 +126933,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131082,7 +126957,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131107,7 +126981,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131132,7 +127005,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131156,7 +127028,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131180,7 +127051,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131208,7 +127078,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131236,7 +127105,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131260,7 +127128,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131304,7 +127171,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131326,7 +127192,6 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131364,17 +127229,10 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { ~Test_TC_DRLK_2_4() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_4\n"); @@ -131544,7 +127402,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131572,7 +127429,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131651,7 +127507,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131698,7 +127553,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131752,7 +127606,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131776,7 +127629,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131804,7 +127656,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131835,7 +127686,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131860,7 +127710,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131882,7 +127731,6 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -131920,17 +127768,10 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { ~Test_TC_DRLK_2_5() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_5\n"); @@ -132108,7 +127949,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132136,7 +127976,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132216,7 +128055,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132245,7 +128083,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132270,7 +128107,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132298,7 +128134,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132367,7 +128202,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132398,7 +128232,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132457,7 +128290,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132480,7 +128312,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132539,7 +128370,6 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132574,17 +128404,10 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { ~Test_TC_DRLK_2_6() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_6\n"); @@ -132750,7 +128573,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132776,7 +128598,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132801,7 +128622,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132855,7 +128675,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132883,7 +128702,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132916,7 +128734,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132949,7 +128766,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -132971,7 +128787,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133004,7 +128819,6 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133039,17 +128853,10 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { ~Test_TC_DRLK_2_7() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_7\n"); @@ -133289,7 +129096,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133317,7 +129123,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133397,7 +129202,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133426,7 +129230,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133451,7 +129254,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133476,7 +129278,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133531,7 +129332,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133559,7 +129359,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133606,7 +129405,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133634,7 +129432,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133682,7 +129479,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133705,7 +129501,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133752,7 +129547,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133777,7 +129571,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133832,7 +129625,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133859,7 +129651,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133882,7 +129673,6 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -133917,17 +129707,10 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { ~Test_TC_DRLK_2_9() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_DRLK_2_9\n"); @@ -134207,7 +129990,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134235,7 +130017,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134315,7 +130096,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134340,7 +130120,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134387,7 +130166,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134437,7 +130215,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134484,7 +130261,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134564,7 +130340,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134589,7 +130364,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134640,7 +130414,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134668,7 +130441,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134715,7 +130487,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134740,7 +130511,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134791,7 +130561,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134842,7 +130611,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134870,7 +130638,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134892,7 +130659,6 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -134927,17 +130693,10 @@ class TestGroupsCluster : public TestCommandBridge { ~TestGroupsCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestGroupsCluster\n"); @@ -135188,7 +130947,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135220,7 +130978,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135252,7 +131009,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135285,7 +131041,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -135326,7 +131081,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -135363,7 +131117,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135396,7 +131149,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135433,7 +131185,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135465,7 +131216,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135502,7 +131252,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135535,7 +131284,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135572,7 +131320,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135604,7 +131351,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135641,7 +131387,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135678,7 +131423,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135718,7 +131462,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135750,7 +131493,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135782,7 +131524,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135814,7 +131555,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135851,7 +131591,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135883,7 +131622,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135924,7 +131662,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135943,7 +131680,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -135975,7 +131711,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136007,7 +131742,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136039,7 +131773,6 @@ class TestGroupsCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136093,17 +131826,10 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { ~TestGroupKeyManagementCluster() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: TestGroupKeyManagementCluster\n"); @@ -136382,7 +132108,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136405,7 +132130,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136428,7 +132152,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136469,7 +132192,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136510,7 +132232,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136562,7 +132283,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136598,7 +132318,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136659,7 +132378,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136706,7 +132424,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136769,7 +132486,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136802,7 +132518,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136835,7 +132550,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136868,7 +132582,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -136901,7 +132614,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -136991,7 +132703,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137015,7 +132726,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137043,7 +132753,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137095,7 +132804,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137127,7 +132835,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137202,7 +132909,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137221,7 +132927,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137251,7 +132956,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137275,7 +132979,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137303,7 +133006,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137344,7 +133046,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137385,7 +133086,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137427,7 +133127,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137451,7 +133150,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137490,7 +133188,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137514,7 +133211,6 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; @@ -137558,17 +133254,10 @@ class Test_TC_G_1_1 : public TestCommandBridge { ~Test_TC_G_1_1() {} - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - /////////// TestCommand Interface ///////// void NextTest() override { CHIP_ERROR err = CHIP_NO_ERROR; - commissionerNodeId = mCommissionerNodeId.ValueOr(0); if (0 == mTestIndex) { ChipLogProgress(chipTool, " **** Test Start: Test_TC_G_1_1\n"); @@ -137687,7 +133376,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137712,7 +133400,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137737,7 +133424,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137757,7 +133443,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137784,7 +133469,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); @@ -137811,7 +133495,6 @@ class Test_TC_G_1_1 : public TestCommandBridge { { MTRBaseDevice * device = GetDevice("alpha"); - commissionerNodeId = mCommissionerNodeId.ValueOr(0); __auto_type * cluster = [[MTRBaseClusterGroups alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h index 2cc8f1f37ee3a8..0d4ba7e4832f6c 100644 --- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h @@ -50,14 +50,6 @@ class Test_TC_BINFO_2_3_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -83,12 +75,6 @@ class Test_TC_BINFO_2_3_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -212,14 +198,6 @@ class Test_TC_ACT_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -241,12 +219,6 @@ class Test_TC_ACT_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -299,14 +271,6 @@ class Test_TC_BOOL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -328,12 +292,6 @@ class Test_TC_BOOL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -378,14 +336,6 @@ class Test_TC_DESC_2_2_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -407,12 +357,6 @@ class Test_TC_DESC_2_2_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -473,14 +417,6 @@ class Test_TC_DGETH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -502,12 +438,6 @@ class Test_TC_DGETH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -602,14 +532,6 @@ class Test_TC_DGSW_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -631,12 +553,6 @@ class Test_TC_DGSW_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -698,14 +614,6 @@ class Test_TC_DGWIFI_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -727,12 +635,6 @@ class Test_TC_DGWIFI_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -844,14 +746,6 @@ class Test_TC_FLW_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -873,12 +767,6 @@ class Test_TC_FLW_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -935,14 +823,6 @@ class Test_TC_G_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -964,12 +844,6 @@ class Test_TC_G_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1015,14 +889,6 @@ class Test_TC_I_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1044,12 +910,6 @@ class Test_TC_I_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1106,14 +966,6 @@ class Test_TC_PRS_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1135,12 +987,6 @@ class Test_TC_PRS_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1217,14 +1063,6 @@ class Test_TC_PS_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1246,12 +1084,6 @@ class Test_TC_PS_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1416,14 +1248,6 @@ class Test_TC_PSCFG_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1445,12 +1269,6 @@ class Test_TC_PSCFG_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1495,14 +1313,6 @@ class Test_TC_RH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1524,12 +1334,6 @@ class Test_TC_RH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1590,14 +1394,6 @@ class Test_TC_SWTCH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1619,12 +1415,6 @@ class Test_TC_SWTCH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1677,14 +1467,6 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1706,12 +1488,6 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1777,14 +1553,6 @@ class Test_TC_LCFG_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1806,12 +1574,6 @@ class Test_TC_LCFG_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1864,14 +1626,6 @@ class Test_TC_LUNIT_1_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1893,12 +1647,6 @@ class Test_TC_LUNIT_1_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1964,14 +1712,6 @@ class Test_TC_LUNIT_2_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1993,12 +1733,6 @@ class Test_TC_LUNIT_2_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2054,14 +1788,6 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2083,12 +1809,6 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2198,14 +1918,6 @@ class Test_TC_OCC_2_4_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2227,12 +1939,6 @@ class Test_TC_OCC_2_4_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2283,14 +1989,6 @@ class Test_TC_ULABEL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2312,12 +2010,6 @@ class Test_TC_ULABEL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2368,14 +2060,6 @@ class Test_TC_FLABEL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2397,12 +2081,6 @@ class Test_TC_FLABEL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2448,14 +2126,6 @@ class Test_TC_LTIME_1_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2477,12 +2147,6 @@ class Test_TC_LTIME_1_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h index 2cc8f1f37ee3a8..0d4ba7e4832f6c 100644 --- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h +++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h @@ -50,14 +50,6 @@ class Test_TC_BINFO_2_3_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -83,12 +75,6 @@ class Test_TC_BINFO_2_3_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -212,14 +198,6 @@ class Test_TC_ACT_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -241,12 +219,6 @@ class Test_TC_ACT_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -299,14 +271,6 @@ class Test_TC_BOOL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -328,12 +292,6 @@ class Test_TC_BOOL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -378,14 +336,6 @@ class Test_TC_DESC_2_2_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -407,12 +357,6 @@ class Test_TC_DESC_2_2_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -473,14 +417,6 @@ class Test_TC_DGETH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -502,12 +438,6 @@ class Test_TC_DGETH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -602,14 +532,6 @@ class Test_TC_DGSW_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -631,12 +553,6 @@ class Test_TC_DGSW_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -698,14 +614,6 @@ class Test_TC_DGWIFI_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -727,12 +635,6 @@ class Test_TC_DGWIFI_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -844,14 +746,6 @@ class Test_TC_FLW_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -873,12 +767,6 @@ class Test_TC_FLW_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -935,14 +823,6 @@ class Test_TC_G_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -964,12 +844,6 @@ class Test_TC_G_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1015,14 +889,6 @@ class Test_TC_I_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1044,12 +910,6 @@ class Test_TC_I_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1106,14 +966,6 @@ class Test_TC_PRS_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1135,12 +987,6 @@ class Test_TC_PRS_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1217,14 +1063,6 @@ class Test_TC_PS_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1246,12 +1084,6 @@ class Test_TC_PS_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1416,14 +1248,6 @@ class Test_TC_PSCFG_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1445,12 +1269,6 @@ class Test_TC_PSCFG_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1495,14 +1313,6 @@ class Test_TC_RH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1524,12 +1334,6 @@ class Test_TC_RH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1590,14 +1394,6 @@ class Test_TC_SWTCH_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1619,12 +1415,6 @@ class Test_TC_SWTCH_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1677,14 +1467,6 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1706,12 +1488,6 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1777,14 +1553,6 @@ class Test_TC_LCFG_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1806,12 +1574,6 @@ class Test_TC_LCFG_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1864,14 +1626,6 @@ class Test_TC_LUNIT_1_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1893,12 +1647,6 @@ class Test_TC_LUNIT_1_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -1964,14 +1712,6 @@ class Test_TC_LUNIT_2_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -1993,12 +1733,6 @@ class Test_TC_LUNIT_2_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2054,14 +1788,6 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2083,12 +1809,6 @@ class Test_TC_OCC_2_2_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2198,14 +1918,6 @@ class Test_TC_OCC_2_4_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2227,12 +1939,6 @@ class Test_TC_OCC_2_4_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2283,14 +1989,6 @@ class Test_TC_ULABEL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2312,12 +2010,6 @@ class Test_TC_ULABEL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2368,14 +2060,6 @@ class Test_TC_FLABEL_3_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2397,12 +2081,6 @@ class Test_TC_FLABEL_3_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: { @@ -2448,14 +2126,6 @@ class Test_TC_LTIME_1_1_SimulatedSuite : public TestCommand void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override { - - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; - bool shouldContinue = false; switch (mTestIndex - 1) @@ -2477,12 +2147,6 @@ class Test_TC_LTIME_1_1_SimulatedSuite : public TestCommand CHIP_ERROR DoTestStep(uint16_t testIndex) override { using namespace chip::app::Clusters; - // Allow yaml to access the current commissioner node id. - // Default to 0 (undefined node id) so we know if this isn't - // set correctly. - // Reset on every step in case it changed. - chip::NodeId commissionerNodeId = mCommissionerNodeId.ValueOr(0); - (void) commissionerNodeId; switch (testIndex) { case 0: {