Fix networktocode#460

Disabled port were not matched Name starting or ending with word character were not matched
targuan · Oct 9, 2019 · 7a97666 · 7a97666
1 parent 8b46dd9
commit 7a97666
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/templates/arista_eos_show_interfaces_status.template b/templates/arista_eos_show_interfaces_status.template
@@ -1,6 +1,6 @@
 Value PORT (\S+)
-Value NAME (\w.*\w)
-Value STATUS (connected|notconnect|inactive|errdisabled)
+Value NAME (\S.*(?<!\s))
+Value STATUS (connected|notconnect|inactive|errdisabled|disabled)
 Value VLAN (\S+)
 Value DUPLEX (\S+)
 Value SPEED (\S+)

diff --git a/tests/arista_eos/show_interfaces_status/arista_eos_show_interfaces_status.parsed b/tests/arista_eos/show_interfaces_status/arista_eos_show_interfaces_status.parsed
@@ -31,3 +31,19 @@ parsed_sample:
   duplex: "a-full"
   speed: "a-10G"
   type: "40GBASE-SR"
+
+- port: "Et3/2/4"
+  name: "- DISABLED routed ("
+  status: "disabled"
+  vlan: "routed"
+  duplex: "a-full"
+  speed: "a-10G"
+  type: "40GBASE-SR"
+
+- port: "Et3/2/5"
+  name: "-"
+  status: "disabled"
+  vlan: "routed"
+  duplex: "a-full"
+  speed: "a-10G"
+  type: "40GBASE-SR"
diff --git a/tests/arista_eos/show_interfaces_status/arista_eos_show_interfaces_status.raw b/tests/arista_eos/show_interfaces_status/arista_eos_show_interfaces_status.raw
@@ -3,3 +3,5 @@ Et3/1/1    I am a 40G port !! Hi  connected    trunk       a-full  a-40G 40GBASE
 Et3/1/4                           inactive     1           unconf unconf 40GBASE-CR4
 Et3/2/1    PORTNAME               notconnect   trunk       a-full  a-10G 40GBASE-SR
 Et3/2/2    I am a 10G port        errdisabled  10          a-full  a-10G 40GBASE-SR
+Et3/2/4    - DISABLED routed (    disabled     routed      a-full  a-10G 40GBASE-SR
+Et3/2/5    -                      disabled     routed      a-full  a-10G 40GBASE-SR