From 482380e7e1196f4756f14f81d7a9cc9999979805 Mon Sep 17 00:00:00 2001 From: Seb dArgoeuves Date: Mon, 18 May 2026 22:38:47 +0000 Subject: [PATCH 1/2] Use machine_type under vsrx device attribute instead of libvirt template --- netsim/devices/vsrx.yml | 2 ++ netsim/templates/provider/libvirt/vsrx-domain.j2 | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/netsim/devices/vsrx.yml b/netsim/devices/vsrx.yml index 4aedaec5ba..e57dd43a31 100644 --- a/netsim/devices/vsrx.yml +++ b/netsim/devices/vsrx.yml @@ -23,6 +23,8 @@ virtualbox: image: juniper/vsrx3 libvirt: image: juniper/vsrx3 + node: + machine_type: pc-i440fx-6.2 build: https://netlab.tools/labs/vsrx/ create_iso: vsrx create: diff --git a/netsim/templates/provider/libvirt/vsrx-domain.j2 b/netsim/templates/provider/libvirt/vsrx-domain.j2 index 88ed88bc16..164f86662a 100644 --- a/netsim/templates/provider/libvirt/vsrx-domain.j2 +++ b/netsim/templates/provider/libvirt/vsrx-domain.j2 @@ -14,7 +14,6 @@ domain.cpus = 2 domain.memory = 4096 domain.disk_bus = "ide" - domain.machine_type = "pc-i440fx-6.2" {% if "amd" in defaults.processor|lower %} domain.cpu_mode = "custom" {% endif %} From 61f8c63bf88119ee049e5294059511b7e2ffe186 Mon Sep 17 00:00:00 2001 From: Seb dArgoeuves Date: Mon, 18 May 2026 23:21:47 +0000 Subject: [PATCH 2/2] edit input/output after adding libvirt.machine_type for vsrx --- tests/topology/expected/dual-stack.yml | 2 ++ tests/topology/expected/isis-feature-test.yml | 2 ++ tests/topology/expected/ospf.yml | 3 +++ tests/topology/expected/unnumbered.yml | 2 ++ tests/topology/input/ospf.yml | 1 + 5 files changed, 10 insertions(+) diff --git a/tests/topology/expected/dual-stack.yml b/tests/topology/expected/dual-stack.yml index 5397cd6a4a..69a86c0b4d 100644 --- a/tests/topology/expected/dual-stack.yml +++ b/tests/topology/expected/dual-stack.yml @@ -339,6 +339,8 @@ nodes: ipv6: 2001:db8:1::4/64 node: a_eos type: lan + libvirt: + machine_type: pc-i440fx-6.2 loopback: ifindex: 0 ifname: lo0.0 diff --git a/tests/topology/expected/isis-feature-test.yml b/tests/topology/expected/isis-feature-test.yml index f0b49eb0dd..3b43b70cc6 100644 --- a/tests/topology/expected/isis-feature-test.yml +++ b/tests/topology/expected/isis-feature-test.yml @@ -891,6 +891,8 @@ nodes: net: 49.0002.0000.0000.0004.00 system_id: 0000.0000.0004 type: level-2 + libvirt: + machine_type: pc-i440fx-6.2 loopback: ifindex: 0 ifname: lo0.0 diff --git a/tests/topology/expected/ospf.yml b/tests/topology/expected/ospf.yml index 622cf9e267..a3657ab4a9 100644 --- a/tests/topology/expected/ospf.yml +++ b/tests/topology/expected/ospf.yml @@ -813,6 +813,9 @@ nodes: node: a_eos role: external type: lan + libvirt: + _removed_attr: + - machine_type loopback: ifindex: 0 ifname: lo0.0 diff --git a/tests/topology/expected/unnumbered.yml b/tests/topology/expected/unnumbered.yml index 48bc3a4ee8..db539398a5 100644 --- a/tests/topology/expected/unnumbered.yml +++ b/tests/topology/expected/unnumbered.yml @@ -267,6 +267,8 @@ nodes: node: c_nxos role: core type: p2p + libvirt: + machine_type: pc-i440fx-6.2 loopback: ifindex: 0 ifname: lo0.0 diff --git a/tests/topology/input/ospf.yml b/tests/topology/input/ospf.yml index 1655fac4ac..672b5381a7 100644 --- a/tests/topology/input/ospf.yml +++ b/tests/topology/input/ospf.yml @@ -25,6 +25,7 @@ nodes: device: eos - name: j_vsrx device: vsrx + libvirt.machine_type: false links: - c_nxos: