Merge branch 'master' into dplore/logging-tls

openconfig · Aug 22, 2024 · a7dbb3b · a7dbb3b
2 parents f4a4539 + bdf3c7d
commit a7dbb3b
Showing 1 changed file with 41 additions and 6 deletions.
diff --git a/release/models/wifi/openconfig-wifi-mac.yang b/release/models/wifi/openconfig-wifi-mac.yang
@@ -26,7 +26,19 @@ module openconfig-wifi-mac {
   description
     "Model for managing MAC layer configuration of Radio interfaces.";
 
-  oc-ext:openconfig-version "1.3.1";
+  oc-ext:openconfig-version "1.3.3";
+
+  revision "2024-08-22" {
+    description "Fix XPath expression to avoid pyang error";
+    reference "1.3.3";
+  }
+
+  revision "2024-08-07" {
+    description
+      "Add transition modes ENHANCED_OPEN_TRANSITION, WPA3_2_SAE_TRANSITION and
+      WPA3_2_ENTERPRISE_TRANSITION";
+    reference "1.3.2";
+  }
 
   revision "2023-05-26" {
     description
@@ -253,15 +265,30 @@ module openconfig-wifi-mac {
           description
             "Open authentication with Opportunistic Wireless Encryption.";
         }
+        enum ENHANCED_OPEN_TRANSITION {
+          description
+            "Open authentication with Opportunistic Wireless Encryption and
+             support for transition mode.";
+        }
         enum WPA3_SAE {
           description
             "WPA3-SAE using Simultaneous Authentication of Equals (SAE).";
         }
+        enum WPA3_2_SAE_TRANSITION {
+          description
+            "WPA3-SAE using Simultaneous Authentication of Equals (SAE) and
+             WPA2-PSK AKMs.";
+        }
         enum WPA3_ENTERPRISE {
           description
             "WPA3-Enterprise with 802.1X SHA-256 authentication key
              management.";
         }
+        enum WPA3_2_ENTERPRISE_TRANSITION {
+          description
+            "WPA3-Enterprise with 802.1X SHA-256 authentication key
+             management.";
+        }
         enum WPA3_ENTERPRISE_192_BIT {
           description
             "WPA3-Enterprise with 802.1X SHA-384 authentication key
@@ -284,7 +311,8 @@ module openconfig-wifi-mac {
     }
 
     leaf wpa3-psk {
-      when "../opmode = 'WPA3_SAE'";
+      when "../opmode = 'WPA3_SAE' or
+      ../opmode = 'WPA3_2_SAE_TRANSITION'";
       type string {
         length "8..63";
       }
@@ -296,8 +324,10 @@ module openconfig-wifi-mac {
       when "../opmode = 'WPA2_ENTERPRISE' or
       ../opmode = 'WPA2_PERSONAL' or
       ../opmode = 'WPA3_ENTERPRISE' or
+      ../opmode = 'WPA3_2_ENTERPRISE_TRANSITION' or
       ../opmode = 'WPA3_ENTERPRISE_192_BIT' or
-      ../opmode = 'WPA3_SAE'";
+      ../opmode = 'WPA3_SAE' or
+      ../opmode = 'WPA3_2_SAE_TRANSITION'";
       type string;
         description
           "Specifies the RADIUS server-group to be used,
@@ -367,9 +397,14 @@ module openconfig-wifi-mac {
     }
 
     leaf mfp {
-      when "../opmode = 'WPA3_ENTERPRISE' or ../opmode =
-      'WPA3_ENTERPRISE_192_BIT' or ../opmode =
-      'WPA3_SAE' or ../opmode = 'ENHANCED_OPEN'";
+      when "../opmode = 'WPA3_ENTERPRISE' or
+      ../opmode = 'WPA3_2_ENTERPRISE_TRANSITION' or
+      ../opmode = 'WPA3_ENTERPRISE_192_BIT' or
+      ../opmode = 'WPA3_SAE' or
+      ../opmode = 'WPA3_2_SAE_TRANSITION' or
+      ../opmode = 'ENHANCED_OPEN' or
+      ../opmode = 'ENHANCED_OPEN_TRANSITION'
+      ";
       type boolean;
       mandatory true;
       description