From af017e19c4ed54717e0a6a572693bca455d1df56 Mon Sep 17 00:00:00 2001
From: Jacob McGill <9847006+jmcgill298@users.noreply.github.com>
Date: Fri, 25 Oct 2019 20:54:43 +0000
Subject: [PATCH] BugFix: WLC 80211 - Add missing EoL to matching empty lines
 (#508)

---
 .../cisco_wlc_ssh_show_802.11ab.template      | 69 +++++++++++++++----
 1 file changed, 55 insertions(+), 14 deletions(-)

diff --git a/templates/cisco_wlc_ssh_show_802.11ab.template b/templates/cisco_wlc_ssh_show_802.11ab.template
index e2ecbfc979..6bf9d9b50f 100644
--- a/templates/cisco_wlc_ssh_show_802.11ab.template
+++ b/templates/cisco_wlc_ssh_show_802.11ab.template
@@ -29,22 +29,33 @@ Start
   ^RSSI\sLow\sCheck\.*\s${RSSI_LOW_CHECK}s*$$
   ^RSSI\sThreshold\.*\s${RSSI_THRES}s*$$
   ^EDCA\sprofile\stype\.*\s${EDCA}s*$$
-  ^\s+Voice\sAC\s-\sAdmission\scontrol\s\(ACM\)\.*\s${VOICE_AMC}s*$$
-  ^\s+Voice\sCAC\sMethod.*\s${VOICE_CAC_METHOD}s*$$
-  ^\s+Voice\smax\sRF\sbandwidth\.*\s${VOICE_MAX_BANDWIDTH}s*$$
-  ^\s+Voice\sreserved\sroaming\sbandwidth\.*\s${VOICE_ROAMING_BANDWIDTH}s*$$
-  ^\s+Video\sAC\s-\sAdmission\scontrol\s\(ACM\)\.*\s${VIDEO_AMC}s*$$
-  ^\s+Video\sCAC\sMethod\s\.*\s${VIDEO_CAC_METHOD}s*$$
-  ^\s+Video\smax\sRF\sbandwidth\.*\s${VIDEO_MAX_BANDWIDTH}s*$$
-  ^\s+Video\sreserved\sroaming\sbandwidth\.*\s${VIDEO_ROAMING_BANDWIDTH}s*$$
+  ^Voice\s+AC:\s*$$ -> Voice
+  ^Video\s+AC:\s*$$ -> Video
+  ^802\.11n\s+Status:\s*$$ -> 80211n
   ^Maximum\sNumber\sof\sClients\sper\sAP(\sRadio)?\.*\s${MAX_CLIENT}s*$$
-  ^\s*
+  ^CF\s+Poll
+  ^CFP\s+[Period|Maximum]
+  ^Default\s+Channel
+  ^Default\s+Tx\s+Power\s+Level
+  ^DTPC\s+Status
+  ^Fragmentation\s+Threshold
+  ^RSSI\s+
+  ^TI\s+Threshold
+  ^Legacy\s+Tx\s+Beamforming setting
+  ^Traffic\s+Stream\s+Metrics Status
+  ^Expedited\s+BW\s+Request
+  ^World\s+Mode
+  ^dfs-peakdetect
+  ^Voice\s+MAC\s+optimization
+  ^Call\s+Admission\s+Control
+  ^\s*$$
   ^. -> Error
 
 Spec_support
   ^11${SPECS}Support\.*\s${SPECS_VALUE}s*$$
   ^802.11(a|b|b\/g)\sOperational\sRates -> Data_Rates
-  ^\s*
+  ^\s*802.11\S\s+(?:Low|Mid|High)\s+Band
+  ^\s*$$
   ^. -> Error
 
 Data_Rates
@@ -56,12 +67,42 @@ Data_Rates
 MCS_Rates
   ^\s+MCS\s${MCS_RATE}\.*\s+${MCS_RATE_VALUE}s*$$
   ^802.11ac\s+MCS\s+Settings: -> AC_MCS_Rates
-  ^802.11n Status: -> Start
-  ^\s*
+  ^802.11n Status: -> 80211n
+  ^\s*$$
   ^. -> Error
 
 AC_MCS_Rates
   ^\s+${SS_MCS_RATE}\s+\.*\s${SS_MCS_RATE_VALUE}s*$$
-  ^802.11n\s+Status: -> Start
-  ^\s*
+  ^802.11n\s+Status:\s*$$ -> 80211n
+  ^\s*$$
   ^. -> Error
+
+80211n
+  ^\s+A-M[P|S]DU\s+Tx
+  ^\s+Priority\s+\d+
+  ^\s+Aggregation\s+scheduler
+  ^\s+Frame\s+Burst
+  ^\s+Realtime\s+Timeout
+  ^\s+Non\s+Realtime\s+Timeout
+  ^Beacon\sInterval\.*\s${BEACON_INTERVAL}s*$$ -> Start
+  ^EDCA\sprofile\stype\.*\s${EDCA}s*$$
+  ^Maximum\sNumber\sof\sClients\sper\sAP(\sRadio)?\.*\s${MAX_CLIENT}s*$$
+  ^\S -> Start
+
+Voice
+  ^\s+Voice\sAC\s-\sAdmission\scontrol\s\(ACM\)\.*\s${VOICE_AMC}s*$$
+  ^\s+Voice\sCAC\sMethod.*\s${VOICE_CAC_METHOD}s*$$
+  ^\s+Voice\smax\sRF\sbandwidth\.*\s${VOICE_MAX_BANDWIDTH}s*$$
+  ^\s+Voice\sreserved\sroaming\sbandwidth\.*\s${VOICE_ROAMING_BANDWIDTH}s*$$
+  ^Video\s+AC:\s*$$ -> Video
+  ^Maximum\sNumber\sof\sClients\sper\sAP(\sRadio)?\.*\s${MAX_CLIENT}s*$$
+  ^\S -> Start
+
+Video
+  ^\s+Video\sAC\s-\sAdmission\scontrol\s\(ACM\)\.*\s${VIDEO_AMC}s*$$
+  ^\s+Video\sCAC\sMethod\s\.*\s${VIDEO_CAC_METHOD}s*$$
+  ^\s+Video\smax\sRF\sbandwidth\.*\s${VIDEO_MAX_BANDWIDTH}s*$$
+  ^\s+Video\sreserved\sroaming\sbandwidth\.*\s${VIDEO_ROAMING_BANDWIDTH}s*$$
+  ^Voice\s+AC:\s*$$ -> Voice
+  ^Maximum\sNumber\sof\sClients\sper\sAP(\sRadio)?\.*\s${MAX_CLIENT}s*$$
+  ^\S -> Start