Capture cisco_ios sh int switchport trunking VLANs in list

ntc_templates/templates/cisco_ios_show_interfaces_switchport.textfsm

@@ -7,7 +7,7 @@ Value ADMIN_MODE (.+?)
 Value ACCESS_VLAN (\d+|unassigned)
 Value NATIVE_VLAN (\d+)
 Value VOICE_VLAN (\S+)
-Value List TRUNKING_VLANS (\S+?)
+Value List TRUNKING_VLANS (\d+|\d+\-\d+|ALL|NONE)
 
 Start
   ^Name: -> Continue.Record
@@ -19,7 +19,29 @@ Start
   ^\s*Access\s+Mode\s+VLAN:\s+${ACCESS_VLAN}
   ^\s*Trunking\s+Native\s+Mode\s+VLAN:\s+${NATIVE_VLAN}
   ^\s*Voice\s+VLAN:\s+${VOICE_VLAN}
-  ^\s*Trunking\s+VLANs\s+Enabled:\s+${TRUNKING_VLANS},\s*$$ -> Trunk
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){1}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){2}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){3}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){4}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){5}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){6}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){7}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){8}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){9}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){10}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){11}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){12}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){13}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){14}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){15}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){16}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){17}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){18}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){19}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),){20}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),)+${TRUNKING_VLANS}\s*$$
+  ^\s*Trunking\s+VLANs\s+Enabled:\s+((\d+|\d+\-\d+),)+\s*$$ -> Trunk
   ^\s*Trunking\s+VLANs\s+Enabled:\s+${TRUNKING_VLANS}$$
   ^\s*Trunking\s+VLANs\s+Active
   ^\s*Administrative\s+Mode:\s+${ADMIN_MODE}$$
@@ -43,6 +65,28 @@ Start
   ^. -> Error
 
 Trunk
-  ^\s+${TRUNKING_VLANS},\s*$$
-  ^\s+${TRUNKING_VLANS}\s*$$ -> Start
+  ^\s+${TRUNKING_VLANS},\S+$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){1}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){2}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){3}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){4}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){5}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){6}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){7}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){8}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){9}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){10}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){11}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){12}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){13}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){14}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){15}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){16}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){17}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){18}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){19}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),){20}${TRUNKING_VLANS},\S*$$ -> Continue
+  ^\s+((\d+|\d+\-\d+),)+${TRUNKING_VLANS}\s*$$ -> Start
+  ^\s+((\d+|\d+\-\d+),)+(\d+|\d+\-\d+),\s*$$ -> Trunk
+  ^\s+${TRUNKING_VLANS}$$ -> Start
   ^. -> Error

tests/cisco_ios/show_interfaces_switchport/cisco_ios_show_interfaces_switchport2.yml

@@ -10,8 +10,25 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "1,12,15,31-36,40-42,80,85,101,201,240,410,420,602,604"
-      - "900,910,920,930,940"
+      - "1"
+      - "12"
+      - "15"
+      - "31-36"
+      - "40-42"
+      - "80"
+      - "85"
+      - "101"
+      - "201"
+      - "240"
+      - "410"
+      - "420"
+      - "602"
+      - "604"
+      - "900"
+      - "910"
+      - "920"
+      - "930"
+      - "940"
   - interface: "Te5/0/2"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -22,5 +39,22 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "1,12,15,31-36,40-42,80,85,101,201,240,410,420,602,604"
-      - "900,910,920,930,940"
+      - "1"
+      - "12"
+      - "15"
+      - "31-36"
+      - "40-42"
+      - "80"
+      - "85"
+      - "101"
+      - "201"
+      - "240"
+      - "410"
+      - "420"
+      - "602"
+      - "604"
+      - "900"
+      - "910"
+      - "920"
+      - "930"
+      - "940"

tests/cisco_ios/show_interfaces_switchport/cisco_ios_show_interfaces_switchport_app_interfaces.yml

@@ -43,7 +43,12 @@ parsed_sample:
     native_vlan: "999"
     voice_vlan: "none"
     trunking_vlans:
-      - "200,313,754,900,990,999"
+      - "200"
+      - "313"
+      - "754"
+      - "900"
+      - "990"
+      - "999"
   - interface: "Gi1/0/5"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -527,7 +532,12 @@ parsed_sample:
     native_vlan: "999"
     voice_vlan: "none"
     trunking_vlans:
-      - "200,313,754,900,990,999"
+      - "200"
+      - "313"
+      - "754"
+      - "900"
+      - "990"
+      - "999"
   - interface: "Te1/1/1"
     switchport: "Enabled"
     switchport_monitor: ""

tests/cisco_ios/show_interfaces_switchport/cisco_ios_show_interfaces_switchport_ethertype.yml

@@ -10,7 +10,13 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "46-48,50,51,60,61,72,73"
+      - "46-48"
+      - "50"
+      - "51"
+      - "60"
+      - "61"
+      - "72"
+      - "73"
   - interface: "Te1/2"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -21,7 +27,13 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "46-48,52,53,62,63,72,73"
+      - "46-48"
+      - "52"
+      - "53"
+      - "62"
+      - "63"
+      - "72"
+      - "73"
   - interface: "Te1/3"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -32,7 +44,13 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "46-49,54,55,64,65,72,73"
+      - "46-49"
+      - "54"
+      - "55"
+      - "64"
+      - "65"
+      - "72"
+      - "73"
   - interface: "Te1/4"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -43,7 +61,11 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "46-49,55,65,72,232"
+      - "46-49"
+      - "55"
+      - "65"
+      - "72"
+      - "232"
   - interface: "Te1/5"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -54,7 +76,14 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "46,48,56,57,66,67,72,73"
+      - "46"
+      - "48"
+      - "56"
+      - "57"
+      - "66"
+      - "67"
+      - "72"
+      - "73"
   - interface: "Te1/6"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -65,7 +94,13 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "46-48,58,59,68,69,72,73"
+      - "46-48"
+      - "58"
+      - "59"
+      - "68"
+      - "69"
+      - "72"
+      - "73"
   - interface: "Te1/7"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -87,7 +122,9 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "40,45,48"
+      - "40"
+      - "45"
+      - "48"
   - interface: "Te1/10"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -109,7 +146,8 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "40,48"
+      - "40"
+      - "48"
   - interface: "Te1/21"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -120,7 +158,8 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "72,99"
+      - "72"
+      - "99"
   - interface: "Te1/23"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -131,7 +170,14 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "40,44,46-69,71-73,90,99,232,990"
+      - "40"
+      - "44"
+      - "46-69"
+      - "71-73"
+      - "90"
+      - "99"
+      - "232"
+      - "990"
   - interface: "Te1/24"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -142,7 +188,14 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "40,44,46-69,71-73,90,99,232,990"
+      - "40"
+      - "44"
+      - "46-69"
+      - "71-73"
+      - "90"
+      - "99"
+      - "232"
+      - "990"
   - interface: "Te1/25"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -219,7 +272,8 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "72,99"
+      - "72"
+      - "99"
   - interface: "Po1"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -230,7 +284,14 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "40,44,46-69,71-73,90,99,232,990"
+      - "40"
+      - "44"
+      - "46-69"
+      - "71-73"
+      - "90"
+      - "99"
+      - "232"
+      - "990"
   - interface: "Po2"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -241,4 +302,5 @@ parsed_sample:
     native_vlan: "0"
     voice_vlan: "none"
     trunking_vlans:
-      - "72,99"
+      - "72"
+      - "99"

tests/cisco_ios/show_interfaces_switchport/cisco_ios_show_interfaces_switchport_vepa_enabled.yml

@@ -252,7 +252,8 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "57,80"
+      - "57"
+      - "80"
   - interface: "Gi1/0/24"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -263,7 +264,8 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "57,80"
+      - "57"
+      - "80"
   - interface: "Gi1/1/1"
     switchport: "Enabled"
     switchport_monitor: ""
@@ -434,4 +436,5 @@ parsed_sample:
     native_vlan: "1"
     voice_vlan: "none"
     trunking_vlans:
-      - "57,80"
+      - "57"
+      - "80"