From 147cfe8027cf80d86cab485fc05d735f2b00538c Mon Sep 17 00:00:00 2001 From: Likai Liu Date: Mon, 19 Aug 2024 17:02:18 -0400 Subject: [PATCH 1/3] Correction to loopback-mode-type FACILITY and TERMINAL #1135 (#1155) * Correction to loopback-mode-type FACILITY and TERMINAL #1135 --- .../openconfig-transport-types.yang | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/release/models/optical-transport/openconfig-transport-types.yang b/release/models/optical-transport/openconfig-transport-types.yang index b38fb1c2c..7c3c6a481 100644 --- 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 From 5c402a135033b6e07b925e66a73eeab47aa87f0c Mon Sep 17 00:00:00 2001 From: Jake Snyder Date: Wed, 21 Aug 2024 11:27:06 -0600 Subject: [PATCH 2/3] #1159 wifi mac transition modes (#1162) * fixing #1159 adding transition modes * Update version and revision history * fixed trailing whitespace --- release/models/wifi/openconfig-wifi-mac.yang | 41 +++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/release/models/wifi/openconfig-wifi-mac.yang b/release/models/wifi/openconfig-wifi-mac.yang index 3bb25cfc4..2280a5a42 100644 --- a/release/models/wifi/openconfig-wifi-mac.yang +++ b/release/models/wifi/openconfig-wifi-mac.yang @@ -26,7 +26,13 @@ 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.2"; + + revision "2024-08-07" { + description + "Add transition modes ENHANCED_OPEN_TRANSITION, WPA3_2_SAE_TRANSITION and + WPA3_2_ENTERPRISE_TRANSITION"; + } revision "2023-05-26" { description @@ -253,15 +259,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 +305,8 @@ module openconfig-wifi-mac { } leaf wpa3-psk { - when "../opmode = 'WPA3_SAE'"; + when "../opmode = 'WPA3_SAE' or + ../opemode = 'WPA3_2_SAE_TRANSITION"; type string { length "8..63"; } @@ -296,8 +318,10 @@ module openconfig-wifi-mac { when "../opmode = 'WPA2_ENTERPRISE' or ../opmode = 'WPA2_PERSONAL' or ../opmode = 'WPA3_ENTERPRISE' or + ../opmode = 'WPA3_2_ENTERPRISE_TRANSITION ../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 +391,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 + ../opmode = 'WPA3_ENTERPRISE_192_BIT' or + ../opmode = 'WPA3_SAE' or + ../opmode = 'WPA3_2_SAE_TRANSITION + ../opmode = 'ENHANCED_OPEN' + ../opmode = 'ENHANCED_OPEN_TRANSITION + "; type boolean; mandatory true; description From bdf3c7d725d75355317f75e02d34a49f2bf9c328 Mon Sep 17 00:00:00 2001 From: "Missae W. Sasaya" Date: Thu, 22 Aug 2024 15:40:19 -0300 Subject: [PATCH 3/3] Fix XPath syntax error caught by pyang in openconfig-wifi-mac.yang (#1169) * Fix XPath syntax caught by pyang: ./wifi/openconfig-wifi-mac.yang:309: error: XPath syntax error: syntax error ./wifi/openconfig-wifi-mac.yang:324: error: XPath syntax error: syntax error ./wifi/openconfig-wifi-mac.yang:401: error: XPath syntax error: syntax error * Fix revision statements --- release/models/wifi/openconfig-wifi-mac.yang | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/release/models/wifi/openconfig-wifi-mac.yang b/release/models/wifi/openconfig-wifi-mac.yang index 2280a5a42..b9c85f634 100644 --- a/release/models/wifi/openconfig-wifi-mac.yang +++ b/release/models/wifi/openconfig-wifi-mac.yang @@ -26,12 +26,18 @@ module openconfig-wifi-mac { description "Model for managing MAC layer configuration of Radio interfaces."; - oc-ext:openconfig-version "1.3.2"; + 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" { @@ -306,7 +312,7 @@ module openconfig-wifi-mac { leaf wpa3-psk { when "../opmode = 'WPA3_SAE' or - ../opemode = 'WPA3_2_SAE_TRANSITION"; + ../opmode = 'WPA3_2_SAE_TRANSITION'"; type string { length "8..63"; } @@ -318,7 +324,7 @@ module openconfig-wifi-mac { when "../opmode = 'WPA2_ENTERPRISE' or ../opmode = 'WPA2_PERSONAL' or ../opmode = 'WPA3_ENTERPRISE' or - ../opmode = 'WPA3_2_ENTERPRISE_TRANSITION + ../opmode = 'WPA3_2_ENTERPRISE_TRANSITION' or ../opmode = 'WPA3_ENTERPRISE_192_BIT' or ../opmode = 'WPA3_SAE' or ../opmode = 'WPA3_2_SAE_TRANSITION'"; @@ -392,12 +398,12 @@ module openconfig-wifi-mac { leaf mfp { when "../opmode = 'WPA3_ENTERPRISE' or - ../opmode = 'WPA3_2_ENTERPRISE_TRANSITION + ../opmode = 'WPA3_2_ENTERPRISE_TRANSITION' or ../opmode = 'WPA3_ENTERPRISE_192_BIT' or ../opmode = 'WPA3_SAE' or - ../opmode = 'WPA3_2_SAE_TRANSITION - ../opmode = 'ENHANCED_OPEN' - ../opmode = 'ENHANCED_OPEN_TRANSITION + ../opmode = 'WPA3_2_SAE_TRANSITION' or + ../opmode = 'ENHANCED_OPEN' or + ../opmode = 'ENHANCED_OPEN_TRANSITION' "; type boolean; mandatory true;