Merge branch 'master' into mplsEcmp

openconfig · Aug 26, 2024 · 75ac876 · 75ac876
2 parents 039ee2a + bdf3c7d
commit 75ac876
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 14 deletions.
diff --git a/release/models/optical-transport/openconfig-transport-types.yang b/release/models/optical-transport/openconfig-transport-types.yang
@@ -22,7 +22,14 @@ module openconfig-transport-types {
     "This module contains general type definitions and identities
     for optical transport models.";
 
-  oc-ext:openconfig-version "0.25.0";
+  oc-ext:openconfig-version "1.0.0";
+
+  revision "2024-07-24" {
+    description
+      "Corrected description for FACILITY and TERMINAL loopback-mode-type
+       enums.";
+    reference "1.0.0";
+  }
 
   revision "2024-06-28" {
     description
@@ -221,19 +228,19 @@ module openconfig-transport-types {
           "No loopback is applied";
       }
       enum FACILITY {
-        description
-          "A port internal loopback at ASIC level. The loopback directs
-          traffic normally transmitted on the port back to the device as
-          if received on the same port from an external source. Note this
-          mode is used when internal loopback does NOT specify MAC or PHY.";
-      }
-      enum TERMINAL {
         description
           "A port external loopback at ASIC level. The loopback which
           directs traffic received from an external source on the port
           back out the transmit side of the same port. Note this mode is
           used when external loopback does NOT specify MAC or PHY";
       }
+      enum TERMINAL {
+        description
+          "A port internal loopback at ASIC level. The loopback directs
+          traffic normally transmitted on the port back to the device as
+          if received on the same port from an external source. Note this
+          mode is used when internal loopback does NOT specify MAC or PHY.";
+      }
       enum ASIC_PHY_LOCAL {
         description
           "A port internal loopback at PHY module. The loopback directs

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