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.09 still uses ovn-fake-multinode v0.1.
Fixes: 02eaf7e710e6 ("controller: Redirect traffic for container port.")
Fixes: a4da73daf19a ("multinode tests: Add HA test checking for GARP.")
Fixes: 71c36f598e29 ("controller: Support migration of container ports.")
Signed-off-by: Xavier Simonart <[email protected]>
---
.../workflows/ovn-fake-multinode-tests.yml | 2 +-
tests/multinode-macros.at | 6 ++++--
tests/multinode.at | 19 +++++++++----------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/ovn-fake-multinode-tests.yml
b/.github/workflows/ovn-fake-multinode-tests.yml
index 70e76275a..d7b81b012 100644
--- a/.github/workflows/ovn-fake-multinode-tests.yml
+++ b/.github/workflows/ovn-fake-multinode-tests.yml
@@ -163,7 +163,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 cb6865b0d..fb970b3c0 100644
--- a/tests/multinode-macros.at
+++ b/tests/multinode-macros.at
@@ -58,15 +58,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 31e7469e4..978a4fe21 100644
--- a/tests/multinode.at
+++ b/tests/multinode.at
@@ -1513,11 +1513,10 @@ AT_SETUP([Migration of container ports])
# setting iface-id on dst resp. before and after requested-chassis.
# Check that ovn-fake-multinode setup is up and running
-# check_fake_multinode_setup
-check_fake_multinode_setup_by_nodes 'ovn-chassis-1 ovn-chassis-2 ovn-chassis-3'
+check_fake_multinode_setup_by_nodes
# Delete the multinode NB and OVS resources before starting the test.
-cleanup_multinode_resources_by_nodes 'ovn-chassis-1 ovn-chassis-2
ovn-chassis-3'
+cleanup_multinode_resources_by_nodes
OVS_WAIT_UNTIL([m_as ovn-chassis-1 ip link show | grep -q genev_sys])
OVS_WAIT_UNTIL([m_as ovn-chassis-2 ip link show | grep -q genev_sys])
@@ -1581,10 +1580,10 @@ done
# Set requested chassis before creating migrator on chassis-3
check multinode_nbctl --wait=hv set Logical_Switch_Port migrator
options:requested-chassis=ovn-chassis-1
-m_as ovn-chassis-1 /data/create_fake_vm.sh migrator migrator 50:54:00:00:00:09
1342 10.0.0.9 24 10.0.0.10 1000::9/64 1000::a
-m_as ovn-chassis-3 /data/create_fake_vm.sh migrator migrator 50:54:00:00:00:09
1342 10.0.0.9 24 10.0.0.10 1000::9/64 1000::a
+m_as ovn-chassis-1 /data/create_fake_vm.sh migrator migrator 50:54:00:00:00:09
10.0.0.9 24 10.0.0.10 1000::9/64 1000::a
+m_as ovn-chassis-3 /data/create_fake_vm.sh migrator migrator 50:54:00:00:00:09
10.0.0.9 24 10.0.0.10 1000::9/64 1000::a
for i in 1 2 3; do
- m_as ovn-chassis-${i} /data/create_fake_vm.sh sw0-port${i} sw0-port${i}
50:54:00:00:00:0${i} 1342 10.0.0.${i} 24 10.0.0.10 1000::${i}/64 1000::a
+ m_as ovn-chassis-${i} /data/create_fake_vm.sh sw0-port${i} sw0-port${i}
50:54:00:00:00:0${i} 10.0.0.${i} 24 10.0.0.10 1000::${i}/64 1000::a
done
m_wait_for_ports_up
@@ -1824,10 +1823,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)
@@ -1890,8 +1889,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
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
