Use the XML defined response or the one assigned from ZAP instead of …

…a custom heuristic (project-chip#10606)

src/app/zap-templates/common/ClustersHelper.js

@@ -85,6 +85,22 @@ function loadClusters()
       .then(clusters => clusters.filter(cluster => cluster.enabled == 1));
 }
 
+function loadCommandResponse(command, packageId)
+{
+  const { db, sessionId } = this.global;
+  return queryCommand.selectCommandById(db, command.id, packageId).then(commandDetails => {
+    if (commandDetails.responseRef == null) {
+      command.response = null;
+      return command;
+    }
+
+    return queryCommand.selectCommandById(db, commandDetails.responseRef, packageId).then(response => {
+      command.response = response;
+      return command;
+    });
+  });
+}
+
 function loadCommandArguments(command, packageId)
 {
   const { db, sessionId } = this.global;
@@ -101,6 +117,7 @@ function loadCommands(packageId)
       .then(endpointTypes => queryEndpointType.selectClustersAndEndpointDetailsFromEndpointTypes(db, endpointTypes))
       .then(endpointTypesAndClusters => queryCommand.selectCommandDetailsFromAllEndpointTypesAndClusters(
                 db, endpointTypesAndClusters, true))
+      .then(commands => Promise.all(commands.map(command => loadCommandResponse.call(this, command, packageId))))
       .then(commands => Promise.all(commands.map(command => loadCommandArguments.call(this, command, packageId))));
 }
 
@@ -377,51 +394,18 @@ function enhancedCommands(commands, types)
   commands.forEach(command => {
     command.isResponse                    = command.name.includes('Response');
     command.isManufacturerSpecificCommand = !!this.mfgCode;
-  });
-
-  commands.forEach(command => {
-    // This filter uses the assumption that a response to a command has a well defined name, such as
-    // (response name) == (command name + 'Response') or s/Request/Response. This is very often the case,
-    // but this is not always true since some clusters use the same response to answer different commands, such as the
-    // operational cluster.
-    const automaticFilter = response => {
-      if (!response.isResponse) {
-        return false;
-      }
-
-      if (response.clusterName != command.clusterName) {
-        return false;
-      }
-
-      if (response.name == command.name) {
-        return false;
-      }
-
-      return (response.name == (command.name + 'Response')) || (response.name == (command.name.replace('Request', 'Response')));
-    };
-
-    const manualFilter = response => {
-      switch (command.name) {
-      case 'AddNOC':
-      case 'UpdateNOC':
-      case 'UpdateFabricLabel':
-      case 'RemoveFabric':
-        return response.name == 'NOCResponse';
-      default:
-        return false;
-      }
-    };
-    const filter = response => automaticFilter(response) || manualFilter(response);
 
-    const response = commands.find(filter);
-    if (response) {
-      command.hasSpecificResponse = true;
-      command.responseName        = response.name;
-      command.response            = response;
+    command.hasSpecificResponse = !!command.response;
+    if (command.response) {
+      const responseName   = command.response.name;
+      command.responseName = responseName;
+      // The 'response' property contains the response returned by the `selectCommandById`
+      // helper. But this one does not contains all the metadata informations added by
+      // `enhancedItem`, so instead of using the one from ZAP, retrieve the enhanced version.
+      command.response = commands.find(command => command.name == responseName);
     } else {
-      command.hasSpecificResponse = false;
-      command.responseName        = 'DefaultSuccess';
-      command.response            = { arguments : [] };
+      command.responseName = 'DefaultSuccess';
+      command.response     = { arguments : [] };
     }
   });
 

src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml

@@ -93,7 +93,7 @@ limitations under the License.
       <arg name="AttestationSignature" type="OCTET_STRING"/>
     </command>
 
-    <command source="client" code="0x06" name="AddNOC" optional="false">
+    <command source="client" code="0x06" name="AddNOC" response="NOCResponse" optional="false">
       <description>Sender is requesting to add the new node operational certificates.</description>
       <arg name="NOCValue" type="OCTET_STRING"/>
       <arg name="ICACValue" type="OCTET_STRING" optional="true"/>
@@ -102,7 +102,7 @@ limitations under the License.
       <arg name="AdminVendorId" type="INT16U"/>
     </command>
 
-    <command source="client" code="0x07" name="UpdateNOC" optional="false">
+    <command source="client" code="0x07" name="UpdateNOC" response="NOCResponse" optional="false">
       <description>Sender is requesting to update the node operational certificates.</description>
       <arg name="NOCValue" type="OCTET_STRING"/>
       <arg name="ICACValue" type="OCTET_STRING" optional="true"/>
@@ -115,12 +115,12 @@ limitations under the License.
       <arg name="DebugText" type="CHAR_STRING"/>
     </command>
 
-    <command source="client" code="0x09" name="UpdateFabricLabel" optional="false">
+    <command source="client" code="0x09" name="UpdateFabricLabel" response="NOCResponse" optional="false">
       <description>This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute.</description>
       <arg name="Label" type="CHAR_STRING" length="32"/>
     </command>
 
-    <command source="client" code="0x0a" name="RemoveFabric" optional="false">
+    <command source="client" code="0x0a" name="RemoveFabric" response="NOCResponse" optional="false">
       <description>This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data.</description>
       <arg name="FabricIndex" type="INT8U"/>
     </command>

src/controller/data_model/controller-clusters.zap

@@ -2772,6 +2772,25 @@
           ],
           "attributes": []
         },
+        {
+          "name": "Diagnostic Logs",
+          "code": 50,
+          "mfgCode": null,
+          "define": "DIAGNOSTIC_LOGS_CLUSTER",
+          "side": "server",
+          "enabled": 0,
+          "commands": [
+            {
+              "name": "RetrieveLogsResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "incoming": 1,
+              "outgoing": 0
+            }
+          ],
+          "attributes": []
+        },
         {
           "name": "General Diagnostics",
           "code": 51,