From 3d0d03cf04898407a0b3be6df0e1c053f265c66c Mon Sep 17 00:00:00 2001 From: Ivan Pepelnjak Date: Tue, 10 Dec 2024 16:08:00 +0100 Subject: [PATCH] Release 1.9.2-post1 --- docs/caveats.md | 6 ++++-- docs/release.md | 4 ++++ docs/release/1.9.md | 5 +++++ legacy/setup.py | 2 +- netsim/__init__.py | 2 +- netsim/templates/tests/libvirt.yml | 5 ++--- netsim/templates/tests/virtualbox.yml | 6 ++---- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/docs/caveats.md b/docs/caveats.md index 4e80cc76d..351456d58 100644 --- a/docs/caveats.md +++ b/docs/caveats.md @@ -187,6 +187,7 @@ ansible-galaxy collection install git+https://github.com/jmussmann/ansible_colle ## Cumulus Linux * The Cumulus VX 4.4.0 Vagrant box for VirtualBox is broken. *netlab* is using Cumulus VX 4.3.0 with *virtualbox* virtualization provider. +* The Cumulus VX 4.x uses Python version 3.7, which recent versions of Ansible refuse to work with. The permanent fix is coming in release 1.9.3. Until then, use the **frrouting** device or [Cumulus VX 5.x image](caveats-cumulus-5x). _netlab_ uses the VLAN-aware bridge paradigm to configure VLANs on Cumulus Linux. That decision results in the following restrictions: @@ -209,10 +210,11 @@ You could configure Cumulus Linux 5.0 with configuration templates developed for NVUE has several shortcomings that prevent *netlab* from configuring basic designs like IBGP on top of IGP. Don't be surprised if the labs that work with **cumulus** device don't work with **cumulus_nvue** device, and please create a GitHub issue whenever you find a glitch. We'd love to know (at least) what doesn't work as expected. -To run Cumulus Linux 5.x with **cumulus** device type, add the following lines to your lab topology[^DD]: +(caveats-cumulus-5x)= +To run Cumulus Linux 5.x with **cumulus** device type, set the following default values in [lab topology](defaults-topology) or one of the [defaults files](defaults-user-file): ``` -defaults.devices.cumulus.libvirt.image: CumulusCommunity/cumulus-vx:5.2.0 +defaults.devices.cumulus.libvirt.image: CumulusCommunity/cumulus-vx:5.10.0 defaults.devices.cumulus.libvirt.memory: 2048 ``` diff --git a/docs/release.md b/docs/release.md index 6a010afa3..dbcfe1d32 100644 --- a/docs/release.md +++ b/docs/release.md @@ -1,6 +1,10 @@ Release Notes ============= +**Release 1.9.2-post1 (2024-12-10)** + +This release [fixes an annoying bug](bug-fixes-1.9.2-post1) affecting users of Ansible 11.x. + **[Release 1.9.2](release-1.9.2) (2024-11-03)** * [](module-stp) diff --git a/docs/release/1.9.md b/docs/release/1.9.md index aa43f938a..4fbe27a83 100644 --- a/docs/release/1.9.md +++ b/docs/release/1.9.md @@ -341,6 +341,11 @@ VyOS: ## Bug Fixes +(bug-fixes-1.9.2-post1)= +### Bug Fixes in Release 1.9.2-post1 + +* Use Linux (not Cumulus VX 4.x) in the Libvirt and Virtualbox tests executed by **netlab test**. Cumulus VX 4.x does not work with recent versions of Ansible due to a large mismatch in Python versions. + (bug-fixes-1.9.2)= ### Bug Fixes in Release 1.9.2 diff --git a/legacy/setup.py b/legacy/setup.py index 20c8900fc..83fa23f23 100644 --- a/legacy/setup.py +++ b/legacy/setup.py @@ -5,7 +5,7 @@ sys.path.append('..') -version="1.9.2" +version="1.9.2-post1" long_description = (Path(__file__).parent / "README.md").read_text() diff --git a/netsim/__init__.py b/netsim/__init__.py index f1c82169b..26f623b11 100755 --- a/netsim/__init__.py +++ b/netsim/__init__.py @@ -2,7 +2,7 @@ import sys -__version__ = "1.9.2" +__version__ = "1.9.2-post1" abort = False diff --git a/netsim/templates/tests/libvirt.yml b/netsim/templates/tests/libvirt.yml index b718171ab..ee50fd0bb 100644 --- a/netsim/templates/tests/libvirt.yml +++ b/netsim/templates/tests/libvirt.yml @@ -3,10 +3,9 @@ # --- defaults: - device: cumulus + device: linux provider: libvirt -module: [ ospf ] nodes: [ s1, s2, s3 ] -links: [ s1-s2, s2-s3, s1-s2-s3 ] +links: [ s1-s2, s1-s2-s3 ] diff --git a/netsim/templates/tests/virtualbox.yml b/netsim/templates/tests/virtualbox.yml index 7c32d57d3..65b100337 100644 --- a/netsim/templates/tests/virtualbox.yml +++ b/netsim/templates/tests/virtualbox.yml @@ -3,11 +3,9 @@ # --- defaults: - device: cumulus + device: linux provider: virtualbox -module: [ ospf ] - nodes: [ s1, s2, s3 ] -links: [ s1-s2, s2-s3, s1-s2-s3 ] +links: [ s1-s2, s1-s2-s3 ]