From 466e8acb611822db9fcbac3490d8fe8b609c0334 Mon Sep 17 00:00:00 2001 From: Dalton Bell Date: Wed, 13 Oct 2021 09:48:17 -0700 Subject: [PATCH 1/2] added VLAN value and search pattern --- ntc_templates/templates/cisco_asa_show_interface.textfsm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntc_templates/templates/cisco_asa_show_interface.textfsm b/ntc_templates/templates/cisco_asa_show_interface.textfsm index 274a7a92ef..6b889d73c5 100644 --- a/ntc_templates/templates/cisco_asa_show_interface.textfsm +++ b/ntc_templates/templates/cisco_asa_show_interface.textfsm @@ -10,6 +10,7 @@ Value SPEED (\d+\w+\s\w+) Value DESCRIPTION (.*) Value ADDRESS ([a-zA-Z0-9]+.[a-zA-Z0-9]+.[a-zA-Z0-9]+) Value MTU (\d+) +Value VLAN (\d+) Value IP_ADDRESS (\d+\.\d+\.\d+\.\d+) Value NET_MASK (\d+\.\d+\.\d+\.\d+) Value ONEMIN_IN_PPS (\d+) @@ -33,6 +34,7 @@ Start ^.*\(${DUPLEX}\),\s+\d+\s+Mbps\(${SPEED}\) ^.*Duplex,\s+Auto-Speed ^.*Description:\s+${DESCRIPTION} + ^.*VLAN\s+identifier\s+${VLAN} ^.*MAC\s+address\s+${ADDRESS},\s+MTU\s+${MTU} ^.*MAC\s+address\s+${ADDRESS},\s+MTU\s+not\s+set ^.*IP\s+address\s+${IP_ADDRESS},\s+subnet\s+mask\s+${NET_MASK} From 46f8b2d31e323d2fef775dd7b51e4763524a5dda Mon Sep 17 00:00:00 2001 From: dm-bell-networking Date: Thu, 14 Oct 2021 09:48:19 -0700 Subject: [PATCH 2/2] added new test and raw data for new keys and values, re-ran development script against existing raw data --- .../cisco_asa_show_interface.yml | 164 +++++++++--------- .../cisco_asa_show_interface1.yml | 164 +++++++++--------- .../cisco_asa_show_interface2.yml | 31 ++-- .../cisco_asa_show_interface_vlans.raw | 9 + .../cisco_asa_show_interface_vlans.yml | 27 +++ 5 files changed, 222 insertions(+), 173 deletions(-) create mode 100644 tests/cisco_asa/show_interface/cisco_asa_show_interface_vlans.raw create mode 100644 tests/cisco_asa/show_interface/cisco_asa_show_interface_vlans.yml diff --git a/tests/cisco_asa/show_interface/cisco_asa_show_interface.yml b/tests/cisco_asa/show_interface/cisco_asa_show_interface.yml index 3868812e5f..ee72115017 100644 --- a/tests/cisco_asa/show_interface/cisco_asa_show_interface.yml +++ b/tests/cisco_asa/show_interface/cisco_asa_show_interface.yml @@ -1,146 +1,152 @@ --- parsed_sample: - - address: "fa16.3eb0.c3d3" + - interface: "GigabitEthernet0/0" + interface_zone: "outside" + link_status: "up" + protocol_status: "up" + hardware_type: "i82540EM rev03" bandwidth: "1000 Mbps" delay: "10 usec" - description: "to iosv-1" duplex: "Full-duplex" - fivemin_drop_rate: "0" - fivemin_in_pps: "0" - fivemin_in_rate: "0" - fivemin_out_pps: "0" - fivemin_out_rate: "0" - hardware_type: "i82540EM rev03" - interface: "GigabitEthernet0/0" - interface_zone: "outside" - ip_address: "10.0.0.5" - link_status: "up" + speed: "1000 Mbps" + description: "to iosv-1" + address: "fa16.3eb0.c3d3" mtu: "1500" + vlan: "" + ip_address: "10.0.0.5" net_mask: "255.255.255.252" - onemin_drop_rate: "0" onemin_in_pps: "0" onemin_in_rate: "0" onemin_out_pps: "0" onemin_out_rate: "0" - protocol_status: "up" - speed: "1000 Mbps" - - address: "fa16.3ed1.7e26" - bandwidth: "1000 Mbps" - delay: "10 usec" - description: "to iosv-2" - duplex: "Full-duplex" - fivemin_drop_rate: "0" + onemin_drop_rate: "0" fivemin_in_pps: "0" fivemin_in_rate: "0" fivemin_out_pps: "0" fivemin_out_rate: "0" - hardware_type: "i82540EM rev03" - interface: "GigabitEthernet0/1" + fivemin_drop_rate: "0" + - interface: "GigabitEthernet0/1" interface_zone: "outside-1" - ip_address: "10.0.0.13" link_status: "up" + protocol_status: "up" + hardware_type: "i82540EM rev03" + bandwidth: "1000 Mbps" + delay: "10 usec" + duplex: "Full-duplex" + speed: "1000 Mbps" + description: "to iosv-2" + address: "fa16.3ed1.7e26" mtu: "1500" + vlan: "" + ip_address: "10.0.0.13" net_mask: "255.255.255.252" - onemin_drop_rate: "0" onemin_in_pps: "0" onemin_in_rate: "0" onemin_out_pps: "0" onemin_out_rate: "0" - protocol_status: "up" - speed: "1000 Mbps" - - address: "fa16.3e1c.d1c3" - bandwidth: "1000 Mbps" - delay: "10 usec" - description: "OOB Management" - duplex: "Full-duplex" - fivemin_drop_rate: "0" + onemin_drop_rate: "0" fivemin_in_pps: "0" - fivemin_in_rate: "91" + fivemin_in_rate: "0" fivemin_out_pps: "0" - fivemin_out_rate: "11" - hardware_type: "i82540EM rev03" - interface: "Management0/0" + fivemin_out_rate: "0" + fivemin_drop_rate: "0" + - interface: "Management0/0" interface_zone: "mgmt" - ip_address: "172.16.1.222" link_status: "up" + protocol_status: "up" + hardware_type: "i82540EM rev03" + bandwidth: "1000 Mbps" + delay: "10 usec" + duplex: "Full-duplex" + speed: "1000 Mbps" + description: "OOB Management" + address: "fa16.3e1c.d1c3" mtu: "1500" + vlan: "" + ip_address: "172.16.1.222" net_mask: "255.255.255.0" - onemin_drop_rate: "0" onemin_in_pps: "1" onemin_in_rate: "79" onemin_out_pps: "1" onemin_out_rate: "117" + onemin_drop_rate: "0" + fivemin_in_pps: "0" + fivemin_in_rate: "91" + fivemin_out_pps: "0" + fivemin_out_rate: "11" + fivemin_drop_rate: "0" + - interface: "DMZ" + interface_zone: "DMZ" + link_status: "up" protocol_status: "up" - speed: "1000 Mbps" - - address: "fa16.3eb0.c3d3" + hardware_type: "" bandwidth: "" delay: "" - description: "DMZ (Vl3)" duplex: "" - fivemin_drop_rate: "" - fivemin_in_pps: "" - fivemin_in_rate: "" - fivemin_out_pps: "" - fivemin_out_rate: "" - hardware_type: "" - interface: "DMZ" - interface_zone: "DMZ" - ip_address: "10.6.2.1" - link_status: "up" + speed: "" + description: "DMZ (Vl3)" + address: "fa16.3eb0.c3d3" mtu: "1500" + vlan: "" + ip_address: "10.6.2.1" net_mask: "255.255.255.0" - onemin_drop_rate: "" onemin_in_pps: "" onemin_in_rate: "" onemin_out_pps: "" onemin_out_rate: "" - protocol_status: "up" - speed: "" - - address: "fa16.3eb0.c3d3" - bandwidth: "" - delay: "" - description: "outside(Vl2)" - duplex: "" - fivemin_drop_rate: "" + onemin_drop_rate: "" fivemin_in_pps: "" fivemin_in_rate: "" fivemin_out_pps: "" fivemin_out_rate: "" - hardware_type: "" - interface: "outside" + fivemin_drop_rate: "" + - interface: "outside" interface_zone: "outside-3" - ip_address: "10.12.16.237" link_status: "up" + protocol_status: "up" + hardware_type: "" + bandwidth: "" + delay: "" + duplex: "" + speed: "" + description: "outside(Vl2)" + address: "fa16.3eb0.c3d3" mtu: "1500" + vlan: "" + ip_address: "10.12.16.237" net_mask: "255.255.255.248" - onemin_drop_rate: "" onemin_in_pps: "" onemin_in_rate: "" onemin_out_pps: "" onemin_out_rate: "" - protocol_status: "up" - speed: "" - - address: "fa16.3eb0.c3d3" - bandwidth: "" - delay: "" - description: "" - duplex: "" - fivemin_drop_rate: "" + onemin_drop_rate: "" fivemin_in_pps: "" fivemin_in_rate: "" fivemin_out_pps: "" fivemin_out_rate: "" - hardware_type: "" - interface: "inside" + fivemin_drop_rate: "" + - interface: "inside" interface_zone: "inside" - ip_address: "10.6.10.1" link_status: "up" + protocol_status: "up" + hardware_type: "" + bandwidth: "" + delay: "" + duplex: "" + speed: "" + description: "" + address: "fa16.3eb0.c3d3" mtu: "1500" + vlan: "" + ip_address: "10.6.10.1" net_mask: "255.255.255.0" - onemin_drop_rate: "" onemin_in_pps: "" onemin_in_rate: "" onemin_out_pps: "" onemin_out_rate: "" - protocol_status: "up" - speed: "" + onemin_drop_rate: "" + fivemin_in_pps: "" + fivemin_in_rate: "" + fivemin_out_pps: "" + fivemin_out_rate: "" + fivemin_drop_rate: "" diff --git a/tests/cisco_asa/show_interface/cisco_asa_show_interface1.yml b/tests/cisco_asa/show_interface/cisco_asa_show_interface1.yml index 13e621e620..c4ee2a83f8 100644 --- a/tests/cisco_asa/show_interface/cisco_asa_show_interface1.yml +++ b/tests/cisco_asa/show_interface/cisco_asa_show_interface1.yml @@ -1,146 +1,152 @@ --- parsed_sample: - - address: "5254.000d.da4c" + - interface: "GigabitEthernet0/0" + interface_zone: "outside" + link_status: "up" + protocol_status: "up" + hardware_type: "net_virtio" bandwidth: "1000 Mbps" delay: "10 usec" - description: "to iosv-1" duplex: "Full-duplex" - fivemin_drop_rate: "0" - fivemin_in_pps: "0" - fivemin_in_rate: "0" - fivemin_out_pps: "0" - fivemin_out_rate: "0" - hardware_type: "net_virtio" - interface: "GigabitEthernet0/0" - interface_zone: "outside" - ip_address: "10.99.99.2" - link_status: "up" + speed: "1000 Mbps" + description: "to iosv-1" + address: "5254.000d.da4c" mtu: "1500" + vlan: "" + ip_address: "10.99.99.2" net_mask: "255.255.255.0" - onemin_drop_rate: "0" onemin_in_pps: "0" onemin_in_rate: "0" onemin_out_pps: "0" onemin_out_rate: "0" - protocol_status: "up" - speed: "1000 Mbps" - - address: "5254.0005.1b55" - bandwidth: "1000 Mbps" - delay: "10 usec" - description: "" - duplex: "Full-duplex" - fivemin_drop_rate: "0" + onemin_drop_rate: "0" fivemin_in_pps: "0" fivemin_in_rate: "0" fivemin_out_pps: "0" fivemin_out_rate: "0" - hardware_type: "net_virtio" - interface: "GigabitEthernet0/1" + fivemin_drop_rate: "0" + - interface: "GigabitEthernet0/1" interface_zone: "inside" - ip_address: "10.90.90.1" link_status: "up" + protocol_status: "up" + hardware_type: "net_virtio" + bandwidth: "1000 Mbps" + delay: "10 usec" + duplex: "Full-duplex" + speed: "1000 Mbps" + description: "" + address: "5254.0005.1b55" mtu: "1500" + vlan: "" + ip_address: "10.90.90.1" net_mask: "255.255.255.0" - onemin_drop_rate: "0" onemin_in_pps: "0" onemin_in_rate: "0" onemin_out_pps: "0" onemin_out_rate: "0" + onemin_drop_rate: "0" + fivemin_in_pps: "0" + fivemin_in_rate: "0" + fivemin_out_pps: "0" + fivemin_out_rate: "0" + fivemin_drop_rate: "0" + - interface: "GigabitEthernet0/2" + interface_zone: "" + link_status: "administratively down" protocol_status: "up" - speed: "1000 Mbps" - - address: "5254.0017.e9c0" + hardware_type: "net_virtio" bandwidth: "1000 Mbps" delay: "10 usec" - description: "" duplex: "Full-duplex" - fivemin_drop_rate: "" - fivemin_in_pps: "" - fivemin_in_rate: "" - fivemin_out_pps: "" - fivemin_out_rate: "" - hardware_type: "net_virtio" - interface: "GigabitEthernet0/2" - interface_zone: "" - ip_address: "" - link_status: "administratively down" + speed: "1000 Mbps" + description: "" + address: "5254.0017.e9c0" mtu: "" + vlan: "" + ip_address: "" net_mask: "" - onemin_drop_rate: "" onemin_in_pps: "" onemin_in_rate: "" onemin_out_pps: "" onemin_out_rate: "" - protocol_status: "up" - speed: "1000 Mbps" - - address: "5254.001c.5b3a" - bandwidth: "1000 Mbps" - delay: "10 usec" - description: "" - duplex: "Full-duplex" - fivemin_drop_rate: "" + onemin_drop_rate: "" fivemin_in_pps: "" fivemin_in_rate: "" fivemin_out_pps: "" fivemin_out_rate: "" - hardware_type: "net_virtio" - interface: "GigabitEthernet0/3" + fivemin_drop_rate: "" + - interface: "GigabitEthernet0/3" interface_zone: "" - ip_address: "" link_status: "administratively down" + protocol_status: "up" + hardware_type: "net_virtio" + bandwidth: "1000 Mbps" + delay: "10 usec" + duplex: "Full-duplex" + speed: "1000 Mbps" + description: "" + address: "5254.001c.5b3a" mtu: "" + vlan: "" + ip_address: "" net_mask: "" - onemin_drop_rate: "" onemin_in_pps: "" onemin_in_rate: "" onemin_out_pps: "" onemin_out_rate: "" - protocol_status: "up" - speed: "1000 Mbps" - - address: "5254.0008.9da4" - bandwidth: "1000 Mbps" - delay: "10 usec" - description: "" - duplex: "Full-duplex" - fivemin_drop_rate: "" + onemin_drop_rate: "" fivemin_in_pps: "" fivemin_in_rate: "" fivemin_out_pps: "" fivemin_out_rate: "" - hardware_type: "net_virtio" - interface: "GigabitEthernet0/4" + fivemin_drop_rate: "" + - interface: "GigabitEthernet0/4" interface_zone: "" - ip_address: "" link_status: "administratively down" + protocol_status: "up" + hardware_type: "net_virtio" + bandwidth: "1000 Mbps" + delay: "10 usec" + duplex: "Full-duplex" + speed: "1000 Mbps" + description: "" + address: "5254.0008.9da4" mtu: "" + vlan: "" + ip_address: "" net_mask: "" - onemin_drop_rate: "" onemin_in_pps: "" onemin_in_rate: "" onemin_out_pps: "" onemin_out_rate: "" + onemin_drop_rate: "" + fivemin_in_pps: "" + fivemin_in_rate: "" + fivemin_out_pps: "" + fivemin_out_rate: "" + fivemin_drop_rate: "" + - interface: "Management0/0" + interface_zone: "management" + link_status: "up" protocol_status: "up" - speed: "1000 Mbps" - - address: "5254.0006.b468" + hardware_type: "net_virtio" bandwidth: "1000 Mbps" delay: "10 usec" - description: "" duplex: "Full-duplex" - fivemin_drop_rate: "0" - fivemin_in_pps: "0" - fivemin_in_rate: "17" - fivemin_out_pps: "0" - fivemin_out_rate: "18" - hardware_type: "net_virtio" - interface: "Management0/0" - interface_zone: "management" - ip_address: "10.100.100.2" - link_status: "up" + speed: "1000 Mbps" + description: "" + address: "5254.0006.b468" mtu: "1500" + vlan: "" + ip_address: "10.100.100.2" net_mask: "255.255.255.0" - onemin_drop_rate: "0" onemin_in_pps: "1" onemin_in_rate: "90" onemin_out_pps: "1" onemin_out_rate: "95" - protocol_status: "up" - speed: "1000 Mbps" + onemin_drop_rate: "0" + fivemin_in_pps: "0" + fivemin_in_rate: "17" + fivemin_out_pps: "0" + fivemin_out_rate: "18" + fivemin_drop_rate: "0" diff --git a/tests/cisco_asa/show_interface/cisco_asa_show_interface2.yml b/tests/cisco_asa/show_interface/cisco_asa_show_interface2.yml index 197fbd70c0..0a30f81e76 100644 --- a/tests/cisco_asa/show_interface/cisco_asa_show_interface2.yml +++ b/tests/cisco_asa/show_interface/cisco_asa_show_interface2.yml @@ -1,26 +1,27 @@ --- parsed_sample: - - address: "fa16.3eb0.c3d3" + - interface: "GigabitEthernet0/0" + interface_zone: "outside" + link_status: "up" + protocol_status: "up" + hardware_type: "i82540EM rev03" bandwidth: "1000 Mbps" delay: "10 usec" - description: "to iosv-1" duplex: "" - fivemin_drop_rate: "0" - fivemin_in_pps: "0" - fivemin_in_rate: "0" - fivemin_out_pps: "0" - fivemin_out_rate: "0" - hardware_type: "i82540EM rev03" - interface: "GigabitEthernet0/0" - interface_zone: "outside" - ip_address: "10.0.0.5" - link_status: "up" + speed: "" + description: "to iosv-1" + address: "fa16.3eb0.c3d3" mtu: "1500" + vlan: "" + ip_address: "10.0.0.5" net_mask: "255.255.255.252" - onemin_drop_rate: "0" onemin_in_pps: "0" onemin_in_rate: "0" onemin_out_pps: "0" onemin_out_rate: "0" - protocol_status: "up" - speed: "" + onemin_drop_rate: "0" + fivemin_in_pps: "0" + fivemin_in_rate: "0" + fivemin_out_pps: "0" + fivemin_out_rate: "0" + fivemin_drop_rate: "0" diff --git a/tests/cisco_asa/show_interface/cisco_asa_show_interface_vlans.raw b/tests/cisco_asa/show_interface/cisco_asa_show_interface_vlans.raw new file mode 100644 index 0000000000..0f6e6b26fa --- /dev/null +++ b/tests/cisco_asa/show_interface/cisco_asa_show_interface_vlans.raw @@ -0,0 +1,9 @@ +Interface GigabitEthernet0/0.60 "FINANCE", is up, line protocol is up + Hardware is i82540EM rev03, BW 1000 Mbps, DLY 10 usec + VLAN identifier 60 + MAC address 0c29.a40a.f201, MTU 1500 + IP address 10.29.60.1, subnet mask 255.255.255.0 + Traffic Statistics for "FINANCE": + 0 packets input, 0 bytes + 79671 packets output, 6054948 bytes + 0 packets dropped diff --git a/tests/cisco_asa/show_interface/cisco_asa_show_interface_vlans.yml b/tests/cisco_asa/show_interface/cisco_asa_show_interface_vlans.yml new file mode 100644 index 0000000000..a8738bf4d6 --- /dev/null +++ b/tests/cisco_asa/show_interface/cisco_asa_show_interface_vlans.yml @@ -0,0 +1,27 @@ +--- +parsed_sample: + - interface: "GigabitEthernet0/0.60" + interface_zone: "FINANCE" + link_status: "up" + protocol_status: "up" + hardware_type: "i82540EM rev03" + bandwidth: "1000 Mbps" + delay: "10 usec" + duplex: "" + speed: "" + description: "" + address: "0c29.a40a.f201" + mtu: "1500" + vlan: "60" + ip_address: "10.29.60.1" + net_mask: "255.255.255.0" + onemin_in_pps: "" + onemin_in_rate: "" + onemin_out_pps: "" + onemin_out_rate: "" + onemin_drop_rate: "" + fivemin_in_pps: "" + fivemin_in_rate: "" + fivemin_out_pps: "" + fivemin_out_rate: "" + fivemin_drop_rate: ""