[OTA] Integrate ota-requestor cluster as normal cluster in data model build flow

examples/all-clusters-app/ameba/chip_main.cmake

@@ -121,7 +121,6 @@ list(
     ${chip_dir}/zzz_generated/all-clusters-app/zap-generated/CHIPClusters.cpp
 
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
-    ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/ota-requestor-stub.cpp
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
 
     ${chip_dir}/examples/all-clusters-app/ameba/main/chipinterface.cpp

examples/all-clusters-app/linux/BUILD.gn

@@ -18,7 +18,6 @@ import("//build_overrides/chip.gni")
 executable("chip-all-clusters-app") {
   sources = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/ota-requestor-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "include/tv-callbacks.cpp",
     "include/tv-callbacks.h",

examples/all-clusters-app/mbed/CMakeLists.txt

@@ -67,7 +67,6 @@ target_sources(${APP_TARGET} PRIVATE
                ${CHIP_ROOT}/src/app/server/CommissioningWindowManager.cpp
 
                ${CHIP_ROOT}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
-               ${CHIP_ROOT}/examples/all-clusters-app/all-clusters-common/src/ota-requestor-stub.cpp
                ${CHIP_ROOT}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
 
                ${APP_UTIL}/DataModelHandler.cpp
@@ -139,6 +138,9 @@ target_sources(${APP_TARGET} PRIVATE
                ${APP_CLUSTERS}/general-diagnostics-server/general-diagnostics-server.cpp
                ${APP_CLUSTERS}/group-key-mgmt-server/group-key-mgmt-server.cpp
                ${APP_CLUSTERS}/power-source-configuration-server/power-source-configuration-server.cpp
+               ${APP_CLUSTERS}/ota-requestor/ota-requestor-server.cpp
+               ${APP_CLUSTERS}/ota-requestor/BDXDownloader.cpp
+               ${APP_CLUSTERS}/ota-requestor/OTARequestor.cpp
 )
 
 target_link_libraries(${APP_TARGET} mbed-os-posix-socket mbed-os mbed-ble mbed-events mbed-netsocket mbed-storage mbed-storage-kv-global-api mbed-mbedtls mbed-emac chip)

examples/all-clusters-app/p6/BUILD.gn

@@ -61,7 +61,6 @@ p6_executable("clusters_app") {
 
   sources = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/ota-requestor-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     "${examples_plat_dir}/LEDWidget.cpp",
     "${examples_plat_dir}/init_p6Platform.cpp",

examples/ota-requestor-app/ota-requestor-common/BUILD.gn

@@ -30,15 +30,6 @@ chip_data_model("ota-requestor-common") {
 
   deps = [ "${chip_root}/src/lib" ]
 
-  sources = [
-    "${chip_root}/src/app/clusters/ota-requestor/BDXDownloader.cpp",
-    "${chip_root}/src/app/clusters/ota-requestor/BDXDownloader.h",
-    "${chip_root}/src/app/clusters/ota-requestor/OTARequestor.cpp",
-    "${chip_root}/src/app/clusters/ota-requestor/ota-requestor-server.cpp",
-  ]
-
-  is_server = true
-
   public_configs = [ ":config" ]
 
   is_server = true

examples/shell/shell_common/BUILD.gn

@@ -74,7 +74,6 @@ static_library("shell_common") {
 
     sources += [
       "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
-      "${chip_root}/examples/all-clusters-app/all-clusters-common/src/ota-requestor-stub.cpp",
       "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
     ]
 

src/app/chip_data_model.gni

@@ -148,6 +148,14 @@ template("chip_data_model") {
           "${_app_root}/util/ContentApp.cpp",
           "${_app_root}/util/ContentAppPlatform.cpp",
         ]
+      } else if (cluster == "ota-requestor") {
+        sources += [
+          # TODO - align name of folder ?
+          "${_app_root}/clusters/${cluster}/${cluster}-server.cpp",
+          "${_app_root}/clusters/${cluster}/BDXDownloader.cpp",
+          "${_app_root}/clusters/${cluster}/BDXDownloader.h",
+          "${_app_root}/clusters/${cluster}/OTARequestor.cpp",
+        ]
       } else {
         sources += [ "${_app_root}/clusters/${cluster}/${cluster}.cpp" ]
       }

src/app/clusters/ota-requestor/OTARequestor.cpp

@@ -323,8 +323,8 @@ void OTARequestor::OnConnectionFailure(void * context, PeerId peerId, CHIP_ERROR
     OTARequestor * requestorCore = static_cast<OTARequestor *>(context);
     VerifyOrDie(requestorCore != nullptr);
 
-    ChipLogError(SoftwareUpdate, "Failed to connect to node 0x%" PRIX64 ": %" CHIP_ERROR_FORMAT, peerId.GetNodeId(),
-                 error.Format());
+    ChipLogError(SoftwareUpdate, "Failed to connect to node 0x" ChipLogFormatX64 ": %" CHIP_ERROR_FORMAT,
+                 ChipLogValueX64(peerId.GetNodeId()), error.Format());
 
     switch (requestorCore->mOnConnectedAction)
     {

src/app/zap_cluster_list.py

@@ -59,7 +59,7 @@
     'OPERATIONAL_CREDENTIALS_CLUSTER': ['operational-credentials-server'],
     'OTA_BOOTLOAD_CLUSTER': [],
     'OTA_PROVIDER_CLUSTER': ['ota-provider'],
-    'OTA_REQUESTOR_CLUSTER': [],
+    'OTA_REQUESTOR_CLUSTER': ['ota-requestor'],
     'POWER_SOURCE_CLUSTER': [],
     'POWER_SOURCE_CONFIGURATION_CLUSTER': ['power-source-configuration-server'],
     'POLL_CONTROL_CLUSTER': [],