From 6b61a59f096d08360b01a8b554bea31b415cf340 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Thu, 2 Feb 2023 13:13:19 -0500
Subject: [PATCH] Align diagnostic logs cluster XML to spec changes.

Fixes https://github.com/project-chip/connectedhomeip/issues/24826
---
 .../chip/diagnostic-logs-cluster.xml          | 14 +++++-----
 .../CHIP/templates/availability.yaml          | 26 +++++++++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml
index 2f5f9874c29c1e..6a85e2e946ef9f 100644
--- a/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml
@@ -16,13 +16,13 @@ limitations under the License.
 -->
 <configurator>
     <domain name="CHIP" spec="chip-0.7" dependsOn="zcl-1.0-07-5123-03" certifiable="true"/>
-    <enum name="LogsIntent" type="ENUM8">
+    <enum name="IntentEnum" type="ENUM8">
         <cluster code="0x0032"/>
         <item name="EndUserSupport" value="0x0"/>
         <item name="NetworkDiag" value="0x1"/>
         <item name="CrashLogs" value="0x2"/>
     </enum>
-    <enum name="LogsStatus" type="ENUM8">
+    <enum name="StatusEnum" type="ENUM8">
         <cluster code="0x0032"/>
         <item name="Success" value="0x0"/>
         <item name="Exhausted" value="0x1"/>
@@ -30,7 +30,7 @@ limitations under the License.
         <item name="Busy" value="0x3"/>
         <item name="Denied" value="0x4"/>
     </enum>
-    <enum name="LogsTransferProtocol" type="ENUM8">
+    <enum name="TransferProtocolEnum" type="ENUM8">
         <cluster code="0x0032"/>
         <item name="ResponsePayload" value="0x0"/>
         <item name="BDX" value="0x1"/>
@@ -45,13 +45,13 @@ limitations under the License.
         <server tick="false" init="false">true</server>
         <command source="client" code="0x00" name="RetrieveLogsRequest" response="RetrieveLogsResponse" optional="false" cli="chip logs retrieve">
             <description>Retrieving diagnostic logs from a Node</description>
-            <arg name="Intent" type="LogsIntent"/>
-            <arg name="RequestedProtocol" type="LogsTransferProtocol"/>
-            <arg name="TransferFileDesignator" type="OCTET_STRING" length="32"/>
+            <arg name="Intent" type="IntentEnum"/>
+            <arg name="RequestedProtocol" type="TransferProtocolEnum"/>
+            <arg name="TransferFileDesignator" type="OCTET_STRING" length="32" optional="true"/>
         </command>
         <command source="server" code="0x01" name="RetrieveLogsResponse" optional="false" cli="chip logs response">
             <description>Response to the RetrieveLogsRequest</description>
-            <arg name="Status" type="LogsStatus"/>
+            <arg name="Status" type="StatusEnum"/>
             <arg name="LogContent" type="OCTET_STRING"/>
             <arg name="UTCTimeStamp" type="epoch_s"/>
             <arg name="TimeSinceBoot" type="INT32U"/>
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 95f83dbe711979..ddc80683e013fc 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -5426,6 +5426,10 @@
               - OperationErrorEnum
               - OperatingModeEnum
               - OperationSourceEnum
+          DiagnosticLogs:
+              - IntentEnum
+              - StatusEnum
+              - TransferProtocolEnum
       enum values:
           OTASoftwareUpdateProvider:
               OTAApplyUpdateAction:
@@ -5668,6 +5672,20 @@
                   - Heat
                   - Cool
                   - Both
+          DiagnosticLogs:
+              IntentEnum:
+                  - EndUserSupport
+                  - NetworkDiag
+                  - CrashLogs
+              StatusEnum:
+                  - Success
+                  - Exhausted
+                  - NoLogs
+                  - Busy
+                  - Denied
+              TransferProtocolEnum:
+                  - ResponsePayload
+                  - BDX
       bitmaps:
           UnitTesting:
               - Bitmap8MaskMap
@@ -6015,6 +6033,10 @@
               - DoorLockSetPinOrIdStatus
               - DoorLockOperationEventCode
               - DoorLockProgrammingEventCode
+          DiagnosticLogs:
+              - LogsIntent
+              - LogsStatus
+              - LogsTransferProtocol
       enum values:
           GeneralCommissioning:
               CommissioningError:
@@ -6395,6 +6417,10 @@
               OperationSourceEnum: DlOperationSource
               UserStatusEnum: DlUserStatus
               UserTypeEnum: DlUserType
+          DiagnosticLogs:
+              IntentEnum: LogsIntent
+              StatusEnum: LogsStatus
+              TransferProtocolEnum: LogsTransferProtocol
       enum values:
           GeneralCommissioning:
               CommissioningError: