From 3f7a26fd7abbb00758504e7563f28a577c010437 Mon Sep 17 00:00:00 2001 From: Petr Klima Date: Fri, 6 Nov 2020 13:46:19 +0100 Subject: [PATCH] SG500 has diferent field count in 'sh ip int' --- napalm_s350/s350.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/napalm_s350/s350.py b/napalm_s350/s350.py index 97df73f..186c401 100644 --- a/napalm_s350/s350.py +++ b/napalm_s350/s350.py @@ -406,12 +406,8 @@ class S350Driver(NetworkDriver): line_elems = self._get_ip_int_line_to_fields(line, fields_end) # only valid interfaces - # v 2.x firmware - if 7 in line_elems.keys(): - if line_elems[7] != 'Valid': - continue - # v 1.x firmware - elif line_elems[5] != 'Valid': + # in diferent firmwares there is 'Status' field allwais on last place + if line_elems[len(line_elems) -1] != 'Valid': continue cidr = line_elems[0] @@ -444,7 +440,7 @@ class S350Driver(NetworkDriver): def _get_ip_int_fields_end(self, dashline): """ fields length are diferent device to device, detect them on horizontal lin """ - fields_end = [m.start() for m in re.finditer(' ', dashline)] + fields_end = [m.start() for m in re.finditer(' ', dashline.strip())] # fields_position.insert(0,0) fields_end.append(len(dashline))