Align naming in Diagnostic Logs cluster XML with the spec. (#24266)

* Align naming in Diagnostic Logs cluster XML with the spec. * Regenerate generated files.
project-chip · Oct 12, 2023 · 1080768 · 1080768
1 parent 4edf0fe
commit 1080768
Show file tree

Hide file tree

Showing 16 changed files with 122 additions and 76 deletions.
diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -300,8 +300,8 @@ server cluster DiagnosticLogs = 50 {
 
   response struct RetrieveLogsResponse = 1 {
     LogsStatus status = 0;
-    OCTET_STRING content = 1;
-    epoch_s timeStamp = 2;
+    OCTET_STRING logContent = 1;
+    epoch_s UTCTimeStamp = 2;
     INT32U timeSinceBoot = 3;
   }
 

diff --git a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
@@ -74,9 +74,9 @@ void DiagnosticLogsCommandHandler::InvokeCommand(HandlerContext & handlerContext
                 VerifyOrDie(err == CHIP_NO_ERROR);
                 timeMs = *reinterpret_cast<decltype(timeMs) *>(buf.get());
 
-                response.status    = chip::app::Clusters::DiagnosticLogs::LogsStatus::kSuccess;
-                response.content   = chip::ByteSpan(buf.get() + sizeof(timeMs), logSize - sizeof(timeMs));
-                response.timeStamp = timeMs;
+                response.status       = chip::app::Clusters::DiagnosticLogs::LogsStatus::kSuccess;
+                response.logContent   = chip::ByteSpan(buf.get() + sizeof(timeMs), logSize - sizeof(timeMs));
+                response.UTCTimeStamp = timeMs;
                 handlerContext.mCommandHandler.AddResponse(handlerContext.mRequestPath, response);
             }
             break;

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
@@ -45,16 +45,16 @@ 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="LogsIntent"/>
+            <arg name="RequestedProtocol" type="LogsTransferProtocol"/>
+            <arg name="TransferFileDesignator" type="OCTET_STRING" length="32"/>
         </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="content" type="OCTET_STRING"/>
-            <arg name="timeStamp" type="epoch_s"/>
-            <arg name="timeSinceBoot" type="INT32U"/>
+            <arg name="Status" type="LogsStatus"/>
+            <arg name="LogContent" type="OCTET_STRING"/>
+            <arg name="UTCTimeStamp" type="epoch_s"/>
+            <arg name="TimeSinceBoot" type="INT32U"/>
         </command>
     </cluster>
 </configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -1280,8 +1280,8 @@ client cluster DiagnosticLogs = 50 {
 
   response struct RetrieveLogsResponse = 1 {
     LogsStatus status = 0;
-    OCTET_STRING content = 1;
-    epoch_s timeStamp = 2;
+    OCTET_STRING logContent = 1;
+    epoch_s UTCTimeStamp = 2;
     INT32U timeSinceBoot = 3;
   }
 

diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -4935,6 +4935,10 @@
           OnOff:
               OffWithEffect:
                   - effectIdentifier
+          DiagnosticLogs:
+              RetrieveLogsResponse:
+                  - logContent
+                  - utcTimeStamp
       structs:
           OTASoftwareUpdateRequestor:
               - ProviderLocation
@@ -5246,6 +5250,10 @@
           OnOff:
               OffWithEffect:
                   - effectId
+          DiagnosticLogs:
+              RetrieveLogsResponse:
+                  - content
+                  - timeStamp
       structs:
           Descriptor:
               - DeviceType
@@ -5337,6 +5345,10 @@
           OnOff:
               OffWithEffect:
                   effectIdentifier: effectId
+          DiagnosticLogs:
+              RetrieveLogsResponse:
+                  logContent: content
+                  utcTimeStamp: timeStamp
       structs:
           AccessControl:
               AccessControlEntryStruct: AccessControlEntry

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp