From b6aca9228317acb322b227ebca7cb7b6c6af6d43 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Wed, 4 Jan 2023 13:08:06 -0500
Subject: [PATCH] Align naming in Network Commissioning cluster XML with the
 spec.

---
 .../data-model/chip/network-commissioning-cluster.xml |  8 ++++----
 .../Framework/CHIP/templates/MTRBaseClusters.zapt     |  2 +-
 src/darwin/Framework/CHIP/templates/availability.yaml | 11 +++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml
index eaf97404c4365b..57d469de794daa 100644
--- a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml
@@ -43,7 +43,7 @@ limitations under the License.
     <bitmap name="WiFiSecurity" type="BITMAP8">
         <cluster code="0x0031"/>
         <field name="Unencrypted" mask="0x1"/>
-        <field name="WEP-PERSONAL" mask="0x2"/>
+        <field name="WEP" mask="0x2"/>
         <field name="WPA-PERSONAL" mask="0x4"/>
         <field name="WPA2-PERSONAL" mask="0x8"/>
         <field name="WPA3-PERSONAL" mask="0x10"/>
@@ -171,8 +171,8 @@ limitations under the License.
     </cluster>
     <bitmap name="NetworkCommissioningFeature" type="BITMAP32">
         <cluster code="0x0031"/>
-        <field name="WiFiNetworkInterface" mask="0x1"/>
-        <field name="ThreadNetworkInterface" mask="0x2"/>
-        <field name="EthernetNetworkInterface" mask="0x4"/>
+        <field name="Wi-Fi network interface" mask="0x1"/>
+        <field name="Thread network interface" mask="0x2"/>
+        <field name="Ethernet network interface" mask="0x4"/>
     </bitmap>
 </configurator>
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
index 433c778543c4dd..99a43ecc41aadc 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
@@ -121,7 +121,7 @@ typedef NS_OPTIONS({{asUnderlyingZclType name}}, {{objCEnumName clusterName bitm
    {{objCEnumName ../clusterName ../bitmapName}}{{objCEnumItemLabel label}} {{availability ../clusterName bitmap=../bitmapName bitmapValue=(objCEnumItemLabel label) deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (objCEnumItemLabel label))}} = {{asHex mask}},
    {{#*inline "oldNameItemDecl"}}
    {{#if oldItemName}}
-   {{objCEnumName ../clusterName ../bitmapName}}{{objCEnumItemLabel oldItemName}} {{availability ../clusterName bitmap=../enumName bitmapValue=oldItemName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (objCEnumItemLabel label))}} = {{asHex value 2}},
+   {{objCEnumName ../clusterName ../bitmapName}}{{objCEnumItemLabel oldItemName}} {{availability ../clusterName bitmap=../bitmapName bitmapValue=oldItemName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (objCEnumItemLabel label))}} = {{asHex mask}},
    {{/if}}
    {{/inline}}
    {{> oldNameItemDecl oldItemName=(oldName ../clusterName bitmap=../bitmapName bitmapValue=(objCEnumItemLabel label))}}
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index bc301ada0ea09e..fb9685f8ad5539 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -5205,6 +5205,9 @@
               LevelControlOptions:
                   - ExecuteIfOff
                   - CoupleColorTempToLevel
+          NetworkCommissioning:
+              WiFiSecurity:
+                  - WEP
   deprecated:
       clusters:
           - OtaSoftwareUpdateProvider
@@ -5269,6 +5272,10 @@
           PowerSource:
               BatChargeLevel:
                   - Ok
+      bitmap values:
+          NetworkCommissioning:
+              WiFiSecurity:
+                  - WepPersonal
       apis:
           - Timed Invoke for server to client commands
           - Deprecated global attribute names
@@ -5347,3 +5354,7 @@
           PowerSource:
               BatChargeLevel:
                   OK: Ok
+      bitmap values:
+          NetworkCommissioning:
+              WiFiSecurity:
+                  WEP: WepPersonal