From a4a0645f27b91ba26efac44c4af2c62c468286bc Mon Sep 17 00:00:00 2001 From: Marcus Hoff Date: Sun, 18 Oct 2020 14:22:50 +0200 Subject: [PATCH 1/2] Update serial_number and model Updated the match pattern of serial_number and model to the current 1.2/1.3 release of Vyos, maintained code for older versions --- napalm_vyos/vyos.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/napalm_vyos/vyos.py b/napalm_vyos/vyos.py index ddddf06..b2b441f 100644 --- a/napalm_vyos/vyos.py +++ b/napalm_vyos/vyos.py @@ -698,10 +698,15 @@ class VyOSDriver(NetworkDriver): ver_str = [line for line in output if "Version" in line][0] version = self.parse_version(ver_str) - sn_str = [line for line in output if "S/N" in line][0] - snumber = self.parse_snumber(sn_str) + above_1_1 = True if version.startswith('1.0') or version.startswith(1.1) else False + if above_1_1: + sn_str = [line for line in output if "Hardware S/N" in line][0] + hwmodel_str = [line for line in output if "Hardware model" in line][0] + else: + sn_str = [line for line in output if "S/N" in line][0] + hwmodel_str = [line for line in output if "HW model" in line][0] - hwmodel_str = [line for line in output if "HW model" in line][0] + snumber = self.parse_snumber(sn_str) hwmodel = self.parse_hwmodel(hwmodel_str) output = self.device.send_command("show configuration") From a205b99ca587d852b0fc024b64ca33e482c4ee49 Mon Sep 17 00:00:00 2001 From: Marcus Hoff Date: Sun, 18 Oct 2020 15:06:58 +0200 Subject: [PATCH 2/2] Update serial_number and model Fixes my bugs --- napalm_vyos/vyos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/napalm_vyos/vyos.py b/napalm_vyos/vyos.py index b2b441f..63cf313 100644 --- a/napalm_vyos/vyos.py +++ b/napalm_vyos/vyos.py @@ -698,7 +698,7 @@ class VyOSDriver(NetworkDriver): ver_str = [line for line in output if "Version" in line][0] version = self.parse_version(ver_str) - above_1_1 = True if version.startswith('1.0') or version.startswith(1.1) else False + above_1_1 = False if version.startswith('1.0') or version.startswith('1.1') else True if above_1_1: sn_str = [line for line in output if "Hardware S/N" in line][0] hwmodel_str = [line for line in output if "Hardware model" in line][0]