Add cluster id code for struct and enum in xml

src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml

@@ -18,6 +18,7 @@ limitations under the License.
   <domain name="General"/>
 
   <enum name="StatusCode" type="ENUM8">
+    <cluster code="0x003c"/>
      <item name="Success" value="0x00"/>
      <item name="Busy" value="0x01"/>
      <item name="GeneralError" value="0x02"/>

src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml

@@ -39,6 +39,7 @@ limitations under the License.
   </cluster>
 
   <enum name="ApplicationBasicStatus" type="ENUM8">
+    <cluster code="0x050d"/>
     <item name="Stopped" value="0x00"/>
     <item name="ActiveVisibleFocus" value="0x01"/>
     <item name="ActiveHidden" value="0x02"/>

src/app/zap-templates/zcl/data-model/chip/application-launcher-cluster.xml

@@ -47,11 +47,13 @@ limitations under the License.
   </cluster>
 
   <struct name="ApplicationLauncherApp">
+    <cluster code="0x050c"/>
     <item name="catalogVendorId" type="INT16U"/>
     <item name="applicationId" type="CHAR_STRING"/>
   </struct>
 
   <enum name="ApplicationLauncherStatus" type="ENUM8">
+    <cluster code="0x050c"/>
     <item name="Success" value="0x00"/>
     <item name="AppNotAvailable" value="0x01"/>
     <item name="SystemBusy" value="0x02"/>

src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml

@@ -42,12 +42,14 @@ limitations under the License.
   </cluster>
 
   <struct name="AudioOutputInfo">
+    <cluster code="0x050b"/>
     <item name="index" type="INT8U"/>
     <item name="outputType" type="AudioOutputType"/>
     <item name="name" type="OCTET_STRING" length="32"/> <!-- Change this to CHAR_STRING once it is supported #6112 -->
   </struct>
 
   <enum name="AudioOutputType" type="ENUM8">
+    <cluster code="0x050b"/>
     <item name="Hdmi" value="0x00"/>
     <item name="Bt" value="0x01"/>
     <item name="Optical" value="0x02"/>

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

@@ -17,16 +17,19 @@ limitations under the License.
 <configurator>
     <domain name="CHIP" spec="chip-0.7" dependsOn="zcl-1.0-07-5123-03" certifiable="true"/>
     <enum name="OTAQueryStatus" type="ENUM8">
+        <cluster code="0x0029"/>
         <item name="UpdateAvailable" value="0x0"/>
         <item name="Busy" value="0x1"/>
         <item name="NotAvailable" value="0x2"/>
     </enum>
     <enum name="OTAApplyUpdateAction" type="ENUM8">
+        <cluster code="0x0029"/>
         <item name="Proceed" value="0x0"/>
         <item name="AwaitNextAction" value="0x1"/>
         <item name="Discontinue" value="0x2"/>
     </enum>
     <enum name="OTADownloadProtocol" type="ENUM8">
+        <cluster code="0x0029"/>
         <item name="BDXSynchronous" value="0x0"/>
         <item name="BDXAsynchronous" value="0x1"/>
         <item name="HTTPS" value="0x2"/>
@@ -79,6 +82,7 @@ limitations under the License.
         </command>
     </cluster>
     <enum name="OTAAnnouncementReason" type="ENUM8">
+        <cluster code="0x002a"/>
         <item name="SimpleAnnouncement" value="0x0"/>
         <item name="UpdateAvailable" value="0x1"/>
         <item name="CriticalUpdateAvailable" value="0x2"/>

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

@@ -17,6 +17,7 @@ limitations under the License.
 <configurator>
     <domain name="CHIP" spec="chip-0.7" dependsOn="zcl-1.0-07-5123-03" certifiable="true"/>
     <enum name="NetworkCommissioningError" type="ENUM8">
+        <cluster code="0x0031"/>
         <item name="Success" value="0x0"/>
         <item name="OutOfRange" value="0x1"/>
         <item name="BoundsExceeded" value="0x2"/>
@@ -46,13 +47,15 @@ limitations under the License.
         <field name="WPA3-PERSONAL" mask="0x10"/>
     </bitmap>
     <struct name="WiFiInterfaceScanResult">
+        <cluster code="0x0031"/>
         <item name="Security" type="BITMAP8"/>
         <item name="SSID" type="OCTET_STRING"/>
         <item name="BSSID" type="OCTET_STRING"/>
         <item name="Channel" type="INT8U"/>
         <item name="FrequencyBand" type="INT32U"/>
     </struct>
     <struct name="ThreadInterfaceScanResult">
+        <cluster code="0x0031"/>
         <item name="DiscoveryResponse" type="OCTET_STRING"/>
     </struct>
     <cluster>

src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml

@@ -58,16 +58,19 @@ limitations under the License.
   </cluster>
 
   <struct name="ContentLaunchAdditionalInfo">
+    <cluster code="0x050a"/>
     <item name="name" type="CHAR_STRING"/>
     <item name="value" type="CHAR_STRING"/>
   </struct>
 
   <enum name="ContentLaunchMetricType" type="ENUM8">
+    <cluster code="0x050a"/>
     <item name="PIXELS" value="0x00"/>
     <item name="PERCENTAGE" value="0x01"/>
   </enum>
 
   <struct name="ContentLaunchDimension">
+    <cluster code="0x050a"/>
     <!-- TODO: Convert to double once it is supported -->
     <item name="width" type="CHAR_STRING"/>
     <!-- TODO: Convert to double once it is supported -->
@@ -76,13 +79,15 @@ limitations under the License.
   </struct>
 
   <struct name="ContentLaunchStyleInformation">
+    <cluster code="0x050a"/>
     <item name="imageUrl" type="CHAR_STRING"/>
     <item name="color" type="CHAR_STRING"/>
     <!-- TODO: Convert to struct ContentLaunchDimension once is supported -->
     <item name="size" type="INT8U"/>
   </struct>
 
   <struct name="ContentLaunchBrandingInformation">
+    <cluster code="0x050a"/>
     <item name="providerName" type="CHAR_STRING"/>
     <!-- TODO: Convert to struct ContentLaunchStyleInformation once is supported -->
     <item name="background" type="INT8U"/>
@@ -98,6 +103,7 @@ limitations under the License.
 
 
   <enum name="ContentLaunchParameterEnum" type="ENUM8">
+    <cluster code="0x050a"/>
     <item name="Actor" value="0x00"/>
     <item name="Channel" value="0x01"/>
     <item name="Character" value="0x02"/>
@@ -112,17 +118,20 @@ limitations under the License.
   </enum>
 
   <enum name="ContentLaunchStreamingType" type="ENUM8">
+    <cluster code="0x050a"/>
     <item name="DASH" value="0x00"/>
     <item name="HLS" value="0x01"/>
   </enum>
 
   <enum name="ContentLaunchStatus" type="ENUM8">
+    <cluster code="0x050a"/>
     <item name="Success" value="0x00"/>
     <item name="UrlNotAvailable" value="0x01"/>
     <item name="AuthFailed" value="0x02"/>
   </enum>
 
   <struct name="ContentLaunchParamater">
+    <cluster code="0x050a"/>
     <item name="Type" type="ContentLaunchParameterEnum"/>
     <item name="Value" type="CHAR_STRING"/>
     <item name="ExternalIDList" type="ARRAY" entryType="ContentLaunchAdditionalInfo" length="254"/>

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

@@ -18,6 +18,7 @@ limitations under the License.
   <domain name="CHIP"/>
 
   <struct name="DeviceType">
+    <cluster code="0x001d"/>
     <item name="type" type="DEVTYPE_ID"/>
     <item name="revision" type="INT16U"/>
   </struct>

src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml

@@ -17,18 +17,21 @@ 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">
+        <cluster code="0x0032"/>
         <item name="EndUserSupport" value="0x0"/>
         <item name="NetworkDiag" value="0x1"/>
         <item name="CrashLogs" value="0x2"/>
     </enum>
     <enum name="LogsStatus" type="ENUM8">
+        <cluster code="0x0032"/>
         <item name="Success" value="0x0"/>
         <item name="Exhausted" value="0x1"/>
         <item name="NoLogs" value="0x2"/>
         <item name="Busy" value="0x3"/>
         <item name="Denied" value="0x4"/>
     </enum>
     <enum name="LogsTransferProtocol" type="ENUM8">
+        <cluster code="0x0032"/>
         <item name="ResponsePayload" value="0x0"/>
         <item name="BDX" value="0x1"/>
     </enum>

src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml

@@ -17,6 +17,7 @@ limitations under the License.
 <configurator>
   <domain name="CHIP"/>
   <enum name="PHYRateType" type="ENUM8">
+    <cluster code="0x0037"/>
     <item name="10M" value="0x00"/>
     <item name="100M" value="0x01"/>
     <item name="1000M" value="0x02"/>

src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml

@@ -18,6 +18,7 @@ limitations under the License.
   <domain name="CHIP"/>
 
   <struct name="LabelStruct">
+    <cluster code="0x0040"/>
     <item name="label" type="OCTET_STRING" length="16"/> <!-- TODO: Change this to CHAR_STRING once it is supported #6112 -->
     <item name="value" type="OCTET_STRING" length="16"/> <!-- TODO: Change this to CHAR_STRING once it is supported #6112 -->
   </struct>

src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml

@@ -17,16 +17,19 @@ limitations under the License.
 <configurator>
   <domain name="CHIP"/>
   <enum name="GeneralCommissioningError" type="ENUM8">
+    <cluster code="0x0030"/>
     <item name="Ok" value="0x0"/>
     <item name="ValueOutsideRange" value="0x1"/>
     <item name="InvalidAuthentication" value="0x2"/>
   </enum>
   <enum name="RegulatoryLocationType" type="ENUM8">
+    <cluster code="0x0030"/>
     <item name="Indoor" value="0x0"/>
     <item name="Outdoor" value="0x1"/>
     <item name="IndoorOutdoor" value="0x2"/>
   </enum>
   <struct name="BasicCommissioningInfoType">
+    <cluster code="0x0030"/>
     <item name="FailSafeExpiryLengthMs" type="INT32U"/>
   </struct>  
   <cluster>

src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml

@@ -17,6 +17,7 @@ limitations under the License.
 <configurator>
   <domain name="CHIP"/>
   <enum name="HardwareFaultType" type="ENUM8">
+    <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="Radio" value="0x01"/>
     <item name="Sensor" value="0x02"/>
@@ -30,6 +31,7 @@ limitations under the License.
     <item name="TamperDetected" value="0x0A"/>
   </enum>
   <enum name="RadioFaultType" type="ENUM8">
+    <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="WiFiFault" value="0x01"/>
     <item name="CellularFault" value="0x02"/>
@@ -39,12 +41,14 @@ limitations under the License.
     <item name="EthernetFault" value="0x06"/>    
   </enum>
   <enum name="NetworkFaultType" type="ENUM8">
+    <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="HardwareFailure" value="0x01"/>
     <item name="NetworkJammed" value="0x02"/>
     <item name="ConnectionFailed" value="0x03"/>
   </enum>
   <enum name="BootReasonType" type="ENUM8">
+    <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="PowerOnReboot" value="0x01"/>
     <item name="BrownOutReset" value="0x02"/>
@@ -54,13 +58,15 @@ limitations under the License.
     <item name="SoftwareReset" value="0x06"/>
   </enum>  
   <enum name="InterfaceType" type="ENUM8">
+    <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="WiFi" value="0x01"/>
     <item name="Ethernet" value="0x02"/>
     <item name="Cellular" value="0x03"/>
     <item name="Thread" value="0x04"/>
   </enum>
   <struct name="NetworkInterfaceType">
+    <cluster code="0x0033"/>
     <!-- TODO: CHAR_STRING not supported yet in structs. -->
     <item name="Name" type="OCTET_STRING" length="32"/>
     <item name="FabricConnected" type="BOOLEAN"/>

src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml

@@ -18,12 +18,14 @@ limitations under the License.
   <domain name="CHIP"/>
 
   <struct name="GroupState">
+    <cluster code="0xF004"/>
     <item name="VendorId" type="INT16U"/>
     <item name="VendorGroupId" type="INT16U"/>
     <item name="GroupKeySetIndex" type="INT16U"/>
   </struct>
 
   <struct name="GroupKey">
+    <cluster code="0xF004"/>
     <item name="VendorId" type="INT16U"/>
     <item name="GroupKeyIndex" type="INT16U"/>
     <item name="GroupKeyRoot" type="OCTET_STRING" length="16"/>
@@ -32,6 +34,7 @@ limitations under the License.
   </struct>
 
   <enum name="GroupKeySecurityPolicy" type="ENUM8">
+    <cluster code="0xF004"/>
     <item name="Standard" value="0x00"/>
     <item name="LowLatency" value="0x01"/>
   </enum>

src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml

@@ -39,12 +39,14 @@ limitations under the License.
   </cluster>
 
   <enum name="KeypadInputStatus" type="ENUM8">
+    <cluster code="0x0509"/>
     <item name="Success" value="0x00"/>
     <item name="UnsupportedKey" value="0x01"/>
     <item name="InvalidKeyInCurrentState" value="0x02"/>
   </enum>
 
   <enum name="KeypadInputCecKeyCode" type="ENUM8">
+    <cluster code="0x0509"/>
     <item name="Select" value="0x00"/>
     <item name="Up" value="0x01"/>
     <item name="Down" value="0x02"/>

src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml

@@ -50,13 +50,15 @@ limitations under the License.
   </cluster>
 
   <struct name="MediaInputInfo">
+    <cluster code="0x0507"/>
     <item name="index" type="INT8U"/>
     <item name="inputType" type="MediaInputType"/>
     <item name="name" type="OCTET_STRING" length="32"/> <!-- Change this to CHAR_STRING once it is supported #6112 -->
     <item name="description" type="OCTET_STRING" length="32"/> <!-- Change this to CHAR_STRING once it is supported #6112 -->
   </struct>
 
   <enum name="MediaInputType" type="ENUM8">
+    <cluster code="0x0507"/>
     <item name="Internal" value="0x00"/>
     <item name="Aux" value="0x01"/>
     <item name="Coax" value="0x02"/>

src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml

@@ -142,18 +142,21 @@ limitations under the License.
   </cluster>
 
   <struct name="MediaPlaybackPosition">
+    <cluster code="0x0506"/>
     <item name="updatedAt" type="INT64U"/>
     <item name="position" type="INT64U"/>    
   </struct>
 
   <enum name="MediaPlaybackState" type="ENUM8">
+    <cluster code="0x0506"/>
     <item name="Playing" value="0x00"/>
     <item name="Paused" value="0x01"/>
     <item name="NotPlaying" value="0x02"/>
     <item name="Buffering" value="0x03"/>
   </enum>
 
   <enum name="MediaPlaybackStatus" type="ENUM8">
+    <cluster code="0x0506"/>
     <item name="Success" value="0x00"/>
     <item name="InvalidStateForCommand" value="0x01"/>
     <item name="NotAllowed" value="0x02"/>

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

@@ -18,17 +18,20 @@ limitations under the License.
   <domain name="General"/>
 
   <enum name="OnOffEffectIdentifier" type="enum8">
+    <cluster code="0x0006"/>
     <item name="DelayedAllOff" value="0x00"/>
     <item name="DyingLight" value="0x01"/>
   </enum>
 
   <enum name="OnOffDelayedAllOffEffectVariant" type="enum8">
+    <cluster code="0x0006"/>
     <item name="FadeToOffIn_0p8Seconds" value="0x00"/>
     <item name="NoFade" value="0x01"/>
     <item name="50PercentDimDownIn_0p8SecondsThenFadeToOffIn_12Seconds" value="0x02"/>
   </enum>
 
   <enum name="OnOffDyingLightEffectVariant" type="enum8">
+    <cluster code="0x0006"/>
     <item name="20PercenterDimUpIn_0p5SecondsThenFadeToOffIn_1Second" value="0x00"/>
   </enum>
 

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

@@ -18,6 +18,7 @@ limitations under the License.
   <domain name="CHIP"/>
 
   <struct name="FabricDescriptor">
+    <cluster code="0x003E"/>
     <item name="FabricIndex" type="INT8U"/>
     <item name="RootPublicKey" type="OCTET_STRING" length="65"/>
     <item name="VendorId" type="INT16U"/> <!-- Change INT16U to new type VendorID #2395 -->
@@ -27,6 +28,7 @@ limitations under the License.
   </struct>
 
   <enum name="NodeOperationalCertStatus" type="ENUM8">
+    <cluster code="0x003E"/>
     <item name="SUCCESS" value="0x00"/>
     <item name="InvalidPublicKey" value="0x01"/>
     <item name="InvalidNodeOpId" value="0x02"/>
@@ -40,6 +42,7 @@ limitations under the License.
   </enum>
 
   <struct name="NOCStruct">
+    <cluster code="0x003E"/>
     <item name="FabricIndex" type="INT8U"/>
     <item name="NOC" type="OCTET_STRING"/>
   </struct>