From ed010d625927ab3c6f876ab965b1b3903c04ee38 Mon Sep 17 00:00:00 2001 From: xiaweijiang Date: Wed, 25 Mar 2026 23:32:56 +0000 Subject: [PATCH 1/3] Use converged topo in KVM to save PR test CPU Signed-off-by: xiaweijiang --- ansible/vtestbed.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/ansible/vtestbed.yaml b/ansible/vtestbed.yaml index 21a94f60d3b..7f78d432e95 100644 --- a/ansible/vtestbed.yaml +++ b/ansible/vtestbed.yaml @@ -14,6 +14,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t0-csonic group-name: vms6-1 @@ -29,6 +30,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests cSONiC virtual switch VMs without PortChannels + use_converged_peers: true - conf-name: vms-kvm-t0-64 group-name: vms6-1 @@ -44,6 +46,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t0-64-32 group-name: vms6-1 @@ -59,6 +62,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t1-lag group-name: vms6-2 @@ -74,6 +78,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t0-2 group-name: vms6-3 @@ -89,6 +94,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-dual-t0 group-name: vms6-4 @@ -105,6 +111,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Dual-TOR testbed + use_converged_peers: true - conf-name: vms-kvm-multi-asic-t1-lag group-name: vms6-4 @@ -120,6 +127,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests multi-asic virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-four-asic-t1-lag group-name: vms6-4 @@ -135,6 +143,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests multi-asic virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t2 group-name: vms6-4-m @@ -152,6 +161,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: T2 Virtual chassis with Multi-ASIC LCs + use_converged_peers: true - conf-name: vms-kvm-t0-3 group-name: vms6-6 @@ -167,6 +177,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t0-4 group-name: vms6-7 @@ -182,6 +193,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-dual-mixed group-name: vms6-8 @@ -199,6 +211,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Dual-TOR-Mixed testbed + use_converged_peers: true - conf-name: 8000e-t0 group-name: vms8-1 @@ -214,6 +227,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests 8000e sonic device + use_converged_peers: true - conf-name: 8000e-t1 group-name: vms8-1 @@ -229,6 +243,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests 8000e sonic device + use_converged_peers: true - conf-name: vms-kvm-wan-pub group-name: vms6-1 @@ -244,6 +259,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-4link group-name: vms6-1 @@ -259,6 +275,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-pub-cisco group-name: vms6-1 @@ -274,6 +291,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-2dut group-name: vms6-1 @@ -290,6 +308,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-3link-tg group-name: vms6-1 @@ -305,6 +324,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-ecmp group-name: vms6-1 @@ -321,6 +341,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-pub-isis group-name: vms6-1 @@ -336,6 +357,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-dpu group-name: vms6-1 @@ -351,6 +373,7 @@ inv_name: veos_vtb auto_recover: False comment: Tests virtual switch vm as DPU + use_converged_peers: true - conf-name: vms-kvm-t1 group-name: vms6-2 @@ -366,6 +389,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-m1 group-name: vms6-2 @@ -381,6 +405,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-c0 group-name: vms6-2 @@ -396,6 +421,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-c0-lo group-name: vms6-2 @@ -411,6 +437,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-ciscovs-7nodes @@ -427,6 +454,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual cisco vs vm with 7 nodes + use_converged_peers: true - conf-name: vms-kvm-ciscovs-5nodes group-name: vms9-1 @@ -442,6 +470,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual cisco vs vm with 5 nodes + use_converged_peers: true - conf-name: vms-kvm-t1-smartswitch group-name: vms6-1 @@ -457,6 +486,7 @@ inv_name: veos_vtb auto_recover: False comment: Tests virtual switch vm with a DPU + use_converged_peers: true - conf-name: vms-kvm-t1-smartswitch-ha group-name: vms6-1 @@ -473,6 +503,7 @@ inv_name: veos_vtb auto_recover: False comment: Tests t1-smartswitch-ha topo deployment with VMs + use_converged_peers: true - conf-name: vms-kvm-force10-7nodes group-name: vms9-2 @@ -488,6 +519,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual force vs vm with 7 nodes + use_converged_peers: true - conf-name: vms-kvm-vpp-t1-lag group-name: vms6-2 @@ -503,6 +535,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm + use_converged_peers: true - conf-name: vms-kvm-vpp-t1 group-name: vms6-2 @@ -518,6 +551,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm + use_converged_peers: true - conf-name: vms-kvm-vpp-t0 group-name: vms6-3 @@ -533,3 +567,4 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm + use_converged_peers: true From d168b9c14623fac33a0e1afe6969b133fc72d406 Mon Sep 17 00:00:00 2001 From: Xiawei Jiang Date: Fri, 27 Mar 2026 15:26:10 +1100 Subject: [PATCH 2/3] Fix converged topology support for KVM PR tests 1. testbed.py: Run ceos_topo_converger at parse time when use_converged_peers is enabled and the topology YAML has not been pre-converged. This ensures the test fixtures see the converged topology (topo_is_multi_vrf, convergence_data) even when the on-disk YAML was not modified by an earlier add-topo step. 2. vtestbed.yaml: Only enable use_converged_peers for t0 KVM testbeds. Non-t0 topologies (t1-lag, t2, dualtor, etc.) exceed the KVM per-VM VLAN limit (NUM_FP_VLANS_PER_FP=4) when all VMs of the same role are consolidated into one prime device. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ansible/vtestbed.yaml | 29 ----------------------------- tests/common/testbed.py | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/ansible/vtestbed.yaml b/ansible/vtestbed.yaml index 7f78d432e95..cfb434be1cf 100644 --- a/ansible/vtestbed.yaml +++ b/ansible/vtestbed.yaml @@ -46,7 +46,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-t0-64-32 group-name: vms6-1 @@ -62,7 +61,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-t1-lag group-name: vms6-2 @@ -78,7 +76,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-t0-2 group-name: vms6-3 @@ -111,7 +108,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Dual-TOR testbed - use_converged_peers: true - conf-name: vms-kvm-multi-asic-t1-lag group-name: vms6-4 @@ -127,7 +123,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests multi-asic virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-four-asic-t1-lag group-name: vms6-4 @@ -143,7 +138,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests multi-asic virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-t2 group-name: vms6-4-m @@ -161,7 +155,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: T2 Virtual chassis with Multi-ASIC LCs - use_converged_peers: true - conf-name: vms-kvm-t0-3 group-name: vms6-6 @@ -211,7 +204,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Dual-TOR-Mixed testbed - use_converged_peers: true - conf-name: 8000e-t0 group-name: vms8-1 @@ -243,7 +235,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests 8000e sonic device - use_converged_peers: true - conf-name: vms-kvm-wan-pub group-name: vms6-1 @@ -259,7 +250,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-wan-4link group-name: vms6-1 @@ -275,7 +265,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-wan-pub-cisco group-name: vms6-1 @@ -291,7 +280,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-wan-2dut group-name: vms6-1 @@ -308,7 +296,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-wan-3link-tg group-name: vms6-1 @@ -324,7 +311,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-wan-ecmp group-name: vms6-1 @@ -341,7 +327,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-wan-pub-isis group-name: vms6-1 @@ -357,7 +342,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-dpu group-name: vms6-1 @@ -373,7 +357,6 @@ inv_name: veos_vtb auto_recover: False comment: Tests virtual switch vm as DPU - use_converged_peers: true - conf-name: vms-kvm-t1 group-name: vms6-2 @@ -389,7 +372,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-m1 group-name: vms6-2 @@ -405,7 +387,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-c0 group-name: vms6-2 @@ -421,7 +402,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-c0-lo group-name: vms6-2 @@ -437,7 +417,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm - use_converged_peers: true - conf-name: vms-kvm-ciscovs-7nodes @@ -454,7 +433,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual cisco vs vm with 7 nodes - use_converged_peers: true - conf-name: vms-kvm-ciscovs-5nodes group-name: vms9-1 @@ -470,7 +448,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual cisco vs vm with 5 nodes - use_converged_peers: true - conf-name: vms-kvm-t1-smartswitch group-name: vms6-1 @@ -486,7 +463,6 @@ inv_name: veos_vtb auto_recover: False comment: Tests virtual switch vm with a DPU - use_converged_peers: true - conf-name: vms-kvm-t1-smartswitch-ha group-name: vms6-1 @@ -503,7 +479,6 @@ inv_name: veos_vtb auto_recover: False comment: Tests t1-smartswitch-ha topo deployment with VMs - use_converged_peers: true - conf-name: vms-kvm-force10-7nodes group-name: vms9-2 @@ -519,7 +494,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual force vs vm with 7 nodes - use_converged_peers: true - conf-name: vms-kvm-vpp-t1-lag group-name: vms6-2 @@ -535,7 +509,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm - use_converged_peers: true - conf-name: vms-kvm-vpp-t1 group-name: vms6-2 @@ -551,7 +524,6 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm - use_converged_peers: true - conf-name: vms-kvm-vpp-t0 group-name: vms6-3 @@ -567,4 +539,3 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm - use_converged_peers: true diff --git a/tests/common/testbed.py b/tests/common/testbed.py index ad01b7c41d6..f27dc2b1208 100644 --- a/tests/common/testbed.py +++ b/tests/common/testbed.py @@ -8,6 +8,7 @@ import json import os import re +import sys import yaml import logging @@ -377,6 +378,27 @@ def calculate_ptf_dut_intf_map(self, tb): map[str(ptf_port_index)][dut_index] = int(dut_port_index) return map + @staticmethod + def _converge_topology(topo_definition): + """Converge topology in-memory when use_converged_peers is enabled. + + This runs the ceos_topo_converger to consolidate multiple VMs of the + same role into fewer prime devices using multi-VRF. It is needed so + that the test fixtures see the converged topology even when the + on-disk YAML file has not been pre-converged (e.g. fresh git checkout + used only for the test run). + """ + ansible_dir = os.path.normpath( + os.path.join(os.path.dirname(__file__), "../../ansible")) + if ansible_dir not in sys.path: + sys.path.insert(0, ansible_dir) + from ceos_topo_converger import SonicTopoConverger # noqa: E402 + + converger = SonicTopoConverger(topo_definition, os.devnull) + converger.parse_properties() + converger.converge_topo() + return converger.converged_topo + def parse_topo(self): for tb_name, tb in list(self.testbed_topo.items()): topo = tb.pop("topo") @@ -393,7 +415,18 @@ def parse_topo(self): topo_dir = os.path.join(os.path.dirname(__file__), self.TOPOLOGY_FILEPATH) topo_file = os.path.join(topo_dir, "topo_{}.yml".format(topo)) with open(topo_file, 'r') as fh: - tb['topo']['properties'] = yaml.safe_load(fh) + topo_definition = yaml.safe_load(fh) + + use_converged = tb.get('use_converged_peers', False) + already_converged = topo_definition.get('topo_is_multi_vrf', False) + if use_converged and not already_converged: + try: + topo_definition = self._converge_topology(topo_definition) + logger.info("Converged topology for testbed %s", tb_name) + except Exception as e: + logger.warning("Failed to converge topology for %s: %s", tb_name, e) + + tb['topo']['properties'] = topo_definition tb['topo']['ptf_map'] = self.calculate_ptf_index_map(tb) tb['topo']['ptf_map_disabled'] = self.calculate_ptf_index_map_disabled(tb) tb['topo']['ptf_dut_intf_map'] = self.calculate_ptf_dut_intf_map(tb) From 315ccc4b97aa496d8ee8696667de27dc2f960572 Mon Sep 17 00:00:00 2001 From: Xiawei Jiang Date: Fri, 27 Mar 2026 16:49:31 +1100 Subject: [PATCH 3/3] Enable converged topology for all KVM topologies ceos_topo_converger now computes max_fp_num based on the actual maximum VLAN count across prime VMs, so enough OVS bridges are created. The computed value is written to the topology YAML and picked up by include_vars (overriding the default max_fp_num=4 from group_vars). This is equivalent to passing -e max_fp_num= on the CLI, but computed automatically. Also restores use_converged_peers for all KVM testbed entries. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ansible/ceos_topo_converger.py | 6 ++++++ ansible/vtestbed.yaml | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/ansible/ceos_topo_converger.py b/ansible/ceos_topo_converger.py index a49078b3bb5..cb0497571c7 100644 --- a/ansible/ceos_topo_converger.py +++ b/ansible/ceos_topo_converger.py @@ -241,6 +241,12 @@ def converge_topo(self) -> None: vms = self.converge_vms() new_topo[key] = vms + # Compute max_fp_num needed for the converged topology so that + # enough OVS bridges are created per prime VM. + max_vlans = max((len(v["vlans"]) for v in vms.values()), default=0) + if max_vlans > 0: + self.converged_topo["max_fp_num"] = max_vlans + # The DUT configuration and general configuration properties should be # unchanged as well. key = "DUT" diff --git a/ansible/vtestbed.yaml b/ansible/vtestbed.yaml index cfb434be1cf..7f78d432e95 100644 --- a/ansible/vtestbed.yaml +++ b/ansible/vtestbed.yaml @@ -46,6 +46,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t0-64-32 group-name: vms6-1 @@ -61,6 +62,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t1-lag group-name: vms6-2 @@ -76,6 +78,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t0-2 group-name: vms6-3 @@ -108,6 +111,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Dual-TOR testbed + use_converged_peers: true - conf-name: vms-kvm-multi-asic-t1-lag group-name: vms6-4 @@ -123,6 +127,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests multi-asic virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-four-asic-t1-lag group-name: vms6-4 @@ -138,6 +143,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests multi-asic virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-t2 group-name: vms6-4-m @@ -155,6 +161,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: T2 Virtual chassis with Multi-ASIC LCs + use_converged_peers: true - conf-name: vms-kvm-t0-3 group-name: vms6-6 @@ -204,6 +211,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Dual-TOR-Mixed testbed + use_converged_peers: true - conf-name: 8000e-t0 group-name: vms8-1 @@ -235,6 +243,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests 8000e sonic device + use_converged_peers: true - conf-name: vms-kvm-wan-pub group-name: vms6-1 @@ -250,6 +259,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-4link group-name: vms6-1 @@ -265,6 +275,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-pub-cisco group-name: vms6-1 @@ -280,6 +291,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-2dut group-name: vms6-1 @@ -296,6 +308,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-3link-tg group-name: vms6-1 @@ -311,6 +324,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-ecmp group-name: vms6-1 @@ -327,6 +341,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-wan-pub-isis group-name: vms6-1 @@ -342,6 +357,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-dpu group-name: vms6-1 @@ -357,6 +373,7 @@ inv_name: veos_vtb auto_recover: False comment: Tests virtual switch vm as DPU + use_converged_peers: true - conf-name: vms-kvm-t1 group-name: vms6-2 @@ -372,6 +389,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-m1 group-name: vms6-2 @@ -387,6 +405,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-c0 group-name: vms6-2 @@ -402,6 +421,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-c0-lo group-name: vms6-2 @@ -417,6 +437,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual switch vm + use_converged_peers: true - conf-name: vms-kvm-ciscovs-7nodes @@ -433,6 +454,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual cisco vs vm with 7 nodes + use_converged_peers: true - conf-name: vms-kvm-ciscovs-5nodes group-name: vms9-1 @@ -448,6 +470,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual cisco vs vm with 5 nodes + use_converged_peers: true - conf-name: vms-kvm-t1-smartswitch group-name: vms6-1 @@ -463,6 +486,7 @@ inv_name: veos_vtb auto_recover: False comment: Tests virtual switch vm with a DPU + use_converged_peers: true - conf-name: vms-kvm-t1-smartswitch-ha group-name: vms6-1 @@ -479,6 +503,7 @@ inv_name: veos_vtb auto_recover: False comment: Tests t1-smartswitch-ha topo deployment with VMs + use_converged_peers: true - conf-name: vms-kvm-force10-7nodes group-name: vms9-2 @@ -494,6 +519,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual force vs vm with 7 nodes + use_converged_peers: true - conf-name: vms-kvm-vpp-t1-lag group-name: vms6-2 @@ -509,6 +535,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm + use_converged_peers: true - conf-name: vms-kvm-vpp-t1 group-name: vms6-2 @@ -524,6 +551,7 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm + use_converged_peers: true - conf-name: vms-kvm-vpp-t0 group-name: vms6-3 @@ -539,3 +567,4 @@ inv_name: veos_vtb auto_recover: 'False' comment: Tests virtual vpp switch vm + use_converged_peers: true