From de252bf661042f9903f49be42fae8aeb88bdf8bc Mon Sep 17 00:00:00 2001
From: "Missae W. Sasaya" <missae.sasaya@venkonetworks.com>
Date: Thu, 22 Aug 2024 15:40:19 -0300
Subject: [PATCH] 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;