From 2501ed725001a091df4a8d7123d87baf2f04dd3b Mon Sep 17 00:00:00 2001
From: targuan <targuan@gmail.com>
Date: Wed, 9 Oct 2019 18:02:57 +0000
Subject: [PATCH] Fix #460 Disabled port where not matched Name starting or
 ending with word character where not matched

---
 .../arista_eos_show_interfaces_status.template   |  4 ++--
 .../arista_eos_show_interfaces_status.parsed     | 16 ++++++++++++++++
 .../arista_eos_show_interfaces_status.raw        |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/templates/arista_eos_show_interfaces_status.template b/templates/arista_eos_show_interfaces_status.template
index ffb37b7067..cbbcc7b8b2 100644
--- 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
index 2fe3335d97..4f83ab4e8a 100644
--- 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
index ca2c819936..2a28b3af8b 100644
--- 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