Fully align the XML for QueryImage and QueryImageResponse with the spec.

examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp

@@ -93,12 +93,12 @@ void OTAProviderExample::SetOTAFilePath(const char * path)
     }
 }
 
-EmberAfStatus OTAProviderExample::HandleQueryImage(chip::app::CommandHandler * commandObj,
-                                                   const chip::app::ConcreteCommandPath & commandPath, uint16_t vendorId,
-                                                   uint16_t productId, uint32_t softwareVersion, uint8_t protocolsSupported,
-                                                   const Optional<uint16_t> & hardwareVersion, const Optional<CharSpan> & location,
-                                                   const Optional<bool> & requestorCanConsent,
-                                                   const Optional<ByteSpan> & metadataForProvider)
+EmberAfStatus
+OTAProviderExample::HandleQueryImage(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
+                                     uint16_t vendorId, uint16_t productId, uint32_t softwareVersion,
+                                     const chip::app::DataModel::DecodableList<EmberAfOTADownloadProtocol> & protocolsSupported,
+                                     const Optional<uint16_t> & hardwareVersion, const Optional<CharSpan> & location,
+                                     const Optional<bool> & requestorCanConsent, const Optional<ByteSpan> & metadataForProvider)
 {
     // TODO: add confiuration for returning BUSY status
 
@@ -150,18 +150,15 @@ EmberAfStatus OTAProviderExample::HandleQueryImage(chip::app::CommandHandler * c
     }
 
     chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Type response;
-    response.status                = queryStatus;
-    response.delayedActionTime     = mDelayedActionTimeSec;
-    response.imageURI              = chip::CharSpan(uriBuf, strlen(uriBuf));
-    response.softwareVersion       = newSoftwareVersion;
-    response.softwareVersionString = chip::CharSpan(kExampleSoftwareString, strlen(kExampleSoftwareString));
-    response.updateToken           = chip::ByteSpan(updateToken);
-    response.userConsentNeeded     = userConsentNeeded;
-    // TODO: Once our client is using APIs that handle optional arguments
-    // correctly, update QueryImageResponse to have the right things optional.
-    // At that point we can decide whether to send metadataForRequestor as an
-    // empty ByteSpan or whether to not send it at all.
-    response.metadataForRequestor = chip::ByteSpan();
+    response.status = queryStatus;
+    response.delayedActionTime.Emplace(mDelayedActionTimeSec);
+    response.imageURI.Emplace(chip::CharSpan(uriBuf, strlen(uriBuf)));
+    response.softwareVersion.Emplace(newSoftwareVersion);
+    response.softwareVersionString.Emplace(chip::CharSpan(kExampleSoftwareString, strlen(kExampleSoftwareString)));
+    response.updateToken.Emplace(chip::ByteSpan(updateToken));
+    response.userConsentNeeded.Emplace(userConsentNeeded);
+    // Could also just not send metadataForRequestor at all.
+    response.metadataForRequestor.Emplace(chip::ByteSpan());
 
     VerifyOrReturnError(commandObj->AddResponseData(commandPath, response) == CHIP_NO_ERROR, EMBER_ZCL_STATUS_FAILURE);
     return EMBER_ZCL_STATUS_SUCCESS;

examples/ota-provider-app/ota-provider-common/OTAProviderExample.h

@@ -33,7 +33,8 @@ class OTAProviderExample : public chip::app::Clusters::OTAProviderDelegate
 
     // Inherited from OTAProviderDelegate
     EmberAfStatus HandleQueryImage(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                   uint16_t vendorId, uint16_t productId, uint32_t softwareVersion, uint8_t protocolsSupported,
+                                   uint16_t vendorId, uint16_t productId, uint32_t softwareVersion,
+                                   const chip::app::DataModel::DecodableList<EmberAfOTADownloadProtocol> & protocolsSupported,
                                    const chip::Optional<uint16_t> & hardwareVersion,
                                    const chip::Optional<chip::CharSpan> & location,
                                    const chip::Optional<bool> & requestorCanConsent,

examples/ota-requestor-app/linux/main.cpp

@@ -151,13 +151,12 @@ void OnConnected(void * context, OperationalDeviceProxy * operationalDeviceProxy
     constexpr EndpointId kOtaProviderEndpoint = 0;
 
     // These QueryImage params have been chosen arbitrarily
-    constexpr VendorId kExampleVendorId        = VendorId::Common;
-    constexpr uint16_t kExampleProductId       = 77;
-    constexpr uint16_t kExampleHWVersion       = 3;
-    constexpr uint16_t kExampleSoftwareVersion = 0;
-    constexpr EmberAfOTADownloadProtocol kExampleProtocolsSupported =
-        EMBER_ZCL_OTA_DOWNLOAD_PROTOCOL_BDX_SYNCHRONOUS; // TODO: support this as a list once ember adds list support
-    const char locationBuf[] = { 'U', 'S' };
+    constexpr VendorId kExampleVendorId                               = VendorId::Common;
+    constexpr uint16_t kExampleProductId                              = 77;
+    constexpr uint16_t kExampleHWVersion                              = 3;
+    constexpr uint16_t kExampleSoftwareVersion                        = 0;
+    constexpr EmberAfOTADownloadProtocol kExampleProtocolsSupported[] = { EMBER_ZCL_OTA_DOWNLOAD_PROTOCOL_BDX_SYNCHRONOUS };
+    const char locationBuf[]                                          = { 'U', 'S' };
     CharSpan exampleLocation(locationBuf);
     constexpr bool kExampleClientCanConsent = false;
     ByteSpan metadata;

src/app/clusters/ota-provider/ota-provider-delegate.h

@@ -21,6 +21,7 @@
 #include <app-common/zap-generated/enums.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
+#include <app/data-model/DecodableList.h>
 #include <app/util/af.h>
 #include <lib/core/Optional.h>
 
@@ -35,9 +36,9 @@ namespace Clusters {
 class OTAProviderDelegate
 {
 public:
-    // TODO(#8605): protocolsSupported should be list of OTADownloadProtocol enums, not uint8_t
     virtual EmberAfStatus HandleQueryImage(CommandHandler * commandObj, const ConcreteCommandPath & commandPath, uint16_t vendorId,
-                                           uint16_t productId, uint32_t softwareVersion, uint8_t protocolsSupported,
+                                           uint16_t productId, uint32_t softwareVersion,
+                                           const DataModel::DecodableList<EmberAfOTADownloadProtocol> & protocolsSupported,
                                            const Optional<uint16_t> & hardwareVersion, const Optional<CharSpan> & location,
                                            const Optional<bool> & requestorCanConsent,
                                            const Optional<ByteSpan> & metadataForProvider) = 0;

src/app/clusters/ota-provider/ota-provider.cpp

@@ -188,7 +188,13 @@ bool emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(app::CommandHandl
     ChipLogDetail(Zcl, "  VendorID: 0x%" PRIx16, vendorId);
     ChipLogDetail(Zcl, "  ProductID: %" PRIu16, productId);
     ChipLogDetail(Zcl, "  SoftwareVersion: %" PRIu32, softwareVersion);
-    ChipLogDetail(Zcl, "  ProtocolsSupported: %" PRIu8, protocolsSupported);
+    ChipLogDetail(Zcl, "  ProtocolsSupported: [");
+    auto protocolIter = protocolsSupported.begin();
+    while (protocolIter.Next())
+    {
+        ChipLogDetail(Zcl, "    %" PRIu8, protocolIter.GetValue());
+    }
+    ChipLogDetail(Zcl, "  ]");
     if (hardwareVersion.HasValue())
     {
         ChipLogDetail(Zcl, "  HardwareVersion: %" PRIu16, hardwareVersion.Value());

src/app/zap-templates/zcl/data-model/chip/chip-ota.xml

@@ -48,7 +48,7 @@ limitations under the License.
             <arg name="vendorId" type="vendor_id"/>
             <arg name="productId" type="INT16U"/>
             <arg name="softwareVersion" type="INT32U"/>
-            <arg name="protocolsSupported" type="OTADownloadProtocol"/> <!-- TODO(#8605): add array="true" when lists are supported -->
+            <arg name="protocolsSupported" type="OTADownloadProtocol" array="true"/>
             <arg name="hardwareVersion" type="INT16U" optional="true"/>
             <arg name="location" type="CHAR_STRING" length="2" optional="true"/>
             <arg name="requestorCanConsent" type="BOOLEAN" optional="true"/>
@@ -67,13 +67,13 @@ limitations under the License.
         <command source="server" code="0x03" name="QueryImageResponse" optional="false" cli="chip ota queryimageresponse">
             <description>Response to QueryImage command</description>
             <arg name="status" type="OTAQueryStatus"/>
-            <arg name="delayedActionTime" type="INT32U"/>
-            <arg name="imageURI" type="CHAR_STRING"/>
-            <arg name="softwareVersion" type="INT32U"/>
-            <arg name="softwareVersionString" type="CHAR_STRING"/>
-            <arg name="updateToken" type="OCTET_STRING" length="32"/>
-            <arg name="userConsentNeeded" type="BOOLEAN" default="false"/>
-            <arg name="metadataForRequestor" type="OCTET_STRING" length="512"/>
+            <arg name="delayedActionTime" type="INT32U" optional="true"/>
+            <arg name="imageURI" type="CHAR_STRING" optional="true"/>
+            <arg name="softwareVersion" type="INT32U" optional="true"/>
+            <arg name="softwareVersionString" type="CHAR_STRING" optional="true"/>
+            <arg name="updateToken" type="OCTET_STRING" length="32" optional="true"/>
+            <arg name="userConsentNeeded" type="BOOLEAN" default="false" optional="true"/>
+            <arg name="metadataForRequestor" type="OCTET_STRING" length="512" optional="true"/>
         </command>
         <command source="server" code="0x04" name="ApplyUpdateResponse" optional="false" cli="chip ota applyupdateresponse">
             <description>Reponse to ApplyUpdateRequest command</description>