From 711bfbc1baa80fb81ca0b7821336d312bf844dbd Mon Sep 17 00:00:00 2001 From: Daniel Bacher Date: Tue, 3 Nov 2020 16:40:22 +0100 Subject: [PATCH 1/2] adjust get_lldp_neighbors function for compatibility with sgx00 series begin is not available on sgx00 devices Output can contain line breaks in some columns this need to be filtered --- napalm_s350/s350.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/napalm_s350/s350.py b/napalm_s350/s350.py index 5121234..ea7dbff 100644 --- a/napalm_s350/s350.py +++ b/napalm_s350/s350.py @@ -352,19 +352,21 @@ class S350Driver(NetworkDriver): def get_lldp_neighbors(self): """get_lldp_neighbors implementation for s350""" neighbors = {} - output = self._send_command('show lldp neighbors | begin \ \ Port') + output = self._send_command('show lldp neighbors') - for line in output.splitlines()[2:]: + """Output can contain line breaks in some columns this need to be filtered""" + + for line in output.splitlines()[7:]: line_elems = line.split() - local_port = line_elems[0] - remote_port = line_elems[2] - remote_name = line_elems[3] - - neighbors[local_port] = { - 'hostname': remote_name, - 'port': remote_port, - } + if len(line_elems) > 1: + local_port = line_elems[0] + remote_port = line_elems[2] + remote_name = line_elems[3] + neighbors[local_port] = { + 'hostname': remote_name, + 'port': remote_port, + } return neighbors def _get_lldp_line_value(self, line): From e74495ffb994c08f0bde195980c49642d702f5a8 Mon Sep 17 00:00:00 2001 From: Daniel Bacher Date: Tue, 3 Nov 2020 16:55:54 +0100 Subject: [PATCH 2/2] adjust get_ntp_servers function for compatibility with sgx00 series include is not available on sgx00 devices --- napalm_s350/s350.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/napalm_s350/s350.py b/napalm_s350/s350.py index ea7dbff..24603f8 100644 --- a/napalm_s350/s350.py +++ b/napalm_s350/s350.py @@ -445,10 +445,11 @@ class S350Driver(NetworkDriver): def get_ntp_servers(self): """get_ntp_servers implementation for S350""" ntp_servers = {} - output = self._send_command('show sntp status | include Server') + output = self._send_command('show sntp status') for line in output.splitlines(): - ntp_servers[line.split()[2]] = {} + if "Server" in line: + ntp_servers[line.split()[2]] = {} return ntp_servers