summaryrefslogtreecommitdiff
path: root/plugins/cliconf
diff options
context:
space:
mode:
authorGaige B Paulsen <gaige@cluetrust.net>2024-11-09 21:43:44 -0500
committerGitHub <noreply@github.com>2024-11-10 03:43:44 +0100
commita7ac0fd5ceb993a8fbb256a3fd91d0d6c6531887 (patch)
tree850997ce4b0543223854a8781d340cf51d2ff468 /plugins/cliconf
parent5ae977293c5ddcad6e0cbdcf380c9a99be3bb3b9 (diff)
downloadvyos.vyos-a7ac0fd5ceb993a8fbb256a3fd91d0d6c6531887.tar.gz
vyos.vyos-a7ac0fd5ceb993a8fbb256a3fd91d0d6c6531887.zip
T6815:Fix compatibility with 1.3-1.5 of VyOS (Step 1) (#352)
* omnibus update for 1.3-1.4 (with some support for 1.5) (see contents in release fragments) --------- Co-authored-by: Om Nom <omnom62@outlook.com>
Diffstat (limited to 'plugins/cliconf')
-rw-r--r--plugins/cliconf/vyos.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/cliconf/vyos.py b/plugins/cliconf/vyos.py
index 7e6b0b17..5beffaa1 100644
--- a/plugins/cliconf/vyos.py
+++ b/plugins/cliconf/vyos.py
@@ -80,6 +80,11 @@ class Cliconf(CliconfBase):
if match:
device_info["network_os_version"] = match.group(1)
+ if device_info["network_os_version"]:
+ match = re.search(r"VyOS\s*(\d+\.\d+)", device_info["network_os_version"])
+ if match:
+ device_info["network_os_major_version"] = match.group(1)
+
match = re.search(r"(?:HW|Hardware) model:\s*(\S+)", data)
if match:
device_info["network_os_model"] = match.group(1)