Skip to content

Commit d79e6cd

Browse files
almusildceara
authored andcommitted
tests: Make sure the LB redistribute system tests work with DPDK.
The DPDK has a different way of setting up interfaces, it uses a tap interface instead of veth pair. The test was removing the ovs-be0 which is fine for veth pairs, but breaks for DPDK. Change the iface-id instead to keep the interface intact, that will achieve the same result. Fixes: 3c488ba ("northd: Emit per-backend Advertised_Route for LB redistribution.") Signed-off-by: Ales Musil <amusil@redhat.com> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
1 parent 6f955a9 commit d79e6cd

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

tests/system-ovn.at

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23790,9 +23790,9 @@ wait_row_count sb:Advertised_Route 1 ip_prefix='"172.16.1.10"'
2379023790
OVS_WAIT_UNTIL([
2379123791
ip route list vrf ovnvrf1342 | grep -q "blackhole 172.16.1.10"])
2379223792

23793-
# Move the backend to a simulated hv2 by removing the OVS port so hv1
23794-
# drops the claim, then bind be0 to hv2.
23795-
check ovs-vsctl del-port br-int ovs-be0
23793+
# Move the backend to a simulated hv2 by changing the iface-id of the OVS port
23794+
# so hv1 drops the claim, then bind be0 to hv2.
23795+
check ovs-vsctl set Interface ovs-be0 external_ids:iface-id="not-be0"
2379623796
wait_column "" Port_Binding chassis logical_port=be0
2379723797
check ovn-sbctl chassis-add hv2 geneve 169.0.0.2
2379823798
hv2=$(fetch_column Chassis _uuid name=hv2)
@@ -23812,8 +23812,7 @@ wait_row_count sb:Advertised_Route_Status 0 \
2381223812
# Return the backend to hv1.
2381323813
check ovn-sbctl clear Port_Binding be0 chassis
2381423814
check ovn-sbctl destroy Chassis $hv2
23815-
check ovs-vsctl add-port br-int ovs-be0 \
23816-
-- set Interface ovs-be0 external_ids:iface-id=be0
23815+
check ovs-vsctl set Interface ovs-be0 external_ids:iface-id=be0
2381723816
hv1_uuid=$(fetch_column Chassis _uuid name=hv1)
2381823817
wait_row_count Port_Binding 1 logical_port=be0 chassis=$hv1_uuid
2381923818

@@ -23831,7 +23830,7 @@ wait_row_count sb:Advertised_Route_Status 1 \
2383123830
check ovn-nbctl --wait=hv set Logical_Router_Port lr-origin-share \
2383223831
options:dynamic-routing-redistribute-local-only=false
2383323832

23834-
check ovs-vsctl del-port br-int ovs-be0
23833+
check ovs-vsctl set Interface ovs-be0 external_ids:iface-id="not-be0"
2383523834
wait_column "" Port_Binding chassis logical_port=be0
2383623835
check ovn-sbctl chassis-add hv2 geneve 169.0.0.2
2383723836
hv2=$(fetch_column Chassis _uuid name=hv2)

0 commit comments

Comments
 (0)