From 593aaf3440b67927bed19d247481a50f95e3b998 Mon Sep 17 00:00:00 2001 From: Jordan Augé Date: Thu, 12 Oct 2017 09:44:33 +0200 Subject: Fixed interface name parsing for vpp monitoring to allow for VLANs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4a9408783d7cf87511fa941ed0318122f53fab26 Signed-off-by: Jordan Augé --- netmodel/interfaces/vpp/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netmodel/interfaces/vpp/__init__.py b/netmodel/interfaces/vpp/__init__.py index b234c0c1..0c3abb9a 100644 --- a/netmodel/interfaces/vpp/__init__.py +++ b/netmodel/interfaces/vpp/__init__.py @@ -47,7 +47,7 @@ def parse(s): header = kw_name + kw_idx + kw_state + kw_counter + kw_count - interface = (pp.Word(pp.alphanums + '/' + '-').setResultsName('device_name') + \ + interface = (pp.Word(pp.alphanums + '/-.').setResultsName('device_name') + \ pp.Word(pp.nums).setResultsName('index') + \ pp.oneOf(['up', 'down']).setResultsName('state') + \ pp.Optional(kw_rx_packets + pp.Word(pp.nums).setResultsName('rx_packets')) + \ -- cgit 1.2.3-korg