From: Jordan Augé Date: Thu, 12 Oct 2017 07:44:33 +0000 (+0200) Subject: Fixed interface name parsing for vpp monitoring to allow for VLANs X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F8771%2F1;p=cicn.git Fixed interface name parsing for vpp monitoring to allow for VLANs Change-Id: I4a9408783d7cf87511fa941ed0318122f53fab26 Signed-off-by: Jordan Augé --- 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')) + \