From 87cdfbefb80779fb6e1a8bcc7827e5a1ce910efb Mon Sep 17 00:00:00 2001 From: pskliarenko <“pskliarenko@bsh.ru”> Date: Mon, 7 Aug 2023 22:35:56 +0400 Subject: [PATCH 01/13] Add new platform 'extreme' + 6 templates (without tests) --- .gitignore | 1 + .../templates/extreme_show_ipconfig.textfsm | 11 +++++++++++ .../extreme_show_ports_description.textfsm | 5 +++++ .../extreme_show_ports_information.textfsm | 6 ++++++ .../extreme_show_ports_information_detail.textfsm | 13 +++++++++++++ .../templates/extreme_show_sharing.textfsm | 15 +++++++++++++++ .../extreme_show_vlan_description.textfsm | 7 +++++++ ntc_templates/templates/index | 7 +++++++ 8 files changed, 65 insertions(+) create mode 100644 ntc_templates/templates/extreme_show_ipconfig.textfsm create mode 100644 ntc_templates/templates/extreme_show_ports_description.textfsm create mode 100644 ntc_templates/templates/extreme_show_ports_information.textfsm create mode 100644 ntc_templates/templates/extreme_show_ports_information_detail.textfsm create mode 100644 ntc_templates/templates/extreme_show_sharing.textfsm create mode 100644 ntc_templates/templates/extreme_show_vlan_description.textfsm diff --git a/.gitignore b/.gitignore index 1b1e55d7e5..c71f040f97 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ .tox/ +tox.ini .nox/ .coverage .coverage.* diff --git a/ntc_templates/templates/extreme_show_ipconfig.textfsm b/ntc_templates/templates/extreme_show_ipconfig.textfsm new file mode 100644 index 0000000000..537e7483c8 --- /dev/null +++ b/ntc_templates/templates/extreme_show_ipconfig.textfsm @@ -0,0 +1,11 @@ +Value INTERFACE (\S+) +Value IP (\S+) +Value SUBNET (\/\d+) +Value FLAGS (\S+) +Value NSIA (\d+) + +Start + ^Interface\s+IP\s+Address\s+Flags\s+nSIA\s*$$ -> Ip + +Ip + ^${INTERFACE}\s+${IP}\s+${SUBNET}\s+${FLAGS}\s+${NSIA}\s*$$ -> Record Ip \ No newline at end of file diff --git a/ntc_templates/templates/extreme_show_ports_description.textfsm b/ntc_templates/templates/extreme_show_ports_description.textfsm new file mode 100644 index 0000000000..19e1ffd58d --- /dev/null +++ b/ntc_templates/templates/extreme_show_ports_description.textfsm @@ -0,0 +1,5 @@ +Value PORT (\d+) +Value DESCRIPTION ((\s*\S+)+) + +Start + ^${PORT}\s*(\s*${DESCRIPTION})? -> Record \ No newline at end of file diff --git a/ntc_templates/templates/extreme_show_ports_information.textfsm b/ntc_templates/templates/extreme_show_ports_information.textfsm new file mode 100644 index 0000000000..ff7215c37f --- /dev/null +++ b/ntc_templates/templates/extreme_show_ports_information.textfsm @@ -0,0 +1,6 @@ +Value PORT (\d+) +Value FLAGS (\S+) +Value LINK_STATE (\S+) + +Start + ^\s*${PORT}\s+${FLAGS}\s+${LINK_STATE} -> Record \ No newline at end of file diff --git a/ntc_templates/templates/extreme_show_ports_information_detail.textfsm b/ntc_templates/templates/extreme_show_ports_information_detail.textfsm new file mode 100644 index 0000000000..29a76caf37 --- /dev/null +++ b/ntc_templates/templates/extreme_show_ports_information_detail.textfsm @@ -0,0 +1,13 @@ +Value PORT (\d+) +Value DESCRIPTION (((\s*\S+)*)?) +Value ADMIN_STATE (.*) +Value LINK_STATE (\S+) +Value List VLAN_ID (\d+) + +Start + ^\s*Port:\s.* -> Continue.Record + ^\s*Port:\s*${PORT} + ^\s*Description\sString:\s*\"${DESCRIPTION}\" + ^\s*Admin\sstate:\s*${ADMIN_STATE} + ^\s*Link\sState:\s+${LINK_STATE}(\,)?(\s)? + ^.*VLAN\sID:\s*${VLAN_ID} \ No newline at end of file diff --git a/ntc_templates/templates/extreme_show_sharing.textfsm b/ntc_templates/templates/extreme_show_sharing.textfsm new file mode 100644 index 0000000000..a5045f0356 --- /dev/null +++ b/ntc_templates/templates/extreme_show_sharing.textfsm @@ -0,0 +1,15 @@ +Value Filldown CONFIG_MASTER (\d+) +Value Filldown CURRENT_MASTER (\d+) +Value Filldown AGG_CONTROL (\S+) +Value List LD_SHARE_ALGORITHM (L2|L3|L3_L4|custom) +Value List LD_SHARE_GROUP (\d+) +Value List AGG_MBR (\S+) +Value List LINK_STATE (A|D|R|NP|L) +Value List LINK_UP_TRANSITIONS (\d+) + + +Start + ^\s{4}(\s)?\d -> Continue.Record + ^\s+${CONFIG_MASTER}(\s+${CURRENT_MASTER})?\s+${AGG_CONTROL}\s+${LD_SHARE_ALGORITHM}\s+${LD_SHARE_GROUP}\s+${AGG_MBR}\s+${LINK_STATE}\s+${LINK_UP_TRANSITIONS} + ^\s+${LD_SHARE_ALGORITHM}\s+${LD_SHARE_GROUP}\s+${AGG_MBR}\s+${LINK_STATE}\s+${LINK_UP_TRANSITIONS} + diff --git a/ntc_templates/templates/extreme_show_vlan_description.textfsm b/ntc_templates/templates/extreme_show_vlan_description.textfsm new file mode 100644 index 0000000000..00aca7e10e --- /dev/null +++ b/ntc_templates/templates/extreme_show_vlan_description.textfsm @@ -0,0 +1,7 @@ +Value NAME (\S+) +Value ID (\d+) +Value DESCRIPTION ((\s*\S+)*) + + +Start + ^\s*${NAME}\s+${ID}\s*(${DESCRIPTION})? -> Record \ No newline at end of file diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index index f15bc427d6..df25c22ed6 100644 --- a/ntc_templates/templates/index +++ b/ntc_templates/templates/index @@ -479,6 +479,13 @@ ericsson_ipos_show_isis_adjacency.textfsm, .*, ericsson_ipos, sh[[ow]] isis adja ericsson_ipos_show_version.textfsm, .*, ericsson_ipos, sh[[ow]] ver[[sion]] ericsson_ipos_show_arp.textfsm, .*, ericsson_ipos, sh[[ow]] ar[[p]] +extreme_show_ports_information_detail.textfsm, .*, extreme, show ports information detail +extreme_show_ports_description.textfsm, .*, extreme, show ports description +extreme_show_ports_information.textfsm, .*, extreme, show ports information +extreme_show_vlan_description.textfsm, .*, extreme, show vlan description +extreme_show_ipconfig.textfsm, .*, extreme, show ipconfig +extreme_show_sharing.textfsm, .*, extreme, show sharing + fortinet_get_system_interface_physical.textfsm, .*, fortinet, g[[et]] sy[[stem]] in[[terface]] p[[hysical]] fortinet_get_router_info_bgp_summary.textfsm, .*, fortinet, g[[et]] r[[outer]] info bg[[p]] su[[mmary]] fortinet_get_system_ha_status.textfsm, .*, fortinet, g[[et]] sy[[stem]] ha s[[tatus]] From de966ceb57b2e7e12595c48b0a10179ab6b3e2be Mon Sep 17 00:00:00 2001 From: Maxim Shpak Date: Thu, 31 Aug 2023 13:29:58 +0300 Subject: [PATCH 02/13] Fix template for 'show ipconfig' and add tests --- .../templates/extreme_show_ipconfig.textfsm | 68 ++++++++++++++++--- .../show_ipconfig/extreme_show_ipconfig.raw | 33 +++++++++ .../show_ipconfig/extreme_show_ipconfig.yml | 34 ++++++++++ 3 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 tests/extreme/show_ipconfig/extreme_show_ipconfig.raw create mode 100644 tests/extreme/show_ipconfig/extreme_show_ipconfig.yml diff --git a/ntc_templates/templates/extreme_show_ipconfig.textfsm b/ntc_templates/templates/extreme_show_ipconfig.textfsm index 537e7483c8..ca32f58eeb 100644 --- a/ntc_templates/templates/extreme_show_ipconfig.textfsm +++ b/ntc_templates/templates/extreme_show_ipconfig.textfsm @@ -1,11 +1,63 @@ -Value INTERFACE (\S+) -Value IP (\S+) -Value SUBNET (\/\d+) -Value FLAGS (\S+) -Value NSIA (\d+) +Value USE_REDIRECTS (.*) +Value IP_OPTION_LSRR (.*) +Value IP_OPTION_SSRR (.*) +Value IP_OPTION_RR (.*) +Value IP_OPTION_TS (.*) +Value IP_OPTION_RA (.*) +Value ROUTE_SHARING (.*) +Value ROUTE_COMPRESSION (.*) +Value ORIGINATED_PACKETS (.*) +Value MAX_SHARED_GATEWAYS_CURRENT (\d+) +Value MAX_SHARED_GATEWAYS_CONFIGURED (\d+) +Value ROUTE_SHARING_HASH (.*) +Value IRDP_ADVERTISEMENT_ADDRESS (\S+) +Value IRDP_MAX_INTERVAL (\d+) +Value IRDP_MIN_INTERVAL (\d+) +Value IRDP_LIFETIME (\d+) +Value IRDP_PREFERENCE (\d+) +Value List INTERFACE (\S+) +Value List IP (\S+) +Value List SUBNET (/\d+) +Value List FLAGS (\S+) +Value List NSIA (\d+) Start - ^Interface\s+IP\s+Address\s+Flags\s+nSIA\s*$$ -> Ip + ^\s*Use\s+Redirects\s*:\s*${USE_REDIRECTS}\s*$$ + ^\s*IpOption\s+LSRR\s*:\s*${IP_OPTION_LSRR}\s*$$ + ^\s*IpOption\s+SSRR\s*:\s*${IP_OPTION_SSRR}\s*$$ + ^\s*IpOption\s+RR\s*:\s*${IP_OPTION_RR}\s*$$ + ^\s*IpOption\s+TS\s*:\s*${IP_OPTION_TS}\s*$$ + ^\s*IpOption\s+RA\s*:\s*${IP_OPTION_RA}\s*$$ + ^\s*Route\s+Sharing\s*:\s*${ROUTE_SHARING}\s*$$ + ^\s*Route\s+Compression\s*:\s*${ROUTE_COMPRESSION}\s*$$ + ^\s*Originated\s+Packets\s*:\s*${ORIGINATED_PACKETS}\s*$$ + ^\s*Max\s+Shared\s+Gateways\s*:\s*Current:\s*${MAX_SHARED_GATEWAYS_CURRENT}\s+Configured:\s*${MAX_SHARED_GATEWAYS_CONFIGURED}\s*$$ + ^\s*Route\s+Sharing\s+Hash\s*:\s*${ROUTE_SHARING_HASH}\s*$$ + ^\s*IRDP:\s*$$ -> Irdp + ^\s*Interface\s+IP\s+Address\s+Flags\s+nSIA\s*$$ -> IpAdresses + ^\s*Flags:\s+\(A\)\s+Address\s+Mask\s+Reply\s+Enabled\s+\(B\)\s+BOOTP\s+Enabled\s*$$ + ^\s*\(b\)\s+Broadcast\s+Forwarding\s+Enabled\s*$$ + ^\s*\(D\)\s+Duplicate\s+address\s+detected\s+on\s+VLAN,\s+\(E\)\s+Interface\s+Enabled\s*$$ + ^\s*\(f\)\s+Forwarding\s+Enabled\s+\(g\)\s+Ignore\s+IP\s+Broadcast\s+Enabled\s*$$ + ^\s*\(h\)\s+Directed\s+Broadcast\s+Forwarding\s+by\s+Hardware\s+Enabled\s*$$ + ^\s*\(I\)\s+IRDP\s+Advertisement\s+Enabled,\s+\(M\)\s+Send\s+Parameter\s+Problem\s+Enabled\s*$$ + ^\s*\(m\)\s+Multicast\s+forwarding\s+Enabled,\s+\(n\)\s+Multinetted\s+VLAN\s*$$ + ^\s*\(nSIA\s+\)\s+Number\s+of\s+Secondary\s+IP\s+Addresses\s*$$ + ^\s*\(P\)\s+Send\s+Port\s+Unreachables\s+Enabled,\s+\(R\)\s+Send\s+Redirects\s+Enabled\s*$$ + ^\s*\(r\)\s+Unicast\s+Reverse\s+Path\s+Enabled\s+on\s+at\s+least\s+one\s+port\s+of\s+the\s+VLAN\s*$$ + ^\s*\(t\)\s+Tentative\s+address,\s+\(T\)\s+Time\s+Stamp\s+Reply\s+Enabled\s*$$ + ^\s*\(u\)\s+Send\s+Unreachables\s+Enabled,\s+\(U\)\s+Interface\s+Up\s*$$ + ^\s*\(v\)\s+VRRP\s+Enabled,\s+\(X\)\s+Send\s+Time\s+Exceeded\s+Enabled\s*$$ + ^\s* + ^. -> Error -Ip - ^${INTERFACE}\s+${IP}\s+${SUBNET}\s+${FLAGS}\s+${NSIA}\s*$$ -> Record Ip \ No newline at end of file +Irdp + ^\s*Advertisement\s+Address:\s+${IRDP_ADVERTISEMENT_ADDRESS}\s+Maximum\s+Interval:\s+${IRDP_MAX_INTERVAL}\s*$$ + ^\s*Minimum\s+Interval:\s+${IRDP_MIN_INTERVAL}\s+Lifetime:\s+${IRDP_LIFETIME}\s+Preference:\s+${IRDP_PREFERENCE}\s*$$ + ^\s* -> Start + ^. -> Error + +IpAdresses + ^\s*${INTERFACE}\s+${IP}\s+${SUBNET}\s+${FLAGS}\s+${NSIA}\s*$$ + ^\s* -> Start + ^. -> Error diff --git a/tests/extreme/show_ipconfig/extreme_show_ipconfig.raw b/tests/extreme/show_ipconfig/extreme_show_ipconfig.raw new file mode 100644 index 0000000000..092cc01e4b --- /dev/null +++ b/tests/extreme/show_ipconfig/extreme_show_ipconfig.raw @@ -0,0 +1,33 @@ + Use Redirects : Disabled + IpOption LSRR : Enabled + IpOption SSRR : Enabled + IpOption RR : Enabled + IpOption TS : Enabled + IpOption RA : Enabled + Route Sharing : Disabled + Route Compression : Disabled + Originated Packets : Don't require ipforwarding + Max Shared Gateways : Current: 4 Configured: 4 + Route Sharing Hash : CRC Lower + + IRDP: + Advertisement Address: 255.255.255.255 Maximum Interval: 600 + Minimum Interval: 450 Lifetime: 1800 Preference: 0 + +Interface IP Address Flags nSIA +VLAN0255 10.255.254.3 /16 EU----MPuRX--------- 0 +VLAN2222 10.1.222.3 /24 EUf---MPuRX--------- 0 + +Flags: (A) Address Mask Reply Enabled (B) BOOTP Enabled + (b) Broadcast Forwarding Enabled + (D) Duplicate address detected on VLAN, (E) Interface Enabled + (f) Forwarding Enabled (g) Ignore IP Broadcast Enabled + (h) Directed Broadcast Forwarding by Hardware Enabled + (I) IRDP Advertisement Enabled, (M) Send Parameter Problem Enabled + (m) Multicast forwarding Enabled, (n) Multinetted VLAN + (nSIA ) Number of Secondary IP Addresses + (P) Send Port Unreachables Enabled, (R) Send Redirects Enabled + (r) Unicast Reverse Path Enabled on at least one port of the VLAN + (t) Tentative address, (T) Time Stamp Reply Enabled + (u) Send Unreachables Enabled, (U) Interface Up + (v) VRRP Enabled, (X) Send Time Exceeded Enabled diff --git a/tests/extreme/show_ipconfig/extreme_show_ipconfig.yml b/tests/extreme/show_ipconfig/extreme_show_ipconfig.yml new file mode 100644 index 0000000000..bff0b29ba6 --- /dev/null +++ b/tests/extreme/show_ipconfig/extreme_show_ipconfig.yml @@ -0,0 +1,34 @@ +--- +parsed_sample: + - flags: + - "EU----MPuRX---------" + - "EUf---MPuRX---------" + interface: + - "VLAN0255" + - "VLAN2222" + ip: + - "10.255.254.3" + - "10.1.222.3" + ip_option_lsrr: "Enabled" + ip_option_ra: "Enabled" + ip_option_rr: "Enabled" + ip_option_ssrr: "Enabled" + ip_option_ts: "Enabled" + irdp_advertisement_address: "255.255.255.255" + irdp_lifetime: "1800" + irdp_max_interval: "600" + irdp_min_interval: "450" + irdp_preference: "0" + max_shared_gateways_configured: "4" + max_shared_gateways_current: "4" + nsia: + - "0" + - "0" + originated_packets: "Don't require ipforwarding" + route_compression: "Disabled" + route_sharing: "Disabled" + route_sharing_hash: "CRC Lower" + subnet: + - "/16" + - "/24" + use_redirects: "Disabled" From 2486648d861b1fcc45103c4fdbd8862e399581ea Mon Sep 17 00:00:00 2001 From: Maxim Shpak Date: Thu, 31 Aug 2023 13:50:08 +0300 Subject: [PATCH 03/13] Fix template for 'show ports description' and add tests --- .../extreme_show_ports_description.textfsm | 17 +- .../extreme_show_ports_description.raw | 51 ++++++ .../extreme_show_ports_description.yml | 146 ++++++++++++++++++ 3 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 tests/extreme/show_ports_description/extreme_show_ports_description.raw create mode 100644 tests/extreme/show_ports_description/extreme_show_ports_description.yml diff --git a/ntc_templates/templates/extreme_show_ports_description.textfsm b/ntc_templates/templates/extreme_show_ports_description.textfsm index 19e1ffd58d..41b9b7089e 100644 --- a/ntc_templates/templates/extreme_show_ports_description.textfsm +++ b/ntc_templates/templates/extreme_show_ports_description.textfsm @@ -1,5 +1,18 @@ Value PORT (\d+) -Value DESCRIPTION ((\s*\S+)+) +Value DISPLAY_STRING (\S+) +Value DESCRIPTION (.*) + +# Broken. There is no good way to differ 'Display String' and 'Description' since +# both columns can be anything and empty. Since 'Display String' is empty often, +# just skip it. Start - ^${PORT}\s*(\s*${DESCRIPTION})? -> Record \ No newline at end of file + ^\s*Port\s+Display\s+String\s+Description\s+String\s*$$ -> Ports + ^\s* + ^. -> Error + +Ports + ^(\s*=+)+\s*$$ + ^\s*${PORT}(\s+${DESCRIPTION})?\s*$$ -> Record + ^\s* + ^. -> Error diff --git a/tests/extreme/show_ports_description/extreme_show_ports_description.raw b/tests/extreme/show_ports_description/extreme_show_ports_description.raw new file mode 100644 index 0000000000..e504a1542e --- /dev/null +++ b/tests/extreme/show_ports_description/extreme_show_ports_description.raw @@ -0,0 +1,51 @@ +Port Display String Description String +===== ==================== ================================================== +1 AggregateLink +2 +3 +4 +5 MX5-2 - xe0/0/3 +6 BLADE-3 - VC1-4 +7 BLADE-3 - VC2-4 +8 BGW-R1 - xe0/1/1 (LAG7) +9 FREE +10 SRV-R1 - xe-0/0/1 (LAG6) +11 3COM - Gi1/0/26 Link for PIM +12 C4948-1 - te1/49 +13 Eltex3124-7 - te1/0/1 +14 Eltex3124-6 - te1/0/1 +15 Eltex3124-5 - te1/0/1 +16 Eltex3124-4 - te1/0/1 +17 MX5-1 - xe-0/0/3 +18 MX5-1 - xe-0/0/1 +19 CCR1036 - sfp1 +20 +21 +22 RS-CORE-1 - Gi0/1 +23 +24 Uplink-GARS +25 CRM-139204 +26 FREE +27 FREE +28 FREE +29 N3K-2 - eth1/1 (LAG29) +30 3COM - Te1/1/1 +31 FREE +32 +33 N9K-1 - eth1/46 (LAG33) +34 N3K-2 - eth1/2 (LAG29) +35 N9K-1 - eth1/47 (LAG33) +36 Carbon-Reductor-NetXtreme-1 MIRROR +37 VoipMonitor_Mirror +38 Eltex3324-1 - te1/0/1 (LAG38) +39 Eltex3324-1 - te1/0/2 (LAG38) +40 FREE +41 FREE +42 BLADE-2-VC2 - VC8 +43 Storage-SMicro - eth0 +44 SCST-SSD_Cache - eth1 +45 Eltex5248-1 - Te1/0/1 +46 VEEAM1 - eth1 +47 BLADE-1-VC2 - VC1 +48 BLADE-1-VC2 - VC8 +===== ==================== ================================================== diff --git a/tests/extreme/show_ports_description/extreme_show_ports_description.yml b/tests/extreme/show_ports_description/extreme_show_ports_description.yml new file mode 100644 index 0000000000..16e125c375 --- /dev/null +++ b/tests/extreme/show_ports_description/extreme_show_ports_description.yml @@ -0,0 +1,146 @@ +--- +parsed_sample: + - description: "AggregateLink" + display_string: "" + port: "1" + - description: "" + display_string: "" + port: "2" + - description: "" + display_string: "" + port: "3" + - description: "" + display_string: "" + port: "4" + - description: "MX5-2 - xe0/0/3" + display_string: "" + port: "5" + - description: "BLADE-3 - VC1-4" + display_string: "" + port: "6" + - description: "BLADE-3 - VC2-4" + display_string: "" + port: "7" + - description: "BGW-R1 - xe0/1/1 (LAG7)" + display_string: "" + port: "8" + - description: "FREE" + display_string: "" + port: "9" + - description: "SRV-R1 - xe-0/0/1 (LAG6)" + display_string: "" + port: "10" + - description: "3COM - Gi1/0/26 Link for PIM" + display_string: "" + port: "11" + - description: "C4948-1 - te1/49" + display_string: "" + port: "12" + - description: "Eltex3124-7 - te1/0/1" + display_string: "" + port: "13" + - description: "Eltex3124-6 - te1/0/1" + display_string: "" + port: "14" + - description: "Eltex3124-5 - te1/0/1" + display_string: "" + port: "15" + - description: "Eltex3124-4 - te1/0/1" + display_string: "" + port: "16" + - description: "MX5-1 - xe-0/0/3" + display_string: "" + port: "17" + - description: "MX5-1 - xe-0/0/1" + display_string: "" + port: "18" + - description: "CCR1036 - sfp1" + display_string: "" + port: "19" + - description: "" + display_string: "" + port: "20" + - description: "" + display_string: "" + port: "21" + - description: "RS-CORE-1 - Gi0/1" + display_string: "" + port: "22" + - description: "" + display_string: "" + port: "23" + - description: "Uplink-GARS" + display_string: "" + port: "24" + - description: "CRM-139204" + display_string: "" + port: "25" + - description: "FREE" + display_string: "" + port: "26" + - description: "FREE" + display_string: "" + port: "27" + - description: "FREE" + display_string: "" + port: "28" + - description: "N3K-2 - eth1/1 (LAG29)" + display_string: "" + port: "29" + - description: "3COM - Te1/1/1" + display_string: "" + port: "30" + - description: "FREE" + display_string: "" + port: "31" + - description: "" + display_string: "" + port: "32" + - description: "N9K-1 - eth1/46 (LAG33)" + display_string: "" + port: "33" + - description: "N3K-2 - eth1/2 (LAG29)" + display_string: "" + port: "34" + - description: "N9K-1 - eth1/47 (LAG33)" + display_string: "" + port: "35" + - description: "Carbon-Reductor-NetXtreme-1 MIRROR" + display_string: "" + port: "36" + - description: "VoipMonitor_Mirror" + display_string: "" + port: "37" + - description: "Eltex3324-1 - te1/0/1 (LAG38)" + display_string: "" + port: "38" + - description: "Eltex3324-1 - te1/0/2 (LAG38)" + display_string: "" + port: "39" + - description: "FREE" + display_string: "" + port: "40" + - description: "FREE" + display_string: "" + port: "41" + - description: "BLADE-2-VC2 - VC8" + display_string: "" + port: "42" + - description: "Storage-SMicro - eth0" + display_string: "" + port: "43" + - description: "SCST-SSD_Cache - eth1" + display_string: "" + port: "44" + - description: "Eltex5248-1 - Te1/0/1" + display_string: "" + port: "45" + - description: "VEEAM1 - eth1" + display_string: "" + port: "46" + - description: "BLADE-1-VC2 - VC1" + display_string: "" + port: "47" + - description: "BLADE-1-VC2 - VC8" + display_string: "" + port: "48" From a65e36b866cd49155a470fc46296e27caa82efa2 Mon Sep 17 00:00:00 2001 From: Maxim Shpak Date: Thu, 31 Aug 2023 14:25:39 +0300 Subject: [PATCH 04/13] Fix template for 'show ports information' and add tests --- .../extreme_show_ports_information.textfsm | 37 +- .../extreme_show_ports_information.raw | 69 +++ .../extreme_show_ports_information.yml | 578 ++++++++++++++++++ 3 files changed, 683 insertions(+), 1 deletion(-) create mode 100644 tests/extreme/show_ports_information/extreme_show_ports_information.raw create mode 100644 tests/extreme/show_ports_information/extreme_show_ports_information.yml diff --git a/ntc_templates/templates/extreme_show_ports_information.textfsm b/ntc_templates/templates/extreme_show_ports_information.textfsm index ff7215c37f..7601b1d479 100644 --- a/ntc_templates/templates/extreme_show_ports_information.textfsm +++ b/ntc_templates/templates/extreme_show_ports_information.textfsm @@ -1,6 +1,41 @@ Value PORT (\d+) Value FLAGS (\S+) Value LINK_STATE (\S+) +Value ELSM (\S+) +Value OAM (\S+) +Value LINK_UPS (\d+) +Value NUM_STP (\d+) +Value NUM_VLAN (\d+) +Value NUM_PROTO (\d+) +Value JUMBO_SIZE (\d+) +Value QOS_PROFILE (\S+) +Value LOAD_MASTER (.*) Start - ^\s*${PORT}\s+${FLAGS}\s+${LINK_STATE} -> Record \ No newline at end of file + ^\s*Port\s+Flags\s+Link\s+ELSM\s+Link\s+Num\s+Num\s+Num\s+Jumbo\s+QOS\s+Load\s*$$ -> Ports + ^\s* + ^. -> Error + +Ports + ^State\s+/OAM\s+UPS\s+STP\s+VLAN\s+Proto\s+Size\s+profile\s+Master\*$$ + ^(\s*=+)+\s*$$ + ^\s*${PORT}\s+${FLAGS}\s+${LINK_STATE}\s+${ELSM}\s*/\s*${OAM}\s+${LINK_UPS}\s+${NUM_STP}\s+${NUM_VLAN}\s+${NUM_PROTO}\s+${JUMBO_SIZE}\s+${QOS_PROFILE}(?:\s+${LOAD_MASTER})?\s*$$ -> Record + ^\s*>\s+indicates\s+Port\s+Display\s+Name\s+truncated\s+past\s+8\s+characters\s*$$ + ^\s*Flags\s+:\s+a\s+-\s+Load\s+Sharing\s+Algorithm\s+address-based,\s+D\s+-\s+Port\s+Disabled,\s*$$ + ^\s*e\s+-\s+Extreme\s+Discovery\s+Protocol\s+Enabled,\s+E\s+-\s+Port\s+Enabled,\s*$$ + ^\s*g\s+-\s+Egress\s+TOS\s+Enabled,\s+i\s+-\s+Isolation,\s+j\s+-\s+Jumbo\s+Frame\s+Enabled,\s*$$ + ^\s*l\s+-\s+Load\s+Sharing\s+Enabled,\s+m\s+-\s+MACLearning\s+Enabled,\s*$$ + ^\s*n\s+-\s+Ingress\s+TOS\s+Enabled,\s+o\s+-\s+Dot1p\s+Replacement\s+Enabled,\s*$$ + ^\s*P\s+-\s+Software\s+redundant\s+port\(Primary\),\s*$$ + ^\s*R\s+-\s+Software\s+redundant\s+port\(Redundant\),\s*$$ + ^\s*q\s+-\s+Background\s+QOS\s+Monitoring\s+Enabled,\s*$$ + ^\s*s\s+-\s+diffserv\s+Replacement\s+Enabled,\s*$$ + ^\s*v\s+-\s+Vman\s+Enabled,\s+f\s+-\s+Unicast\s+Flooding\s+Enabled,\s*$$ + ^\s*M\s+-\s+Multicast\s+Flooding\s+Enabled,\s+B\s+-\s+Broadcast\s+Flooding\s+Enabled\s*$$ + ^\s*L\s+-\s+Extreme\s+Link\s+Status\s+Monitoring\s+Enabled\s*$$ + ^\s*O\s+-\s+Ethernet\s+OAM\s+Enabled\s*$$ + ^\s*w\s+-\s+MACLearning\s+Disabled\s+with\s+Forwarding\s*$$ + ^\s*b\s+-\s+Rx\s+and\s+Tx\s+Flow\s+Control\s+Enabled,\s+x\s+-\s+Rx\s+Flow\s+Control\s+Enabled\s*$$ + ^\s*p\s+-\s+Priority\s+Flow\s+Control\s+Enabled\s*$$ + ^\s* + ^. -> Error diff --git a/tests/extreme/show_ports_information/extreme_show_ports_information.raw b/tests/extreme/show_ports_information/extreme_show_ports_information.raw new file mode 100644 index 0000000000..b63bc93600 --- /dev/null +++ b/tests/extreme/show_ports_information/extreme_show_ports_information.raw @@ -0,0 +1,69 @@ +Port Flags Link ELSM Link Num Num Num Jumbo QOS Load + State /OAM UPS STP VLAN Proto Size profile Master +===================================================================================== +1 Dmjla---e--fMB---x- ready - / - 0 1 3288 1 9216 none 1 a +2 Dmjla---e--fMB---x- ready - / - 1 1 3288 1 9216 none 1 a +3 Dmjla---e--fMB---x- ready - / - 7 1 3288 1 9216 none 1 a +4 Dmjla---e--fMB---x- ready - / - 0 1 3288 1 9216 none 1 a +5 Emj-----e--fMB---x- active - / - 1 0 1 0 9216 none +6 Emj-----e--fMB---x- active - / - 2 0 74 0 9216 none +7 Emj-----e--fMB---x- active - / - 2 0 74 0 9216 none +8 Emj-----e--fMB---x- ready - / - 0 0 0 0 9216 none +9 Dmj-----e--fMB---x- ready - / - 0 0 0 0 9216 none +10 Emj-----e--fMB---x- ready - / - 0 0 0 0 9216 none +11 Emj-----e--fMB---x- ready - / - 0 0 1 1 9216 none +12 Emj-----e--fMB---x- active - / - 0 0 97 0 9216 none +13 Emj-----e--fMB---x- active - / - 1 1 55 1 9216 none +14 Emj-----e--fMB---x- active - / - 10 1 130 1 9216 none +15 Emj-----e--fMB---x- active - / - 0 1 191 1 9216 none +16 Emj-----e--fMB---x- active - / - 1 1 312 1 9216 none +17 Emj-----e--fMB---x- ready - / - 0 0 3289 0 9216 none +18 Emj-----e--fMB---x- ready - / - 0 0 0 0 9216 none +19 Emj-----e--fMB---x- active - / - 22 0 176 0 9216 none +20 Emj-----e--fMB---x- ready - / - 0 1 7 1 9216 none +21 Dmj-----e--fMB---x- ready - / - 4 0 1 1 9216 none +22 Emj-----e--fMB---x- ready - / - 0 1 11 1 9216 none +23 Emj-----e--fMB---x- active - / - 2 1 3324 1 9216 none +24 Emj-----e--fMB---x- ready - / - 2 0 1 0 9216 none +25 Dmj-----e--fMB---x- ready - / - 3 0 5 0 9216 none +26 Emj-----e--fMB---x- ready - / - 4 0 5 0 9216 none +27 Emj-----e--fMB---x- ready - / - 11 0 5 0 9216 none +28 Emj-----e--fMB---x- ready - / - 0 0 5 0 9216 none +29 Emjla---e--fMB---x- ready - / - 12 0 72 0 9216 none 29 a +30 Dmj-----e--fMB---x- ready - / - 2 1 532 1 9216 none +31 Emj-----e--fMB---x- ready - / - 0 0 0 0 9216 none +32 Emj-----e--fMB---x- ready - / - 0 0 0 0 9216 none +33 Emjla---e--fMB---x- active - / - 2 0 856 0 9216 none 33 a +34 Emjla---e--fMB---x- ready - / - 7 0 72 0 9216 none 29 a +35 Emjla---e--fMB---x- active - / - 1 0 856 0 9216 none 33 a +36 Emj-----e--fMB---x- active - / - 10 0 0 0 9216 none +37 Emj-----e--fMB---x- active - / - 0 0 0 0 9216 none +38 Emjla---e--fMB---x- ready - / - 0 0 26 0 9216 none 38 a +39 Emjla---e--fMB---x- ready - / - 0 0 26 0 9216 none 38 a +40 Emj-----e--fMB---x- ready - / - 0 0 7 0 9216 none +41 Emj-----e--fMB---x- ready - / - 0 1 118 1 9216 none +42 Emj-----e--fMB---x- ready - / - 0 1 317 1 9216 none +43 Emj-----e--fMB---x- ready - / - 5 1 2 1 9216 none +44 Emj-----e--fMB---x- active - / - 2 0 1 1 9216 none +45 Emj-----e--fMB----- active - / - 1 0 388 0 9216 none +46 Emj-----e--fMB----- active - / - 17 0 6 0 9216 none +47 Emj-----e--fMB----- active - / - 0 0 261 0 9216 none +48 Emj-----e--fMB----- active - / - 0 0 265 0 9216 none +===================================================================================== +> indicates Port Display Name truncated past 8 characters +Flags : a - Load Sharing Algorithm address-based, D - Port Disabled, + e - Extreme Discovery Protocol Enabled, E - Port Enabled, + g - Egress TOS Enabled, i - Isolation, j - Jumbo Frame Enabled, + l - Load Sharing Enabled, m - MACLearning Enabled, + n - Ingress TOS Enabled, o - Dot1p Replacement Enabled, + P - Software redundant port(Primary), + R - Software redundant port(Redundant), + q - Background QOS Monitoring Enabled, + s - diffserv Replacement Enabled, + v - Vman Enabled, f - Unicast Flooding Enabled, + M - Multicast Flooding Enabled, B - Broadcast Flooding Enabled + L - Extreme Link Status Monitoring Enabled + O - Ethernet OAM Enabled + w - MACLearning Disabled with Forwarding + b - Rx and Tx Flow Control Enabled, x - Rx Flow Control Enabled + p - Priority Flow Control Enabled diff --git a/tests/extreme/show_ports_information/extreme_show_ports_information.yml b/tests/extreme/show_ports_information/extreme_show_ports_information.yml new file mode 100644 index 0000000000..1e1b229e41 --- /dev/null +++ b/tests/extreme/show_ports_information/extreme_show_ports_information.yml @@ -0,0 +1,578 @@ +--- +parsed_sample: + - elsm: "-" + flags: "Dmjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "1 a" + num_proto: "1" + num_stp: "1" + num_vlan: "3288" + oam: "-" + port: "1" + qos_profile: "none" + - elsm: "-" + flags: "Dmjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "1" + load_master: "1 a" + num_proto: "1" + num_stp: "1" + num_vlan: "3288" + oam: "-" + port: "2" + qos_profile: "none" + - elsm: "-" + flags: "Dmjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "7" + load_master: "1 a" + num_proto: "1" + num_stp: "1" + num_vlan: "3288" + oam: "-" + port: "3" + qos_profile: "none" + - elsm: "-" + flags: "Dmjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "1 a" + num_proto: "1" + num_stp: "1" + num_vlan: "3288" + oam: "-" + port: "4" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "1" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "1" + oam: "-" + port: "5" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "2" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "74" + oam: "-" + port: "6" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "2" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "74" + oam: "-" + port: "7" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "0" + oam: "-" + port: "8" + qos_profile: "none" + - elsm: "-" + flags: "Dmj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "0" + oam: "-" + port: "9" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "0" + oam: "-" + port: "10" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "1" + num_stp: "0" + num_vlan: "1" + oam: "-" + port: "11" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "97" + oam: "-" + port: "12" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "1" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "55" + oam: "-" + port: "13" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "10" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "130" + oam: "-" + port: "14" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "0" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "191" + oam: "-" + port: "15" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "1" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "312" + oam: "-" + port: "16" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "3289" + oam: "-" + port: "17" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "0" + oam: "-" + port: "18" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "22" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "176" + oam: "-" + port: "19" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "7" + oam: "-" + port: "20" + qos_profile: "none" + - elsm: "-" + flags: "Dmj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "4" + load_master: "" + num_proto: "1" + num_stp: "0" + num_vlan: "1" + oam: "-" + port: "21" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "11" + oam: "-" + port: "22" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "2" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "3324" + oam: "-" + port: "23" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "2" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "1" + oam: "-" + port: "24" + qos_profile: "none" + - elsm: "-" + flags: "Dmj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "3" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "5" + oam: "-" + port: "25" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "4" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "5" + oam: "-" + port: "26" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "11" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "5" + oam: "-" + port: "27" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "5" + oam: "-" + port: "28" + qos_profile: "none" + - elsm: "-" + flags: "Emjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "12" + load_master: "29 a" + num_proto: "0" + num_stp: "0" + num_vlan: "72" + oam: "-" + port: "29" + qos_profile: "none" + - elsm: "-" + flags: "Dmj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "2" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "532" + oam: "-" + port: "30" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "0" + oam: "-" + port: "31" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "0" + oam: "-" + port: "32" + qos_profile: "none" + - elsm: "-" + flags: "Emjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "2" + load_master: "33 a" + num_proto: "0" + num_stp: "0" + num_vlan: "856" + oam: "-" + port: "33" + qos_profile: "none" + - elsm: "-" + flags: "Emjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "7" + load_master: "29 a" + num_proto: "0" + num_stp: "0" + num_vlan: "72" + oam: "-" + port: "34" + qos_profile: "none" + - elsm: "-" + flags: "Emjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "1" + load_master: "33 a" + num_proto: "0" + num_stp: "0" + num_vlan: "856" + oam: "-" + port: "35" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "10" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "0" + oam: "-" + port: "36" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "0" + oam: "-" + port: "37" + qos_profile: "none" + - elsm: "-" + flags: "Emjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "38 a" + num_proto: "0" + num_stp: "0" + num_vlan: "26" + oam: "-" + port: "38" + qos_profile: "none" + - elsm: "-" + flags: "Emjla---e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "38 a" + num_proto: "0" + num_stp: "0" + num_vlan: "26" + oam: "-" + port: "39" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "7" + oam: "-" + port: "40" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "118" + oam: "-" + port: "41" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "0" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "317" + oam: "-" + port: "42" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "ready" + link_ups: "5" + load_master: "" + num_proto: "1" + num_stp: "1" + num_vlan: "2" + oam: "-" + port: "43" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB---x-" + jumbo_size: "9216" + link_state: "active" + link_ups: "2" + load_master: "" + num_proto: "1" + num_stp: "0" + num_vlan: "1" + oam: "-" + port: "44" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB-----" + jumbo_size: "9216" + link_state: "active" + link_ups: "1" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "388" + oam: "-" + port: "45" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB-----" + jumbo_size: "9216" + link_state: "active" + link_ups: "17" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "6" + oam: "-" + port: "46" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB-----" + jumbo_size: "9216" + link_state: "active" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "261" + oam: "-" + port: "47" + qos_profile: "none" + - elsm: "-" + flags: "Emj-----e--fMB-----" + jumbo_size: "9216" + link_state: "active" + link_ups: "0" + load_master: "" + num_proto: "0" + num_stp: "0" + num_vlan: "265" + oam: "-" + port: "48" + qos_profile: "none" From f93d95c593c9d4c03b3a84f61846c67b09368d10 Mon Sep 17 00:00:00 2001 From: Maxim Shpak Date: Thu, 31 Aug 2023 14:26:56 +0300 Subject: [PATCH 05/13] rebase show ports description --- ntc_templates/templates/extreme_show_ports_description.textfsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntc_templates/templates/extreme_show_ports_description.textfsm b/ntc_templates/templates/extreme_show_ports_description.textfsm index 41b9b7089e..ad4ee24aec 100644 --- a/ntc_templates/templates/extreme_show_ports_description.textfsm +++ b/ntc_templates/templates/extreme_show_ports_description.textfsm @@ -13,6 +13,6 @@ Start Ports ^(\s*=+)+\s*$$ - ^\s*${PORT}(\s+${DESCRIPTION})?\s*$$ -> Record + ^\s*${PORT}(?:\s+${DESCRIPTION})?\s*$$ -> Record ^\s* ^. -> Error From 0fc9e64edbb027cd27acbbf3fd48eb6e2a92500e Mon Sep 17 00:00:00 2001 From: Maxim Shpak Date: Thu, 31 Aug 2023 14:44:13 +0300 Subject: [PATCH 06/13] Fix template for 'show sharing' and add tests --- .../templates/extreme_show_sharing.textfsm | 22 ++++- .../show_sharing/extreme_show_sharing.raw | 21 +++++ .../show_sharing/extreme_show_sharing.yml | 84 +++++++++++++++++++ 3 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 tests/extreme/show_sharing/extreme_show_sharing.raw create mode 100644 tests/extreme/show_sharing/extreme_show_sharing.yml diff --git a/ntc_templates/templates/extreme_show_sharing.textfsm b/ntc_templates/templates/extreme_show_sharing.textfsm index a5045f0356..bc9497776d 100644 --- a/ntc_templates/templates/extreme_show_sharing.textfsm +++ b/ntc_templates/templates/extreme_show_sharing.textfsm @@ -7,9 +7,23 @@ Value List AGG_MBR (\S+) Value List LINK_STATE (A|D|R|NP|L) Value List LINK_UP_TRANSITIONS (\d+) - Start - ^\s{4}(\s)?\d -> Continue.Record - ^\s+${CONFIG_MASTER}(\s+${CURRENT_MASTER})?\s+${AGG_CONTROL}\s+${LD_SHARE_ALGORITHM}\s+${LD_SHARE_GROUP}\s+${AGG_MBR}\s+${LINK_STATE}\s+${LINK_UP_TRANSITIONS} - ^\s+${LD_SHARE_ALGORITHM}\s+${LD_SHARE_GROUP}\s+${AGG_MBR}\s+${LINK_STATE}\s+${LINK_UP_TRANSITIONS} + ^\s*Load\s+Sharing\s+Monitor\s*$$ + ^\s*Config\s+Current\s+Agg\s+Ld\s+Share\s+Ld\s+Share\s+Agg\s+Link\s+Link\s+Up\s*$$ -> SharingTable + ^\s* + ^. -> Error +SharingTable + ^\s*Master\s+Master\s+Control\s+Algorithm\s+Group\s+Mbr\s+State\s+Transitions\s*$$ + ^(\s*=+)+\s*$$ + ^\s*\d.*$$ -> Continue.Record + ^\s+${CONFIG_MASTER}(?:\s+${CURRENT_MASTER})?\s+${AGG_CONTROL}\s+${LD_SHARE_ALGORITHM}\s+${LD_SHARE_GROUP}\s+${AGG_MBR}\s+${LINK_STATE}\s+${LINK_UP_TRANSITIONS}\s*$$ + ^\s+${LD_SHARE_ALGORITHM}\s+${LD_SHARE_GROUP}\s+${AGG_MBR}\s+${LINK_STATE}\s+${LINK_UP_TRANSITIONS}\s*$$ + ^\s*Link\s+State:\s+A-Active,\s+D-Disabled,\s+R-Ready,\s+NP-Port\s+not\s+present,\s+L-Loopback\s*$$ + ^\s*Load\s+Sharing\s+Algorithm:\s+\(L2\)\s+Layer\s+2\s+address\s+based,\s+\(L3\)\s+Layer\s+3\s+address\s+based\s*$$ + ^\s*\(L3_L4\)\s+Layer\s+3\s+address\s+and\s+Layer\s+4\s+port\s+based\s*$$ + ^\s*\(custom\)\s+User-selected\s+address-based\s+configuration\s*$$ + ^\s*Custom\s+Algorithm\s+Configuration:\s+.*\s*$$ + ^\s*Number\s+of\s+load\s+sharing\s+trunks:\s+\d+\s*$$ + ^\s* + ^. -> Error diff --git a/tests/extreme/show_sharing/extreme_show_sharing.raw b/tests/extreme/show_sharing/extreme_show_sharing.raw new file mode 100644 index 0000000000..33b9de1bae --- /dev/null +++ b/tests/extreme/show_sharing/extreme_show_sharing.raw @@ -0,0 +1,21 @@ +Load Sharing Monitor +Config Current Agg Ld Share Ld Share Agg Link Link Up +Master Master Control Algorithm Group Mbr State Transitions +============================================================================== + 1 LACP L3_L4 1 - R 0 + L3_L4 2 - R 1 + L3_L4 3 - R 7 + L3_L4 4 - R 0 + 29 LACP L3_L4 29 - R 12 + L3_L4 34 - R 7 + 33 33 LACP L2 33 Y A 2 + L2 35 Y A 1 + 38 LACP L3_L4 38 - R 0 + L3_L4 39 - R 0 +============================================================================== +Link State: A-Active, D-Disabled, R-Ready, NP-Port not present, L-Loopback +Load Sharing Algorithm: (L2) Layer 2 address based, (L3) Layer 3 address based + (L3_L4) Layer 3 address and Layer 4 port based + (custom) User-selected address-based configuration +Custom Algorithm Configuration: ipv4 L3-and-L4, xor +Number of load sharing trunks: 4 diff --git a/tests/extreme/show_sharing/extreme_show_sharing.yml b/tests/extreme/show_sharing/extreme_show_sharing.yml new file mode 100644 index 0000000000..b0569e60df --- /dev/null +++ b/tests/extreme/show_sharing/extreme_show_sharing.yml @@ -0,0 +1,84 @@ +--- +parsed_sample: + - agg_control: "LACP" + agg_mbr: + - "-" + - "-" + - "-" + - "-" + config_master: "1" + current_master: "" + ld_share_algorithm: + - "L3_L4" + - "L3_L4" + - "L3_L4" + - "L3_L4" + ld_share_group: + - "1" + - "2" + - "3" + - "4" + link_state: + - "R" + - "R" + - "R" + - "R" + link_up_transitions: + - "0" + - "1" + - "7" + - "0" + - agg_control: "LACP" + agg_mbr: + - "-" + - "-" + config_master: "29" + current_master: "" + ld_share_algorithm: + - "L3_L4" + - "L3_L4" + ld_share_group: + - "29" + - "34" + link_state: + - "R" + - "R" + link_up_transitions: + - "12" + - "7" + - agg_control: "LACP" + agg_mbr: + - "Y" + - "Y" + config_master: "33" + current_master: "33" + ld_share_algorithm: + - "L2" + - "L2" + ld_share_group: + - "33" + - "35" + link_state: + - "A" + - "A" + link_up_transitions: + - "2" + - "1" + - agg_control: "LACP" + agg_mbr: + - "-" + - "-" + config_master: "38" + current_master: "" + ld_share_algorithm: + - "L3_L4" + - "L3_L4" + ld_share_group: + - "38" + - "39" + link_state: + - "R" + - "R" + link_up_transitions: + - "0" + - "0" From 7fa05eae95f025c4dfa0786a450fa0c82c51227a Mon Sep 17 00:00:00 2001 From: Maxim Shpak Date: Thu, 31 Aug 2023 15:08:24 +0300 Subject: [PATCH 07/13] Fix template for 'show vlan description' and add tests --- .../extreme_show_vlan_description.textfsm | 16 ++- .../extreme_show_vlan_description.raw | 48 +++++++ .../extreme_show_vlan_description.yml | 122 ++++++++++++++++++ 3 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 tests/extreme/show_vlan_description/extreme_show_vlan_description.raw create mode 100644 tests/extreme/show_vlan_description/extreme_show_vlan_description.yml diff --git a/ntc_templates/templates/extreme_show_vlan_description.textfsm b/ntc_templates/templates/extreme_show_vlan_description.textfsm index 00aca7e10e..47482fb503 100644 --- a/ntc_templates/templates/extreme_show_vlan_description.textfsm +++ b/ntc_templates/templates/extreme_show_vlan_description.textfsm @@ -1,7 +1,17 @@ Value NAME (\S+) Value ID (\d+) -Value DESCRIPTION ((\s*\S+)*) - +Value DESCRIPTION (.*) Start - ^\s*${NAME}\s+${ID}\s*(${DESCRIPTION})? -> Record \ No newline at end of file + ^(\s*=+)+\s*$$ + ^\s*Name\s+VID\s+Description\s*$$ -> VlanTable + ^\s* + ^. -> Error + +VlanTable + ^(\s*=+)+\s*$$ + ^\s*${NAME}\s+${ID}(?:\s+${DESCRIPTION})?\s*$$ -> Record + ^\s*>\s+Indicates\s+description\s+string\s+truncated\s+past\s+\d+\s+characters\s*$$ + ^\s*Total\s+number\s+of\s+VLAN\(s\)\s*:\s*\d+\s*$$ + ^\s* + ^. -> Error diff --git a/tests/extreme/show_vlan_description/extreme_show_vlan_description.raw b/tests/extreme/show_vlan_description/extreme_show_vlan_description.raw new file mode 100644 index 0000000000..61041d31d3 --- /dev/null +++ b/tests/extreme/show_vlan_description/extreme_show_vlan_description.raw @@ -0,0 +1,48 @@ +------------------------------------------------------------------------------- +Name VID Description +------------------------------------------------------------------------------- +Default 1 +Mgmt 4095 Management VLAN +VLAN0002 2 sw-3 +VLAN0003 3 VLAN0003 +VLAN0004 4 VLAN0004 +VLAN0005 5 tech +VLAN0006 6 zr +VLAN0007 7 +VLAN0008 8 VLAN0008 +VLAN0009 9 VGWsubnet1 +VLAN0010 10 LAN +VLAN0011 11 dsl-Internet +VLAN0012 12 VLAN0012 +VLAN0013 13 VLAN0013 +VLAN0014 14 VLAN0014 +VLAN0015 15 l3-sw-3 +VLAN0016 16 l3sw-2-6 +VLAN0017 17 VLAN0017 +VLAN0018 18 VLAN0018 +VLAN0019 19 VLAN0019 +VLAN0020 20 NNI-TEST-QnQ +VLAN0021 21 VLAN0021 +VLAN0022 22 VLAN0022 +VLAN0023 23 TEST_EXFO +VLAN0024 24 VLAN0024 +VLAN0025 25 VLAN0025 +VLAN0026 26 VLAN0026 +VLAN0027 27 VLAN0027 +VLAN0028 28 VLAN0028 +VLAN0029 29 VLAN0029 +VLAN0030 30 VLAN0030 +VLAN0031 31 VLAN0031 +VLAN0032 32 user VOIP +VLAN0033 33 VLAN0033 +VLAN0034 34 VLAN0034 +VLAN0035 35 VLAN0035 +VLAN0036 36 VLAN0036 +VLAN0037 37 VLAN0037 +VLAN0038 38 SS_voip +VLAN0248 248 +------------------------------------------------------------------------------- + +> Indicates description string truncated past 57 characters + +Total number of VLAN(s) : 3469 diff --git a/tests/extreme/show_vlan_description/extreme_show_vlan_description.yml b/tests/extreme/show_vlan_description/extreme_show_vlan_description.yml new file mode 100644 index 0000000000..2b28c4b650 --- /dev/null +++ b/tests/extreme/show_vlan_description/extreme_show_vlan_description.yml @@ -0,0 +1,122 @@ +--- +parsed_sample: + - description: "" + id: "1" + name: "Default" + - description: "Management VLAN" + id: "4095" + name: "Mgmt" + - description: "sw-3" + id: "2" + name: "VLAN0002" + - description: "VLAN0003" + id: "3" + name: "VLAN0003" + - description: "VLAN0004" + id: "4" + name: "VLAN0004" + - description: "tech" + id: "5" + name: "VLAN0005" + - description: "zr" + id: "6" + name: "VLAN0006" + - description: "" + id: "7" + name: "VLAN0007" + - description: "VLAN0008" + id: "8" + name: "VLAN0008" + - description: "VGWsubnet1" + id: "9" + name: "VLAN0009" + - description: "LAN" + id: "10" + name: "VLAN0010" + - description: "dsl-Internet" + id: "11" + name: "VLAN0011" + - description: "VLAN0012" + id: "12" + name: "VLAN0012" + - description: "VLAN0013" + id: "13" + name: "VLAN0013" + - description: "VLAN0014" + id: "14" + name: "VLAN0014" + - description: "l3-sw-3" + id: "15" + name: "VLAN0015" + - description: "l3sw-2-6" + id: "16" + name: "VLAN0016" + - description: "VLAN0017" + id: "17" + name: "VLAN0017" + - description: "VLAN0018" + id: "18" + name: "VLAN0018" + - description: "VLAN0019" + id: "19" + name: "VLAN0019" + - description: "NNI-TEST-QnQ" + id: "20" + name: "VLAN0020" + - description: "VLAN0021" + id: "21" + name: "VLAN0021" + - description: "VLAN0022" + id: "22" + name: "VLAN0022" + - description: "TEST_EXFO" + id: "23" + name: "VLAN0023" + - description: "VLAN0024" + id: "24" + name: "VLAN0024" + - description: "VLAN0025" + id: "25" + name: "VLAN0025" + - description: "VLAN0026" + id: "26" + name: "VLAN0026" + - description: "VLAN0027" + id: "27" + name: "VLAN0027" + - description: "VLAN0028" + id: "28" + name: "VLAN0028" + - description: "VLAN0029" + id: "29" + name: "VLAN0029" + - description: "VLAN0030" + id: "30" + name: "VLAN0030" + - description: "VLAN0031" + id: "31" + name: "VLAN0031" + - description: "user VOIP" + id: "32" + name: "VLAN0032" + - description: "VLAN0033" + id: "33" + name: "VLAN0033" + - description: "VLAN0034" + id: "34" + name: "VLAN0034" + - description: "VLAN0035" + id: "35" + name: "VLAN0035" + - description: "VLAN0036" + id: "36" + name: "VLAN0036" + - description: "VLAN0037" + id: "37" + name: "VLAN0037" + - description: "SS_voip" + id: "38" + name: "VLAN0038" + - description: "" + id: "248" + name: "VLAN0248" From a994625626534659dfa54ef1c4e1064a55df84eb Mon Sep 17 00:00:00 2001 From: Maxim Shpak Date: Thu, 31 Aug 2023 18:47:26 +0300 Subject: [PATCH 08/13] Fix template for 'show ports information detail' and add tests --- ...reme_show_ports_information_detail.textfsm | 27 +++- .../extreme_show_ports_information_brief.raw | 135 ++++++++++++++++++ .../extreme_show_ports_information_brief.yml | 30 ++++ 3 files changed, 185 insertions(+), 7 deletions(-) create mode 100644 tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.raw create mode 100644 tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.yml diff --git a/ntc_templates/templates/extreme_show_ports_information_detail.textfsm b/ntc_templates/templates/extreme_show_ports_information_detail.textfsm index 29a76caf37..f4606c5a0b 100644 --- a/ntc_templates/templates/extreme_show_ports_information_detail.textfsm +++ b/ntc_templates/templates/extreme_show_ports_information_detail.textfsm @@ -1,13 +1,26 @@ Value PORT (\d+) -Value DESCRIPTION (((\s*\S+)*)?) +Value DESCRIPTION (.*) +Value VIRTUAL_ROUTER (.*) +Value TYPE (.*) +Value RANDOM_EARLY_DROP (.*) Value ADMIN_STATE (.*) Value LINK_STATE (\S+) +Value LINK_UPS_NUM (\d+) +Value LINK_UPS_LAST (.*) +Value LINK_DOWNS_NUM (\d+) +Value LINK_DOWNS_LAST (.*) Value List VLAN_ID (\d+) Start - ^\s*Port:\s.* -> Continue.Record - ^\s*Port:\s*${PORT} - ^\s*Description\sString:\s*\"${DESCRIPTION}\" - ^\s*Admin\sstate:\s*${ADMIN_STATE} - ^\s*Link\sState:\s+${LINK_STATE}(\,)?(\s)? - ^.*VLAN\sID:\s*${VLAN_ID} \ No newline at end of file + ^\s*Port:.*$$ -> Continue.Record + ^\s*Port:\s*${PORT}\s*$$ + ^\s*Description\s+String:\s*\"${DESCRIPTION}\"\s*$$ + ^\s*Virtual-router:\s*${VIRTUAL_ROUTER}\s*$$ + ^\s*Type:\s*${TYPE}\s*$$ + ^\s*Random\s+Early\s+drop:\s*${RANDOM_EARLY_DROP}\s*$$ + ^\s*Admin\s+state:\s*${ADMIN_STATE} + ^\s*Link\s+State:\s*${LINK_STATE}(,)?(\s)?.*$$ + ^\s*Link\s+Ups:\s*${LINK_UPS_NUM}\s+Last:\s*${LINK_UPS_LAST}\s*$$ + ^\s*Link\s+Downs:\s*${LINK_DOWNS_NUM}\s+Last:\s*${LINK_DOWNS_LAST}\s*$$ + ^\s*VLAN\s+cfg:\s*$$ + ^.*VLAN\s+ID:\s*${VLAN_ID}\s*$$ diff --git a/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.raw b/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.raw new file mode 100644 index 0000000000..deca51171c --- /dev/null +++ b/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.raw @@ -0,0 +1,135 @@ +Port: 1 + Description String: "AggregateLink" + Virtual-router: VR-Default + Type: NONE + Random Early drop: Unsupported + Admin state: Disabled with 10G full-duplex + Link State: Ready (local fault) + Link Ups: 0 Last: Mon Apr 12 12:30:24 2021 + Link Downs: 1 Last: Thu Jun 23 12:41:45 2022 + + VLAN cfg: + Name: Default, Internal Tag = 1, MAC-limit = No-limit, Virtual router: VR-Default + Name: VLAN2222, 802.1Q Tag = 2222, MAC-limit = No-limit, Virtual router: VR-Default + Port-specific VLAN ID: 2222 + Name: VLAN1801, 802.1Q Tag = 1801, MAC-limit = No-limit, Virtual router: VR-Default + Port-specific VLAN ID: 1801 + + STP cfg: + s1(enable), Tag=(none), Mode=802.1D, State=DISABLED + + Protocol: + Name: Default Protocol: ANY Match all protocols. + Trunking: Master port with 4 members using algorithm address based - L3_L4 +algorithm + Members: 1-4 + + EDP: Enabled + + ELSM: Disabled + Ethernet OAM: Disabled + Learning: Enabled + Unicast Flooding: Enabled + Multicast Flooding: Enabled + Broadcast Flooding: Enabled + Jumbo: Enabled, MTU= 9216 + Flow Control: Rx-Pause: Enabled Tx-Pause: Disabled + Priority Flow Control: Disabled + Reflective Relay: Disabled + Link up/down SNMP trap filter setting: Enabled + Egress Port Rate: No-limit + Broadcast Rate: No-limit + Multicast Rate: No-limit + Unknown Dest Mac Rate: No-limit + QoS Profile: None configured + Ingress Rate Shaping : Unsupported + Ingress IPTOS Examination: Disabled + Ingress 802.1p Examination: Enabled + Ingress 802.1p Inner Exam: Disabled + Egress IPTOS Replacement: Disabled + Egress 802.1p Replacement: Disabled + NetLogin: Disabled + NetLogin port mode: Port based VLANs + Smart redundancy: Enabled + Software redundant port: Disabled + IPFIX: Disabled Metering: Ingress, All Packets, All Traffic + IPv4 Flow Key Mask: SIP: 255.255.255.255 DIP: 255.255.255.255 + IPv6 Flow Key Mask: SIP: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff + DIP: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff + + Far-End-Fault-Indication: Disabled + Shared packet buffer: default + VMAN CEP egress filtering: Disabled + Isolation: Off + PTP Configured: Disabled + Time-Stamping Mode: None + Synchronous Ethernet: Unsupported + Dynamic VLAN Uplink: Disabled + VM Tracking Dynamic VLANs: Disabled +Port: 2 + Virtual-router: VR-Default + Type: NONE + Random Early drop: Unsupported + Admin state: Disabled with 10G full-duplex + Link State: Ready (local fault) + Link Ups: 1 Last: Mon Jun 13 19:21:19 2022 + Link Downs: 2 Last: Thu Jun 23 12:41:37 2022 + + VLAN cfg: + Name: Default, Internal Tag = 1, MAC-limit = No-limit, Virtual router: VR-Default + Name: VLAN2222, 802.1Q Tag = 2222, MAC-limit = No-limit, Virtual router: VR-Default + Port-specific VLAN ID: 2222 + Name: VLAN1802, 802.1Q Tag = 1802, MAC-limit = No-limit, Virtual router: VR-Default + Port-specific VLAN ID: 1802 + + STP cfg: + s1(enable), Tag=(none), Mode=802.1D, State=DISABLED + + Protocol: + Name: Default Protocol: ANY Match all protocols. + Trunking: Master port with 4 members using algorithm address based - L3_L4 +algorithm + Members: 1-4 + + EDP: Enabled + + ELSM: Disabled + Ethernet OAM: Disabled + Learning: Enabled + Unicast Flooding: Enabled + Multicast Flooding: Enabled + Broadcast Flooding: Enabled + Jumbo: Enabled, MTU= 9216 + Flow Control: Rx-Pause: Enabled Tx-Pause: Disabled + Priority Flow Control: Disabled + Reflective Relay: Disabled + Link up/down SNMP trap filter setting: Enabled + Egress Port Rate: No-limit + Broadcast Rate: No-limit + Multicast Rate: No-limit + Unknown Dest Mac Rate: No-limit + QoS Profile: None configured + Ingress Rate Shaping : Unsupported + Ingress IPTOS Examination: Disabled + Ingress 802.1p Examination: Enabled + Ingress 802.1p Inner Exam: Disabled + Egress IPTOS Replacement: Disabled + Egress 802.1p Replacement: Disabled + NetLogin: Disabled + NetLogin port mode: Port based VLANs + Smart redundancy: Enabled + Software redundant port: Disabled + IPFIX: Disabled Metering: Ingress, All Packets, All Traffic + IPv4 Flow Key Mask: SIP: 255.255.255.255 DIP: 255.255.255.255 + IPv6 Flow Key Mask: SIP: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff + DIP: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff + + Far-End-Fault-Indication: Disabled + Shared packet buffer: default + VMAN CEP egress filtering: Disabled + Isolation: Off + PTP Configured: Disabled + Time-Stamping Mode: None + Synchronous Ethernet: Unsupported + Dynamic VLAN Uplink: Disabled + VM Tracking Dynamic VLANs: Disabled diff --git a/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.yml b/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.yml new file mode 100644 index 0000000000..92bdc9929c --- /dev/null +++ b/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.yml @@ -0,0 +1,30 @@ +--- +parsed_sample: + - admin_state: "Disabled with 10G full-duplex" + description: "AggregateLink" + link_downs_last: "Thu Jun 23 12:41:45 2022" + link_downs_num: "1" + link_state: "Ready" + link_ups_last: "Mon Apr 12 12:30:24 2021" + link_ups_num: "0" + port: "1" + random_early_drop: "Unsupported" + type: "NONE" + virtual_router: "VR-Default" + vlan_id: + - "2222" + - "1801" + - admin_state: "Disabled with 10G full-duplex" + description: "" + link_downs_last: "Thu Jun 23 12:41:37 2022" + link_downs_num: "2" + link_state: "Ready" + link_ups_last: "Mon Jun 13 19:21:19 2022" + link_ups_num: "1" + port: "2" + random_early_drop: "Unsupported" + type: "NONE" + virtual_router: "VR-Default" + vlan_id: + - "2222" + - "1802" From eb61e1fc40747d8a749f82ffe21656a17748eebc Mon Sep 17 00:00:00 2001 From: PavloSkliarenko <78343937+PavloSkliarenko@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:54:44 +0400 Subject: [PATCH 09/13] Update ntc_templates/templates/extreme_show_ports_description.textfsm Co-authored-by: Josh VanDeraa --- ntc_templates/templates/extreme_show_ports_description.textfsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntc_templates/templates/extreme_show_ports_description.textfsm b/ntc_templates/templates/extreme_show_ports_description.textfsm index ad4ee24aec..3c54caf12e 100644 --- a/ntc_templates/templates/extreme_show_ports_description.textfsm +++ b/ntc_templates/templates/extreme_show_ports_description.textfsm @@ -1,4 +1,4 @@ -Value PORT (\d+) +Value INTERFACE (\d+) Value DISPLAY_STRING (\S+) Value DESCRIPTION (.*) From 125c42c012871002deed6ac204cecc8b809c5a37 Mon Sep 17 00:00:00 2001 From: PavloSkliarenko <78343937+PavloSkliarenko@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:54:49 +0400 Subject: [PATCH 10/13] Update ntc_templates/templates/extreme_show_ports_information.textfsm Co-authored-by: Josh VanDeraa --- ntc_templates/templates/extreme_show_ports_information.textfsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntc_templates/templates/extreme_show_ports_information.textfsm b/ntc_templates/templates/extreme_show_ports_information.textfsm index 7601b1d479..9e416db001 100644 --- a/ntc_templates/templates/extreme_show_ports_information.textfsm +++ b/ntc_templates/templates/extreme_show_ports_information.textfsm @@ -1,4 +1,4 @@ -Value PORT (\d+) +Value INTERFACE (\d+) Value FLAGS (\S+) Value LINK_STATE (\S+) Value ELSM (\S+) From 28b86b5aeda614d60b158b3ce1148ff1c74ce18c Mon Sep 17 00:00:00 2001 From: PavloSkliarenko <78343937+PavloSkliarenko@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:54:55 +0400 Subject: [PATCH 11/13] Update ntc_templates/templates/extreme_show_vlan_description.textfsm Co-authored-by: Josh VanDeraa --- ntc_templates/templates/extreme_show_vlan_description.textfsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntc_templates/templates/extreme_show_vlan_description.textfsm b/ntc_templates/templates/extreme_show_vlan_description.textfsm index 47482fb503..efbe0d7b47 100644 --- a/ntc_templates/templates/extreme_show_vlan_description.textfsm +++ b/ntc_templates/templates/extreme_show_vlan_description.textfsm @@ -1,5 +1,5 @@ -Value NAME (\S+) -Value ID (\d+) +Value VLAN_NAME (\S+) +Value VLAN_ID (\d+) Value DESCRIPTION (.*) Start From 35b3ac447edccbc1dc1f3749f8e06b0fbdc7c597 Mon Sep 17 00:00:00 2001 From: PavloSkliarenko <78343937+PavloSkliarenko@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:55:01 +0400 Subject: [PATCH 12/13] Update ntc_templates/templates/extreme_show_ports_information_detail.textfsm Co-authored-by: Josh VanDeraa --- .../templates/extreme_show_ports_information_detail.textfsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntc_templates/templates/extreme_show_ports_information_detail.textfsm b/ntc_templates/templates/extreme_show_ports_information_detail.textfsm index f4606c5a0b..71a20fda1b 100644 --- a/ntc_templates/templates/extreme_show_ports_information_detail.textfsm +++ b/ntc_templates/templates/extreme_show_ports_information_detail.textfsm @@ -1,4 +1,4 @@ -Value PORT (\d+) +Value INTERFACE (\d+) Value DESCRIPTION (.*) Value VIRTUAL_ROUTER (.*) Value TYPE (.*) From 43a7b077c951cc3e048aa3328033970425531908 Mon Sep 17 00:00:00 2001 From: pskliarenko <“pskliarenko@bsh.ru”> Date: Mon, 6 Nov 2023 18:54:39 +0400 Subject: [PATCH 13/13] Fix value names --- .../extreme_show_ports_description.textfsm | 2 +- .../extreme_show_ports_information.textfsm | 2 +- ...reme_show_ports_information_detail.textfsm | 2 +- .../extreme_show_vlan_description.textfsm | 2 +- .../extreme_show_ports_description.yml | 96 +++++------ .../extreme_show_ports_information.yml | 96 +++++------ .../extreme_show_ports_information_brief.yml | 4 +- .../extreme_show_vlan_description.yml | 160 +++++++++--------- 8 files changed, 182 insertions(+), 182 deletions(-) diff --git a/ntc_templates/templates/extreme_show_ports_description.textfsm b/ntc_templates/templates/extreme_show_ports_description.textfsm index 3c54caf12e..044b577cab 100644 --- a/ntc_templates/templates/extreme_show_ports_description.textfsm +++ b/ntc_templates/templates/extreme_show_ports_description.textfsm @@ -13,6 +13,6 @@ Start Ports ^(\s*=+)+\s*$$ - ^\s*${PORT}(?:\s+${DESCRIPTION})?\s*$$ -> Record + ^\s*${INTERFACE}(?:\s+${DESCRIPTION})?\s*$$ -> Record ^\s* ^. -> Error diff --git a/ntc_templates/templates/extreme_show_ports_information.textfsm b/ntc_templates/templates/extreme_show_ports_information.textfsm index 9e416db001..7084204c6e 100644 --- a/ntc_templates/templates/extreme_show_ports_information.textfsm +++ b/ntc_templates/templates/extreme_show_ports_information.textfsm @@ -19,7 +19,7 @@ Start Ports ^State\s+/OAM\s+UPS\s+STP\s+VLAN\s+Proto\s+Size\s+profile\s+Master\*$$ ^(\s*=+)+\s*$$ - ^\s*${PORT}\s+${FLAGS}\s+${LINK_STATE}\s+${ELSM}\s*/\s*${OAM}\s+${LINK_UPS}\s+${NUM_STP}\s+${NUM_VLAN}\s+${NUM_PROTO}\s+${JUMBO_SIZE}\s+${QOS_PROFILE}(?:\s+${LOAD_MASTER})?\s*$$ -> Record + ^\s*${INTERFACE}\s+${FLAGS}\s+${LINK_STATE}\s+${ELSM}\s*/\s*${OAM}\s+${LINK_UPS}\s+${NUM_STP}\s+${NUM_VLAN}\s+${NUM_PROTO}\s+${JUMBO_SIZE}\s+${QOS_PROFILE}(?:\s+${LOAD_MASTER})?\s*$$ -> Record ^\s*>\s+indicates\s+Port\s+Display\s+Name\s+truncated\s+past\s+8\s+characters\s*$$ ^\s*Flags\s+:\s+a\s+-\s+Load\s+Sharing\s+Algorithm\s+address-based,\s+D\s+-\s+Port\s+Disabled,\s*$$ ^\s*e\s+-\s+Extreme\s+Discovery\s+Protocol\s+Enabled,\s+E\s+-\s+Port\s+Enabled,\s*$$ diff --git a/ntc_templates/templates/extreme_show_ports_information_detail.textfsm b/ntc_templates/templates/extreme_show_ports_information_detail.textfsm index 71a20fda1b..4fd514c7e6 100644 --- a/ntc_templates/templates/extreme_show_ports_information_detail.textfsm +++ b/ntc_templates/templates/extreme_show_ports_information_detail.textfsm @@ -13,7 +13,7 @@ Value List VLAN_ID (\d+) Start ^\s*Port:.*$$ -> Continue.Record - ^\s*Port:\s*${PORT}\s*$$ + ^\s*Port:\s*${INTERFACE}\s*$$ ^\s*Description\s+String:\s*\"${DESCRIPTION}\"\s*$$ ^\s*Virtual-router:\s*${VIRTUAL_ROUTER}\s*$$ ^\s*Type:\s*${TYPE}\s*$$ diff --git a/ntc_templates/templates/extreme_show_vlan_description.textfsm b/ntc_templates/templates/extreme_show_vlan_description.textfsm index efbe0d7b47..b40bebbce4 100644 --- a/ntc_templates/templates/extreme_show_vlan_description.textfsm +++ b/ntc_templates/templates/extreme_show_vlan_description.textfsm @@ -10,7 +10,7 @@ Start VlanTable ^(\s*=+)+\s*$$ - ^\s*${NAME}\s+${ID}(?:\s+${DESCRIPTION})?\s*$$ -> Record + ^\s*${VLAN_NAME}\s+${VLAN_ID}(?:\s+${DESCRIPTION})?\s*$$ -> Record ^\s*>\s+Indicates\s+description\s+string\s+truncated\s+past\s+\d+\s+characters\s*$$ ^\s*Total\s+number\s+of\s+VLAN\(s\)\s*:\s*\d+\s*$$ ^\s* diff --git a/tests/extreme/show_ports_description/extreme_show_ports_description.yml b/tests/extreme/show_ports_description/extreme_show_ports_description.yml index 16e125c375..e805ff65b3 100644 --- a/tests/extreme/show_ports_description/extreme_show_ports_description.yml +++ b/tests/extreme/show_ports_description/extreme_show_ports_description.yml @@ -2,145 +2,145 @@ parsed_sample: - description: "AggregateLink" display_string: "" - port: "1" + interface: "1" - description: "" display_string: "" - port: "2" + interface: "2" - description: "" display_string: "" - port: "3" + interface: "3" - description: "" display_string: "" - port: "4" + interface: "4" - description: "MX5-2 - xe0/0/3" display_string: "" - port: "5" + interface: "5" - description: "BLADE-3 - VC1-4" display_string: "" - port: "6" + interface: "6" - description: "BLADE-3 - VC2-4" display_string: "" - port: "7" + interface: "7" - description: "BGW-R1 - xe0/1/1 (LAG7)" display_string: "" - port: "8" + interface: "8" - description: "FREE" display_string: "" - port: "9" + interface: "9" - description: "SRV-R1 - xe-0/0/1 (LAG6)" display_string: "" - port: "10" + interface: "10" - description: "3COM - Gi1/0/26 Link for PIM" display_string: "" - port: "11" + interface: "11" - description: "C4948-1 - te1/49" display_string: "" - port: "12" + interface: "12" - description: "Eltex3124-7 - te1/0/1" display_string: "" - port: "13" + interface: "13" - description: "Eltex3124-6 - te1/0/1" display_string: "" - port: "14" + interface: "14" - description: "Eltex3124-5 - te1/0/1" display_string: "" - port: "15" + interface: "15" - description: "Eltex3124-4 - te1/0/1" display_string: "" - port: "16" + interface: "16" - description: "MX5-1 - xe-0/0/3" display_string: "" - port: "17" + interface: "17" - description: "MX5-1 - xe-0/0/1" display_string: "" - port: "18" + interface: "18" - description: "CCR1036 - sfp1" display_string: "" - port: "19" + interface: "19" - description: "" display_string: "" - port: "20" + interface: "20" - description: "" display_string: "" - port: "21" + interface: "21" - description: "RS-CORE-1 - Gi0/1" display_string: "" - port: "22" + interface: "22" - description: "" display_string: "" - port: "23" + interface: "23" - description: "Uplink-GARS" display_string: "" - port: "24" + interface: "24" - description: "CRM-139204" display_string: "" - port: "25" + interface: "25" - description: "FREE" display_string: "" - port: "26" + interface: "26" - description: "FREE" display_string: "" - port: "27" + interface: "27" - description: "FREE" display_string: "" - port: "28" + interface: "28" - description: "N3K-2 - eth1/1 (LAG29)" display_string: "" - port: "29" + interface: "29" - description: "3COM - Te1/1/1" display_string: "" - port: "30" + interface: "30" - description: "FREE" display_string: "" - port: "31" + interface: "31" - description: "" display_string: "" - port: "32" + interface: "32" - description: "N9K-1 - eth1/46 (LAG33)" display_string: "" - port: "33" + interface: "33" - description: "N3K-2 - eth1/2 (LAG29)" display_string: "" - port: "34" + interface: "34" - description: "N9K-1 - eth1/47 (LAG33)" display_string: "" - port: "35" + interface: "35" - description: "Carbon-Reductor-NetXtreme-1 MIRROR" display_string: "" - port: "36" + interface: "36" - description: "VoipMonitor_Mirror" display_string: "" - port: "37" + interface: "37" - description: "Eltex3324-1 - te1/0/1 (LAG38)" display_string: "" - port: "38" + interface: "38" - description: "Eltex3324-1 - te1/0/2 (LAG38)" display_string: "" - port: "39" + interface: "39" - description: "FREE" display_string: "" - port: "40" + interface: "40" - description: "FREE" display_string: "" - port: "41" + interface: "41" - description: "BLADE-2-VC2 - VC8" display_string: "" - port: "42" + interface: "42" - description: "Storage-SMicro - eth0" display_string: "" - port: "43" + interface: "43" - description: "SCST-SSD_Cache - eth1" display_string: "" - port: "44" + interface: "44" - description: "Eltex5248-1 - Te1/0/1" display_string: "" - port: "45" + interface: "45" - description: "VEEAM1 - eth1" display_string: "" - port: "46" + interface: "46" - description: "BLADE-1-VC2 - VC1" display_string: "" - port: "47" + interface: "47" - description: "BLADE-1-VC2 - VC8" display_string: "" - port: "48" + interface: "48" diff --git a/tests/extreme/show_ports_information/extreme_show_ports_information.yml b/tests/extreme/show_ports_information/extreme_show_ports_information.yml index 1e1b229e41..650d2f5993 100644 --- a/tests/extreme/show_ports_information/extreme_show_ports_information.yml +++ b/tests/extreme/show_ports_information/extreme_show_ports_information.yml @@ -10,7 +10,7 @@ parsed_sample: num_stp: "1" num_vlan: "3288" oam: "-" - port: "1" + interface: "1" qos_profile: "none" - elsm: "-" flags: "Dmjla---e--fMB---x-" @@ -22,7 +22,7 @@ parsed_sample: num_stp: "1" num_vlan: "3288" oam: "-" - port: "2" + interface: "2" qos_profile: "none" - elsm: "-" flags: "Dmjla---e--fMB---x-" @@ -34,7 +34,7 @@ parsed_sample: num_stp: "1" num_vlan: "3288" oam: "-" - port: "3" + interface: "3" qos_profile: "none" - elsm: "-" flags: "Dmjla---e--fMB---x-" @@ -46,7 +46,7 @@ parsed_sample: num_stp: "1" num_vlan: "3288" oam: "-" - port: "4" + interface: "4" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -58,7 +58,7 @@ parsed_sample: num_stp: "0" num_vlan: "1" oam: "-" - port: "5" + interface: "5" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -70,7 +70,7 @@ parsed_sample: num_stp: "0" num_vlan: "74" oam: "-" - port: "6" + interface: "6" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -82,7 +82,7 @@ parsed_sample: num_stp: "0" num_vlan: "74" oam: "-" - port: "7" + interface: "7" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -94,7 +94,7 @@ parsed_sample: num_stp: "0" num_vlan: "0" oam: "-" - port: "8" + interface: "8" qos_profile: "none" - elsm: "-" flags: "Dmj-----e--fMB---x-" @@ -106,7 +106,7 @@ parsed_sample: num_stp: "0" num_vlan: "0" oam: "-" - port: "9" + interface: "9" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -118,7 +118,7 @@ parsed_sample: num_stp: "0" num_vlan: "0" oam: "-" - port: "10" + interface: "10" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -130,7 +130,7 @@ parsed_sample: num_stp: "0" num_vlan: "1" oam: "-" - port: "11" + interface: "11" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -142,7 +142,7 @@ parsed_sample: num_stp: "0" num_vlan: "97" oam: "-" - port: "12" + interface: "12" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -154,7 +154,7 @@ parsed_sample: num_stp: "1" num_vlan: "55" oam: "-" - port: "13" + interface: "13" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -166,7 +166,7 @@ parsed_sample: num_stp: "1" num_vlan: "130" oam: "-" - port: "14" + interface: "14" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -178,7 +178,7 @@ parsed_sample: num_stp: "1" num_vlan: "191" oam: "-" - port: "15" + interface: "15" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -190,7 +190,7 @@ parsed_sample: num_stp: "1" num_vlan: "312" oam: "-" - port: "16" + interface: "16" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -202,7 +202,7 @@ parsed_sample: num_stp: "0" num_vlan: "3289" oam: "-" - port: "17" + interface: "17" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -214,7 +214,7 @@ parsed_sample: num_stp: "0" num_vlan: "0" oam: "-" - port: "18" + interface: "18" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -226,7 +226,7 @@ parsed_sample: num_stp: "0" num_vlan: "176" oam: "-" - port: "19" + interface: "19" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -238,7 +238,7 @@ parsed_sample: num_stp: "1" num_vlan: "7" oam: "-" - port: "20" + interface: "20" qos_profile: "none" - elsm: "-" flags: "Dmj-----e--fMB---x-" @@ -250,7 +250,7 @@ parsed_sample: num_stp: "0" num_vlan: "1" oam: "-" - port: "21" + interface: "21" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -262,7 +262,7 @@ parsed_sample: num_stp: "1" num_vlan: "11" oam: "-" - port: "22" + interface: "22" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -274,7 +274,7 @@ parsed_sample: num_stp: "1" num_vlan: "3324" oam: "-" - port: "23" + interface: "23" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -286,7 +286,7 @@ parsed_sample: num_stp: "0" num_vlan: "1" oam: "-" - port: "24" + interface: "24" qos_profile: "none" - elsm: "-" flags: "Dmj-----e--fMB---x-" @@ -298,7 +298,7 @@ parsed_sample: num_stp: "0" num_vlan: "5" oam: "-" - port: "25" + interface: "25" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -310,7 +310,7 @@ parsed_sample: num_stp: "0" num_vlan: "5" oam: "-" - port: "26" + interface: "26" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -322,7 +322,7 @@ parsed_sample: num_stp: "0" num_vlan: "5" oam: "-" - port: "27" + interface: "27" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -334,7 +334,7 @@ parsed_sample: num_stp: "0" num_vlan: "5" oam: "-" - port: "28" + interface: "28" qos_profile: "none" - elsm: "-" flags: "Emjla---e--fMB---x-" @@ -346,7 +346,7 @@ parsed_sample: num_stp: "0" num_vlan: "72" oam: "-" - port: "29" + interface: "29" qos_profile: "none" - elsm: "-" flags: "Dmj-----e--fMB---x-" @@ -358,7 +358,7 @@ parsed_sample: num_stp: "1" num_vlan: "532" oam: "-" - port: "30" + interface: "30" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -370,7 +370,7 @@ parsed_sample: num_stp: "0" num_vlan: "0" oam: "-" - port: "31" + interface: "31" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -382,7 +382,7 @@ parsed_sample: num_stp: "0" num_vlan: "0" oam: "-" - port: "32" + interface: "32" qos_profile: "none" - elsm: "-" flags: "Emjla---e--fMB---x-" @@ -394,7 +394,7 @@ parsed_sample: num_stp: "0" num_vlan: "856" oam: "-" - port: "33" + interface: "33" qos_profile: "none" - elsm: "-" flags: "Emjla---e--fMB---x-" @@ -406,7 +406,7 @@ parsed_sample: num_stp: "0" num_vlan: "72" oam: "-" - port: "34" + interface: "34" qos_profile: "none" - elsm: "-" flags: "Emjla---e--fMB---x-" @@ -418,7 +418,7 @@ parsed_sample: num_stp: "0" num_vlan: "856" oam: "-" - port: "35" + interface: "35" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -430,7 +430,7 @@ parsed_sample: num_stp: "0" num_vlan: "0" oam: "-" - port: "36" + interface: "36" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -442,7 +442,7 @@ parsed_sample: num_stp: "0" num_vlan: "0" oam: "-" - port: "37" + interface: "37" qos_profile: "none" - elsm: "-" flags: "Emjla---e--fMB---x-" @@ -454,7 +454,7 @@ parsed_sample: num_stp: "0" num_vlan: "26" oam: "-" - port: "38" + interface: "38" qos_profile: "none" - elsm: "-" flags: "Emjla---e--fMB---x-" @@ -466,7 +466,7 @@ parsed_sample: num_stp: "0" num_vlan: "26" oam: "-" - port: "39" + interface: "39" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -478,7 +478,7 @@ parsed_sample: num_stp: "0" num_vlan: "7" oam: "-" - port: "40" + interface: "40" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -490,7 +490,7 @@ parsed_sample: num_stp: "1" num_vlan: "118" oam: "-" - port: "41" + interface: "41" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -502,7 +502,7 @@ parsed_sample: num_stp: "1" num_vlan: "317" oam: "-" - port: "42" + interface: "42" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -514,7 +514,7 @@ parsed_sample: num_stp: "1" num_vlan: "2" oam: "-" - port: "43" + interface: "43" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB---x-" @@ -526,7 +526,7 @@ parsed_sample: num_stp: "0" num_vlan: "1" oam: "-" - port: "44" + interface: "44" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB-----" @@ -538,7 +538,7 @@ parsed_sample: num_stp: "0" num_vlan: "388" oam: "-" - port: "45" + interface: "45" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB-----" @@ -550,7 +550,7 @@ parsed_sample: num_stp: "0" num_vlan: "6" oam: "-" - port: "46" + interface: "46" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB-----" @@ -562,7 +562,7 @@ parsed_sample: num_stp: "0" num_vlan: "261" oam: "-" - port: "47" + interface: "47" qos_profile: "none" - elsm: "-" flags: "Emj-----e--fMB-----" @@ -574,5 +574,5 @@ parsed_sample: num_stp: "0" num_vlan: "265" oam: "-" - port: "48" + interface: "48" qos_profile: "none" diff --git a/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.yml b/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.yml index 92bdc9929c..49938c024a 100644 --- a/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.yml +++ b/tests/extreme/show_ports_information_detail/extreme_show_ports_information_brief.yml @@ -7,7 +7,7 @@ parsed_sample: link_state: "Ready" link_ups_last: "Mon Apr 12 12:30:24 2021" link_ups_num: "0" - port: "1" + interface: "1" random_early_drop: "Unsupported" type: "NONE" virtual_router: "VR-Default" @@ -21,7 +21,7 @@ parsed_sample: link_state: "Ready" link_ups_last: "Mon Jun 13 19:21:19 2022" link_ups_num: "1" - port: "2" + interface: "2" random_early_drop: "Unsupported" type: "NONE" virtual_router: "VR-Default" diff --git a/tests/extreme/show_vlan_description/extreme_show_vlan_description.yml b/tests/extreme/show_vlan_description/extreme_show_vlan_description.yml index 2b28c4b650..c586a3b701 100644 --- a/tests/extreme/show_vlan_description/extreme_show_vlan_description.yml +++ b/tests/extreme/show_vlan_description/extreme_show_vlan_description.yml @@ -1,122 +1,122 @@ --- parsed_sample: - description: "" - id: "1" - name: "Default" + vlan_id: "1" + vlan_name: "Default" - description: "Management VLAN" - id: "4095" - name: "Mgmt" + vlan_id: "4095" + vlan_name: "Mgmt" - description: "sw-3" - id: "2" - name: "VLAN0002" + vlan_id: "2" + vlan_name: "VLAN0002" - description: "VLAN0003" - id: "3" - name: "VLAN0003" + vlan_id: "3" + vlan_name: "VLAN0003" - description: "VLAN0004" - id: "4" - name: "VLAN0004" + vlan_id: "4" + vlan_name: "VLAN0004" - description: "tech" - id: "5" - name: "VLAN0005" + vlan_id: "5" + vlan_name: "VLAN0005" - description: "zr" - id: "6" - name: "VLAN0006" + vlan_id: "6" + vlan_name: "VLAN0006" - description: "" - id: "7" - name: "VLAN0007" + vlan_id: "7" + vlan_name: "VLAN0007" - description: "VLAN0008" - id: "8" - name: "VLAN0008" + vlan_id: "8" + vlan_name: "VLAN0008" - description: "VGWsubnet1" - id: "9" - name: "VLAN0009" + vlan_id: "9" + vlan_name: "VLAN0009" - description: "LAN" - id: "10" - name: "VLAN0010" + vlan_id: "10" + vlan_name: "VLAN0010" - description: "dsl-Internet" - id: "11" - name: "VLAN0011" + vlan_id: "11" + vlan_name: "VLAN0011" - description: "VLAN0012" - id: "12" - name: "VLAN0012" + vlan_id: "12" + vlan_name: "VLAN0012" - description: "VLAN0013" - id: "13" - name: "VLAN0013" + vlan_id: "13" + vlan_name: "VLAN0013" - description: "VLAN0014" - id: "14" - name: "VLAN0014" + vlan_id: "14" + vlan_name: "VLAN0014" - description: "l3-sw-3" - id: "15" - name: "VLAN0015" + vlan_id: "15" + vlan_name: "VLAN0015" - description: "l3sw-2-6" - id: "16" - name: "VLAN0016" + vlan_id: "16" + vlan_name: "VLAN0016" - description: "VLAN0017" - id: "17" - name: "VLAN0017" + vlan_id: "17" + vlan_name: "VLAN0017" - description: "VLAN0018" - id: "18" - name: "VLAN0018" + vlan_id: "18" + vlan_name: "VLAN0018" - description: "VLAN0019" - id: "19" - name: "VLAN0019" + vlan_id: "19" + vlan_name: "VLAN0019" - description: "NNI-TEST-QnQ" - id: "20" - name: "VLAN0020" + vlan_id: "20" + vlan_name: "VLAN0020" - description: "VLAN0021" - id: "21" - name: "VLAN0021" + vlan_id: "21" + vlan_name: "VLAN0021" - description: "VLAN0022" - id: "22" - name: "VLAN0022" + vlan_id: "22" + vlan_name: "VLAN0022" - description: "TEST_EXFO" - id: "23" - name: "VLAN0023" + vlan_id: "23" + vlan_name: "VLAN0023" - description: "VLAN0024" - id: "24" - name: "VLAN0024" + vlan_id: "24" + vlan_name: "VLAN0024" - description: "VLAN0025" - id: "25" - name: "VLAN0025" + vlan_id: "25" + vlan_name: "VLAN0025" - description: "VLAN0026" - id: "26" - name: "VLAN0026" + vlan_id: "26" + vlan_name: "VLAN0026" - description: "VLAN0027" - id: "27" - name: "VLAN0027" + vlan_id: "27" + vlan_name: "VLAN0027" - description: "VLAN0028" - id: "28" - name: "VLAN0028" + vlan_id: "28" + vlan_name: "VLAN0028" - description: "VLAN0029" - id: "29" - name: "VLAN0029" + vlan_id: "29" + vlan_name: "VLAN0029" - description: "VLAN0030" - id: "30" - name: "VLAN0030" + vlan_id: "30" + vlan_name: "VLAN0030" - description: "VLAN0031" - id: "31" - name: "VLAN0031" + vlan_id: "31" + vlan_name: "VLAN0031" - description: "user VOIP" - id: "32" - name: "VLAN0032" + vlan_id: "32" + vlan_name: "VLAN0032" - description: "VLAN0033" - id: "33" - name: "VLAN0033" + vlan_id: "33" + vlan_name: "VLAN0033" - description: "VLAN0034" - id: "34" - name: "VLAN0034" + vlan_id: "34" + vlan_name: "VLAN0034" - description: "VLAN0035" - id: "35" - name: "VLAN0035" + vlan_id: "35" + vlan_name: "VLAN0035" - description: "VLAN0036" - id: "36" - name: "VLAN0036" + vlan_id: "36" + vlan_name: "VLAN0036" - description: "VLAN0037" - id: "37" - name: "VLAN0037" + vlan_id: "37" + vlan_name: "VLAN0037" - description: "SS_voip" - id: "38" - name: "VLAN0038" + vlan_id: "38" + vlan_name: "VLAN0038" - description: "" - id: "248" - name: "VLAN0248" + vlan_id: "248" + vlan_name: "VLAN0248"