On Wed, Jul 2, 2025 at 11:50 AM Xavier Simonart via dev <
ovs-dev@openvswitch.org> wrote:
> Signed-off-by: Xavier Simonart <xsimo...@redhat.com>
> ---
> tests/multinode-macros.at | 27 ++++++++-------------------
> 1 file changed, 8 insertions(+), 19 deletions(-)
>
> diff --git a/tests/multinode-macros.at b/tests/multinode-macros.at
> index c570b8aca..1346f17ce 100644
> --- a/tests/multinode-macros.at
> +++ b/tests/multinode-macros.at
> @@ -71,25 +71,6 @@ m_central_as () {
> podman exec ovn-central-az1 "$@"
> }
>
> -check_fake_multinode_setup() {
> - check m_as ovn-central-az1 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-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])
> -}
> -
> -cleanup_multinode_resources() {
> - m_as ovn-central-az1 rm -f /etc/ovn/ovnnb_db.db
> - m_as ovn-central-az1 /usr/share/ovn/scripts/ovn-ctl restart_northd
> - check m_as ovn-central-az1 ovn-nbctl --wait=sb sync
> - for c in ovn-chassis-1 ovn-chassis-2 ovn-gw-1
> - do
> - m_as $c ovs-vsctl del-br br-int
> - m_as $c ip --all netns delete
> - done
> -}
> -
> multinode_nbctl () {
> m_as ovn-central-az1 ovn-nbctl "$@"
> }
> @@ -106,6 +87,10 @@ check_fake_multinode_setup_by_nodes() {
> done
> }
>
> +check_fake_multinode_setup() {
> + check_fake_multinode_setup_by_nodes 'ovn-chassis-1 ovn-chassis-2
> ovn-gw-1 ovn-gw-2'
> +}
> +
> cleanup_multinode_resources_by_nodes() {
> m_as ovn-central-az1 rm -f /etc/ovn/ovnnb_db.db
> m_as ovn-central-az1 /usr/share/ovn/scripts/ovn-ctl restart_northd
> @@ -117,6 +102,10 @@ cleanup_multinode_resources_by_nodes() {
> done
> }
>
> +cleanup_multinode_resources() {
> + cleanup_multinode_resources_by_nodes 'ovn-chassis-1 ovn-chassis-2
> ovn-gw-1'
> +}
> +
> # multinode_cleanup_northd NODE
> #
> # Removes previously set nothd on specified node
> --
> 2.47.1
>
> _______________________________________________
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
>
Thank you Xavier,
I went ahead and merged this into main and backported to 25.03.
Regards,
Ales
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
