From 1ef73c71ecc82f967ff02bce6124f87410c6087c Mon Sep 17 00:00:00 2001 From: Maxim Shpak Date: Fri, 3 May 2024 19:37:35 +0300 Subject: [PATCH 1/2] Merge conflict resolve --- .../edgecore_show_interfaces_status.textfsm | 4 +- .../edgecore_show_interfaces_status.raw | 3 +- .../edgecore_show_interfaces_status.yml | 513 +++++++++--------- 3 files changed, 268 insertions(+), 252 deletions(-) diff --git a/ntc_templates/templates/edgecore_show_interfaces_status.textfsm b/ntc_templates/templates/edgecore_show_interfaces_status.textfsm index e182264b44..415c72eee1 100644 --- a/ntc_templates/templates/edgecore_show_interfaces_status.textfsm +++ b/ntc_templates/templates/edgecore_show_interfaces_status.textfsm @@ -4,7 +4,7 @@ Value ADDRESS (.*) Value NAME (.*) Value PORT_ADMIN (.*) Value MDIX_MODE (.*) -Value NEGOTIATION (Auto) +Value NEGOTIATION (.*) Value SPEED (\d+) Value DUPLEX (\S+) Value CAPABILITIES (.*) @@ -23,6 +23,7 @@ Value PORT_SECURITY_ACTION (.*) Value MEDIA_TYPE (.*) Value GIGA_PHY_MODE (.*) Value LINK_STATUS (.*) +Value LINK_DOWN_REASON (.*) Value OPERATION_STATUS (.*) Value PORT_UPTIME (.*) Value FLOW_CONTROL_TYPE (.*) @@ -68,6 +69,7 @@ Configuration CurrentStatus ^\s*Link\s+Status:\s*${LINK_STATUS}\s*$$ + ^\s*Link\s+Down\s+Reason:\s*${LINK_DOWN_REASON}\s*$$ ^\s*Port\s+Operation\s+Status:\s*${OPERATION_STATUS}\s*$$ ^\s*Operation\s+Speed-duplex:\s*${SPEED}${DUPLEX}\s*$$ ^\s*Port\s+Uptime:\s*${PORT_UPTIME}\s*$$ diff --git a/tests/edgecore/show_interfaces_status/edgecore_show_interfaces_status.raw b/tests/edgecore/show_interfaces_status/edgecore_show_interfaces_status.raw index c8ff8af168..6f3dfd999d 100644 --- a/tests/edgecore/show_interfaces_status/edgecore_show_interfaces_status.raw +++ b/tests/edgecore/show_interfaces_status/edgecore_show_interfaces_status.raw @@ -6,7 +6,7 @@ Information of Eth 1/1 Name: PC1 Port Admin: Up MDIX mode: Auto - Speed-duplex: Auto + Speed-duplex: 100full Capabilities: 10half, 10full, 100half, 100full Broadcast Storm: Enabled Broadcast Storm Limit: 64 Kbits/second @@ -24,6 +24,7 @@ Information of Eth 1/1 Giga PHY mode: Auto preferred master Current Status: Link Status: Down + Link Down Reason: Port Admin Operation Speed-duplex: 100full Flow Control Type: None diff --git a/tests/edgecore/show_interfaces_status/edgecore_show_interfaces_status.yml b/tests/edgecore/show_interfaces_status/edgecore_show_interfaces_status.yml index 759e0e8a7a..9fb0e3bad9 100644 --- a/tests/edgecore/show_interfaces_status/edgecore_show_interfaces_status.yml +++ b/tests/edgecore/show_interfaces_status/edgecore_show_interfaces_status.yml @@ -1,366 +1,379 @@ --- parsed_sample: - - port: "Eth 1/1" - port_type: "100TX" - address: "12-34-56-78-AA-00" - name: "PC1" - port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" - speed: "100" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full" + - address: "12-34-56-78-AA-00" broadcast_storm: "Enabled" broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" - unknownunicast_storm: "Disabled" - unknownunicast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full" + duplex: "full" flow_control: "Disabled" - vlan_trunking: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "Port Admin" + link_status: "Down" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "None" - giga_phy_mode: "Auto preferred master" - link_status: "Down" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "PC1" + negotiation: "100full" operation_status: "" - port_uptime: "" - flow_control_type: "None" - - port: "Eth 1/2" - port_type: "100TX" - address: "12-34-56-78-AA-01" - name: "PC2" + port: "Eth 1/1" port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" + port_security: "Disabled" + port_security_action: "None" + port_type: "100TX" + port_uptime: "" speed: "100" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" + - address: "12-34-56-78-AA-01" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "" + link_status: "Down" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "None" - giga_phy_mode: "Auto preferred master" - link_status: "Down" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "PC2" + negotiation: "Auto" operation_status: "" - port_uptime: "" - flow_control_type: "None" - - port: "Eth 1/3" - port_type: "100TX" - address: "12-34-56-78-AA-03" - name: "AH1100-DevTest" + port: "Eth 1/2" port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" + port_security: "Disabled" + port_security_action: "None" + port_type: "100TX" + port_uptime: "" speed: "100" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" + - address: "12-34-56-78-AA-03" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "" + link_status: "Down" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "None" - giga_phy_mode: "Auto preferred master" - link_status: "Down" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "AH1100-DevTest" + negotiation: "Auto" operation_status: "" - port_uptime: "" - flow_control_type: "None" - - port: "Eth 1/4" - port_type: "100TX" - address: "12-34-56-78-AA-04" - name: "PC3" + port: "Eth 1/3" port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" + port_security: "Disabled" + port_security_action: "None" + port_type: "100TX" + port_uptime: "" speed: "100" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" + - address: "12-34-56-78-AA-04" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "" + link_status: "Down" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "None" - giga_phy_mode: "Auto preferred master" - link_status: "Down" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "PC3" + negotiation: "Auto" operation_status: "" - port_uptime: "" - flow_control_type: "None" - - port: "Eth 1/5" - port_type: "100TX" - address: "12-34-56-78-AA-05" - name: "Client_part" + port: "Eth 1/4" port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" + port_security: "Disabled" + port_security_action: "None" + port_type: "100TX" + port_uptime: "" speed: "100" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" + - address: "12-34-56-78-AA-05" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "" + link_status: "Down" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "None" - giga_phy_mode: "Auto preferred master" - link_status: "Down" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "Client_part" + negotiation: "Auto" operation_status: "" - port_uptime: "" - flow_control_type: "None" - - port: "Eth 1/6" - port_type: "100TX" - address: "12-34-56-78-AA-06" - name: "LAB LAN to VM" + port: "Eth 1/5" port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" + port_security: "Disabled" + port_security_action: "None" + port_type: "100TX" + port_uptime: "" speed: "100" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" + - address: "12-34-56-78-AA-06" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "" + link_status: "Down" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "None" - giga_phy_mode: "Auto preferred master" - link_status: "Down" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "LAB LAN to VM" + negotiation: "Auto" operation_status: "" - port_uptime: "" - flow_control_type: "None" - - port: "Eth 1/7" - port_type: "100TX" - address: "12-34-56-78-AA-07" - name: "Stand" + port: "Eth 1/6" port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" + port_security: "Disabled" + port_security_action: "None" + port_type: "100TX" + port_uptime: "" speed: "100" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" + - address: "12-34-56-78-AA-07" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "" + link_status: "Down" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "None" - giga_phy_mode: "Auto preferred master" - link_status: "Down" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "Stand" + negotiation: "Auto" operation_status: "" - port_uptime: "" - flow_control_type: "None" - - port: "Eth 1/8" - port_type: "100TX" - address: "12-34-56-78-AA-08" - name: "Stand fa4" + port: "Eth 1/7" port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" + port_security: "Disabled" + port_security_action: "None" + port_type: "100TX" + port_uptime: "" speed: "100" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" - lacp: "Disabled" - port_security: "Disabled" - max_mac_count: "0" - port_security_action: "None" - media_type: "None" + - address: "12-34-56-78-AA-08" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" giga_phy_mode: "Auto preferred master" + lacp: "Disabled" + link_down_reason: "" link_status: "Down" - operation_status: "" - port_uptime: "" - flow_control_type: "None" - - port: "Eth 1/9" - port_type: "1000T" - address: "12-34-56-78-AA-09" - name: "PC4" - port_admin: "Up" + max_mac_count: "0" mdix_mode: "Auto" - negotiation: "Auto" - speed: "1000" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full, 1000full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" + media_type: "None" multicast_storm: "Disabled" multicast_storm_limit: "64 Kbits/second" + name: "Stand fa4" + negotiation: "Auto" + operation_status: "" + port: "Eth 1/8" + port_admin: "Up" + port_security: "Disabled" + port_security_action: "None" + port_type: "100TX" + port_uptime: "" + speed: "100" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" + - address: "12-34-56-78-AA-09" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full, 1000full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "" + link_status: "Up" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "SFP preferred auto" - giga_phy_mode: "Auto preferred master" - link_status: "Up" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "PC4" + negotiation: "Auto" operation_status: "Up" - port_uptime: "1w 12d 11h 37m 14s (1078634 seconds)" - flow_control_type: "None" - - port: "Eth 1/10" - port_type: "1000T" - address: "12-34-56-78-AA-10" - name: "Videowall-PC" + port: "Eth 1/9" port_admin: "Up" - mdix_mode: "Auto" - negotiation: "Auto" + port_security: "Disabled" + port_security_action: "None" + port_type: "1000T" + port_uptime: "1w 12d 11h 37m 14s (1078634 seconds)" speed: "1000" - duplex: "full" - capabilities: "10half, 10full, 100half, 100full, 1000full" - broadcast_storm: "Enabled" - broadcast_storm_limit: "64 Kbits/second" - multicast_storm: "Disabled" - multicast_storm_limit: "64 Kbits/second" unknownunicast_storm: "Disabled" unknownunicast_storm_limit: "64 Kbits/second" - flow_control: "Disabled" vlan_trunking: "Disabled" + - address: "12-34-56-78-AA-10" + broadcast_storm: "Enabled" + broadcast_storm_limit: "64 Kbits/second" + capabilities: "10half, 10full, 100half, 100full, 1000full" + duplex: "full" + flow_control: "Disabled" + flow_control_type: "None" + giga_phy_mode: "Auto preferred master" lacp: "Disabled" - port_security: "Disabled" + link_down_reason: "" + link_status: "Up" max_mac_count: "0" - port_security_action: "None" + mdix_mode: "Auto" media_type: "SFP preferred auto" - giga_phy_mode: "Auto preferred master" - link_status: "Up" + multicast_storm: "Disabled" + multicast_storm_limit: "64 Kbits/second" + name: "Videowall-PC" + negotiation: "Auto" operation_status: "Up" + port: "Eth 1/10" + port_admin: "Up" + port_security: "Disabled" + port_security_action: "None" + port_type: "1000T" port_uptime: "3w 22d 1h 15m 40s (1905340 seconds)" - flow_control_type: "None" - - port: "VLAN 1" - port_type: "" - address: "12-34-56-78-90-00" - name: "" - port_admin: "" - mdix_mode: "" - negotiation: "" - speed: "" - duplex: "" - capabilities: "" + speed: "1000" + unknownunicast_storm: "Disabled" + unknownunicast_storm_limit: "64 Kbits/second" + vlan_trunking: "Disabled" + - address: "12-34-56-78-90-00" broadcast_storm: "" broadcast_storm_limit: "" - multicast_storm: "" - multicast_storm_limit: "" - unknownunicast_storm: "" - unknownunicast_storm_limit: "" + capabilities: "" + duplex: "" flow_control: "" - vlan_trunking: "" + flow_control_type: "" + giga_phy_mode: "" lacp: "" - port_security: "" + link_down_reason: "" + link_status: "" max_mac_count: "" - port_security_action: "" + mdix_mode: "" media_type: "" - giga_phy_mode: "" - link_status: "" - operation_status: "" - port_uptime: "" - flow_control_type: "" - - port: "VLAN 150" - port_type: "" - address: "12-34-56-78-90-00" + multicast_storm: "" + multicast_storm_limit: "" name: "" - port_admin: "" - mdix_mode: "" negotiation: "" + operation_status: "" + port: "VLAN 1" + port_admin: "" + port_security: "" + port_security_action: "" + port_type: "" + port_uptime: "" speed: "" - duplex: "" - capabilities: "" - broadcast_storm: "" - broadcast_storm_limit: "" - multicast_storm: "" - multicast_storm_limit: "" unknownunicast_storm: "" unknownunicast_storm_limit: "" - flow_control: "" vlan_trunking: "" + - address: "12-34-56-78-90-00" + broadcast_storm: "" + broadcast_storm_limit: "" + capabilities: "" + duplex: "" + flow_control: "" + flow_control_type: "" + giga_phy_mode: "" lacp: "" - port_security: "" + link_down_reason: "" + link_status: "" max_mac_count: "" - port_security_action: "" + mdix_mode: "" media_type: "" - giga_phy_mode: "" - link_status: "" - operation_status: "" - port_uptime: "" - flow_control_type: "" - - port: "VLAN 203" - port_type: "" - address: "12-34-56-78-90-00" + multicast_storm: "" + multicast_storm_limit: "" name: "" - port_admin: "" - mdix_mode: "" negotiation: "" + operation_status: "" + port: "VLAN 150" + port_admin: "" + port_security: "" + port_security_action: "" + port_type: "" + port_uptime: "" speed: "" - duplex: "" - capabilities: "" - broadcast_storm: "" - broadcast_storm_limit: "" - multicast_storm: "" - multicast_storm_limit: "" unknownunicast_storm: "" unknownunicast_storm_limit: "" - flow_control: "" vlan_trunking: "" + - address: "12-34-56-78-90-00" + broadcast_storm: "" + broadcast_storm_limit: "" + capabilities: "" + duplex: "" + flow_control: "" + flow_control_type: "" + giga_phy_mode: "" lacp: "" - port_security: "" + link_down_reason: "" + link_status: "" max_mac_count: "" - port_security_action: "" + mdix_mode: "" media_type: "" - giga_phy_mode: "" - link_status: "" + multicast_storm: "" + multicast_storm_limit: "" + name: "" + negotiation: "" operation_status: "" + port: "VLAN 203" + port_admin: "" + port_security: "" + port_security_action: "" + port_type: "" port_uptime: "" - flow_control_type: "" + speed: "" + unknownunicast_storm: "" + unknownunicast_storm_limit: "" + vlan_trunking: "" From b36b49632e38f986c385420f0bd28f80b62fb42b Mon Sep 17 00:00:00 2001 From: pskliarenko <“pskliarenko@bsh.ru”> Date: Fri, 9 Aug 2024 17:09:50 +0100 Subject: [PATCH 2/2] Value without capturing trailing whitespace --- ntc_templates/templates/edgecore_show_interfaces_status.textfsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntc_templates/templates/edgecore_show_interfaces_status.textfsm b/ntc_templates/templates/edgecore_show_interfaces_status.textfsm index 415c72eee1..96761ddeb7 100644 --- a/ntc_templates/templates/edgecore_show_interfaces_status.textfsm +++ b/ntc_templates/templates/edgecore_show_interfaces_status.textfsm @@ -4,7 +4,7 @@ Value ADDRESS (.*) Value NAME (.*) Value PORT_ADMIN (.*) Value MDIX_MODE (.*) -Value NEGOTIATION (.*) +Value NEGOTIATION (.*?) Value SPEED (\d+) Value DUPLEX (\S+) Value CAPABILITIES (.*)