diff --git a/ntc_templates/templates/edgecore_show_interfaces_brief.textfsm b/ntc_templates/templates/edgecore_show_interfaces_brief.textfsm index 0b9a728e50..33282fb3b7 100644 --- a/ntc_templates/templates/edgecore_show_interfaces_brief.textfsm +++ b/ntc_templates/templates/edgecore_show_interfaces_brief.textfsm @@ -1,12 +1,12 @@ Value INTERFACE (\S+\s+\d+\s*/\s*\d+) Value NAME (.*?) -Value STATUS (\S+) +Value STATUS (Up|Down|Disabled) Value PVID (\d+) Value PRIORITY (\d+) Value NEGOTIATION (Auto) Value SPEED (\d+) -Value DUPLEX (\S+) -Value TYPE (\S+) +Value DUPLEX (half|full) +Value TYPE (.*?) Value TRUNK (\S+) Start @@ -16,6 +16,6 @@ Start IfacesTable ^(?:\s*-+)+\s*$$ - ^\s*${INTERFACE}(?:\s+${NAME})?\s+${STATUS}\s+${PVID}\s+${PRIORITY}\s+(${NEGOTIATION}(\-)?)?(${SPEED})?(${DUPLEX})?\s+${TYPE}\s+${TRUNK}\s*$$ -> Record + ^\s*${INTERFACE}(?:\s+${NAME})?\s+${STATUS}\s+${PVID}\s+${PRIORITY}\s+(?:${NEGOTIATION})?-?(?:${SPEED}${DUPLEX})?\s+${TYPE}\s+${TRUNK}\s*$$ -> Record ^\s*$$ ^. -> Error diff --git a/tests/edgecore/show_interfaces_brief/edgecore_show_interfaces_brief.raw b/tests/edgecore/show_interfaces_brief/edgecore_show_interfaces_brief.raw index 63f9da12a5..7d50747ff8 100644 --- a/tests/edgecore/show_interfaces_brief/edgecore_show_interfaces_brief.raw +++ b/tests/edgecore/show_interfaces_brief/edgecore_show_interfaces_brief.raw @@ -4,9 +4,9 @@ Eth 1/ 1 Mikrotik-11.22.33. Down 1 0 Auto 100TX None Eth 1/ 2 vl10_toTESTS-PC Down 5 0 Auto 100TX None Eth 1/ 3 FortiGateLOL-vl10 Up 730 0 Auto-100full 100TX None Eth 1/ 4 Down 3010 0 Auto 100TX None -Eth 1/ 5 Down 884 0 Auto 100TX None +Eth 1/ 5 Down 884 0 100full 100TX None Eth 1/ 6 Down 884 0 Auto 100TX None Eth 1/ 7 Phone_Lollink_RNCB Up 222 0 Auto-100full 100TX None Eth 1/ 8 Up 222 0 Auto-100full 100TX None Eth 1/ 9 Up 1 0 Auto-1000full 1000T None -Eth 1/10 Up 1 0 Auto-1000full 1000T None +Eth 1/10 Uplink Up 1 0 Auto-1000full 1000Base SFP None diff --git a/tests/edgecore/show_interfaces_brief/edgecore_show_interfaces_brief.yml b/tests/edgecore/show_interfaces_brief/edgecore_show_interfaces_brief.yml index 6babcb832e..64ae827506 100644 --- a/tests/edgecore/show_interfaces_brief/edgecore_show_interfaces_brief.yml +++ b/tests/edgecore/show_interfaces_brief/edgecore_show_interfaces_brief.yml @@ -44,9 +44,9 @@ parsed_sample: name: "" priority: "0" pvid: "884" - negotiation: "Auto" - speed: "" - duplex: "" + negotiation: "" + speed: "100" + duplex: "full" status: "Down" trunk: "None" type: "100TX" @@ -91,7 +91,7 @@ parsed_sample: trunk: "None" type: "1000T" - interface: "Eth 1/10" - name: "" + name: "Uplink" priority: "0" pvid: "1" negotiation: "Auto" @@ -99,4 +99,4 @@ parsed_sample: duplex: "full" status: "Up" trunk: "None" - type: "1000T" + type: "1000Base SFP"