From 0cb23fa5de49e89d18393a01a9cf69311eeea986 Mon Sep 17 00:00:00 2001 From: Petr Klima Date: Tue, 3 Nov 2020 15:33:57 +0100 Subject: [PATCH] show_lldp_neighbors with long systemname test for SG350X-48P --- napalm_s350/s350.py | 17 +++++++++++--- ...how_lldp_neighbors.txt.long_systemname.txt | 15 +++++++++++++ .../expected_result.json | 22 +++++++++++++++++++ .../show_lldp_neighbors.txt | 15 +++++++++++++ 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 test/unit/mocked_data/SG350X-48P-K9/show_lldp_neighbors.txt.long_systemname.txt create mode 100644 test/unit/mocked_data/test_get_lldp_neighbors/SG350X-48P-K9-long_systemname/expected_result.json create mode 100644 test/unit/mocked_data/test_get_lldp_neighbors/SG350X-48P-K9-long_systemname/show_lldp_neighbors.txt diff --git a/napalm_s350/s350.py b/napalm_s350/s350.py index 66511b7..84b8015 100644 --- a/napalm_s350/s350.py +++ b/napalm_s350/s350.py @@ -370,6 +370,10 @@ class S350Driver(NetworkDriver): output = self._send_command('show lldp neighbors') header = True # cycle trought header + # keep previous context - multiline syname + local_port = '' + remote_port = '' + remote_name = '' for line in output.splitlines(): if header: # last line of header @@ -379,9 +383,16 @@ class S350Driver(NetworkDriver): continue line_elems = line.split() - local_port = line_elems[0] - remote_port = line_elems[2] - remote_name = line_elems[3] + + # long system name owerflow to the other line + if len(line_elems) == 1: + # complete remote name + remote_name = remote_name + line_elems[0] + # then reuse old values na rewrite previous entry + else: + local_port = line_elems[0] + remote_port = line_elems[2] + remote_name = line_elems[3] neighbor = { 'hostname': remote_name, diff --git a/test/unit/mocked_data/SG350X-48P-K9/show_lldp_neighbors.txt.long_systemname.txt b/test/unit/mocked_data/SG350X-48P-K9/show_lldp_neighbors.txt.long_systemname.txt new file mode 100644 index 0000000..9392fca --- /dev/null +++ b/test/unit/mocked_data/SG350X-48P-K9/show_lldp_neighbors.txt.long_systemname.txt @@ -0,0 +1,15 @@ + +System capability legend: +B - Bridge; R - Router; W - Wlan Access Point; T - telephone; +D - DOCSIS Cable Device; H - Host; r - Repeater; +TP - Two Ports MAC Relay; S - S-VLAN; C - C-VLAN; O - Other + + Port Device ID Port ID System Name Capabilities TTL +--------- ----------------- ----------------- ----------------- ------------ ----- +gi1/0/1 74:ac:aa:ff:1a:5f 74:ac:aa:ff:1a:5f UBNT B, W 90 +gi1/0/35 34:e6:aa:ff:53:a8 34:e6:aa:ff:53:a8 O 3119 +te1/0/1 00:16:ff:aa:bb:00 Gi0/23 swzdsadas-vedc B 107 +te1/0/3 00:8e:ff:aa:bb:e2 gi28 sw1dsafdsfsdf.ex B, R 95 + ample.net +te1/0/4 sw2dsdfssddfd te1/0/4 sw2dsdfssddfd B, R 105 + diff --git a/test/unit/mocked_data/test_get_lldp_neighbors/SG350X-48P-K9-long_systemname/expected_result.json b/test/unit/mocked_data/test_get_lldp_neighbors/SG350X-48P-K9-long_systemname/expected_result.json new file mode 100644 index 0000000..942f033 --- /dev/null +++ b/test/unit/mocked_data/test_get_lldp_neighbors/SG350X-48P-K9-long_systemname/expected_result.json @@ -0,0 +1,22 @@ +{ + "gi1/0/1" : [ { + "hostname" : "UBNT", + "port" : "74:ac:aa:ff:1a:5f" + } ], + "gi1/0/35" : [ { + "hostname" : "O", + "port" : "34:e6:aa:ff:53:a8" + } ], + "te1/0/1" : [ { + "hostname" : "swzdsadas-vedc", + "port" : "Gi0/23" + } ], + "te1/0/3" : [ { + "hostname" : "sw1dsafdsfsdf.example.net", + "port" : "gi28" + } ], + "te1/0/4" : [ { + "hostname" : "sw2dsdfssddfd", + "port" : "te1/0/4" + } ] +} diff --git a/test/unit/mocked_data/test_get_lldp_neighbors/SG350X-48P-K9-long_systemname/show_lldp_neighbors.txt b/test/unit/mocked_data/test_get_lldp_neighbors/SG350X-48P-K9-long_systemname/show_lldp_neighbors.txt new file mode 100644 index 0000000..9392fca --- /dev/null +++ b/test/unit/mocked_data/test_get_lldp_neighbors/SG350X-48P-K9-long_systemname/show_lldp_neighbors.txt @@ -0,0 +1,15 @@ + +System capability legend: +B - Bridge; R - Router; W - Wlan Access Point; T - telephone; +D - DOCSIS Cable Device; H - Host; r - Repeater; +TP - Two Ports MAC Relay; S - S-VLAN; C - C-VLAN; O - Other + + Port Device ID Port ID System Name Capabilities TTL +--------- ----------------- ----------------- ----------------- ------------ ----- +gi1/0/1 74:ac:aa:ff:1a:5f 74:ac:aa:ff:1a:5f UBNT B, W 90 +gi1/0/35 34:e6:aa:ff:53:a8 34:e6:aa:ff:53:a8 O 3119 +te1/0/1 00:16:ff:aa:bb:00 Gi0/23 swzdsadas-vedc B 107 +te1/0/3 00:8e:ff:aa:bb:e2 gi28 sw1dsafdsfsdf.ex B, R 95 + ample.net +te1/0/4 sw2dsdfssddfd te1/0/4 sw2dsdfssddfd B, R 105 +