On Fri, Aug 29, 2025 at 10:43 AM Xavier Simonart <xsimo...@redhat.com>
wrote:
> Multinode tests require more than one ovn-gw.
> create_fake_vm argument list also changed (+mtu) in ovn-fake-multinode v0.2
> (and hence is used in branch-25.03 and upwards).
> However, ovn branch-24.03 still uses ovn-fake-multinode v0.1.
>
> Fixes: 2f5a63d95369 ("multinode tests: Add HA test checking for GARP.")
>
> Signed-off-by: Xavier Simonart <xsimo...@redhat.com>
> ---
> .github/workflows/ovn-fake-multinode-tests.yml | 2 +-
> tests/multinode-macros.at | 6 ++++--
> tests/multinode.at | 8 ++++----
> 3 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/.github/workflows/ovn-fake-multinode-tests.yml
> b/.github/workflows/ovn-fake-multinode-tests.yml
> index 3c6ee16b8..d49004278 100644
> --- a/.github/workflows/ovn-fake-multinode-tests.yml
> +++ b/.github/workflows/ovn-fake-multinode-tests.yml
> @@ -161,7 +161,7 @@ jobs:
>
> - name: Start basic cluster
> run: |
> - sudo -E ./ovn_cluster.sh start
> + sudo -E CHASSIS_COUNT=3 GW_COUNT=3 ./ovn_cluster.sh start
> sudo podman exec -it ovn-central ovn-nbctl show
> sudo podman exec -it ovn-central ovn-appctl -t ovn-northd version
> sudo podman exec -it ovn-chassis-1 ovn-appctl -t ovn-controller
> version
> diff --git a/tests/multinode-macros.at b/tests/multinode-macros.at
> index a37123fbb..2b6fa2030 100644
> --- a/tests/multinode-macros.at
> +++ b/tests/multinode-macros.at
> @@ -50,15 +50,17 @@ check_fake_multinode_setup() {
> check m_as ovn-central ovn-nbctl --wait=sb sync
> AT_CHECK([m_as ovn-chassis-1 ovn-appctl -t ovn-controller version],
> [0], [ignore])
> AT_CHECK([m_as ovn-chassis-2 ovn-appctl -t ovn-controller version],
> [0], [ignore])
> + AT_CHECK([m_as ovn-chassis-3 ovn-appctl -t ovn-controller version],
> [0], [ignore])
> AT_CHECK([m_as ovn-gw-1 ovn-appctl -t ovn-controller version], [0],
> [ignore])
> - AT_CHECK([m_as ovn-gw-1 ovn-appctl -t ovn-controller version], [0],
> [ignore])
> + AT_CHECK([m_as ovn-gw-2 ovn-appctl -t ovn-controller version], [0],
> [ignore])
> + AT_CHECK([m_as ovn-gw-3 ovn-appctl -t ovn-controller version], [0],
> [ignore])
> }
>
> cleanup_multinode_resources() {
> m_as ovn-central rm -f /etc/ovn/ovnnb_db.db
> m_as ovn-central /usr/share/ovn/scripts/ovn-ctl restart_northd
> check m_as ovn-central ovn-nbctl --wait=sb sync
> - for c in ovn-chassis-1 ovn-chassis-2 ovn-gw-1
> + for c in ovn-chassis-1 ovn-chassis-2 ovn-chassis-3 ovn-gw-1 ovn-gw-2
> ovn-gw-3
> do
> m_as $c ovs-vsctl del-br br-int
> m_as $c ip --all netns delete
> diff --git a/tests/multinode.at b/tests/multinode.at
> index 35ff9c4df..6a5123b15 100644
> --- a/tests/multinode.at
> +++ b/tests/multinode.at
> @@ -1471,10 +1471,10 @@ for chassis in ovn-gw-1 ovn-gw-2 ovn-chassis-1
> ovn-chassis-2; do
> on_exit "if test $test_success != 1; then m_as $chassis ovs-vsctl get
> open . external_ids > extids-${chassis}.txt; fi"
> done
>
> -check_fake_multinode_setup_by_nodes 'ovn-chassis-1 ovn-chassis-2 ovn-gw-1
> ovn-gw-2'
> +check_fake_multinode_setup
>
> # Delete the multinode NB and OVS resources before starting the test.
> -cleanup_multinode_resources_by_nodes 'ovn-chassis-1 ovn-chassis-2
> ovn-gw-1 ovn-gw-2'
> +cleanup_multinode_resources
>
> ip_ch1=$(m_as ovn-chassis-1 ip a show dev eth1 | grep "inet " | awk
> '{print $2}'| cut -d '/' -f1)
> ip_gw1=$(m_as ovn-gw-1 ip a show dev eth1 | grep "inet " | awk '{print
> $2}'| cut -d '/' -f1)
> @@ -1537,8 +1537,8 @@ m_as ovn-chassis-2 ovs-vsctl set open .
> external-ids:ovn-bridge-mappings=public:
> m_as ovn-gw-1 ovs-vsctl set open .
> external-ids:ovn-bridge-mappings=public:br-ex
> m_as ovn-gw-2 ovs-vsctl set open .
> external-ids:ovn-bridge-mappings=public:br-ex
>
> -m_as ovn-chassis-1 /data/create_fake_vm.sh inside1 hv1-vif1
> f0:00:c0:a8:01:01 1500 192.168.1.1 24 192.168.1.254 2000::1/64 2000::a
> -m_as ovn-chassis-2 /data/create_fake_vm.sh ext1 ext1 00:00:c0:a8:00:01
> 1500 192.168.0.1 24 192.168.0.254 1000::3/64 1000::a
> +m_as ovn-chassis-1 /data/create_fake_vm.sh inside1 hv1-vif1
> f0:00:c0:a8:01:01 192.168.1.1 24 192.168.1.254 2000::1/64 2000::a
> +m_as ovn-chassis-2 /data/create_fake_vm.sh ext1 ext1 00:00:c0:a8:00:01
> 192.168.0.1 24 192.168.0.254 1000::3/64 1000::a
>
> # There should be one ha_chassis_group with the name "R1_outside"
> m_check_row_count HA_Chassis_Group 1 name=R1_outside
> --
> 2.47.1
>
>
Thank you Xavier,
I went ahead and merged the series into 24.03.
Regards,
Ales
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
