Avoid having to add OVN_FOR_EACH_NORTHD for each test in ovn-northd.at. We know that all tests in there should be run for all types of northd and w/ or w/o parallelization enabled. Just wrap the whole set of tests in a single call to the newly added OVN_FOR_EACH_NORTHD_NO_HV().
This also fixes the fact that some tests were not run for all flavors of northd. There's one small disadvantage with this approach: two instances of the same test in ovn-northd.at will not be consecutive in index anymore, e.g.: 853: LRP same IP as VIP or SNAT -- ovn-northd -- parallelization=yes ok 939: LRP same IP as VIP or SNAT -- ovn-northd -- parallelization=no ok Signed-off-by: Dumitru Ceara <[email protected]> --- tests/ovn-macros.at | 13 +++- tests/ovn-northd.at | 157 +------------------------------------------- 2 files changed, 14 insertions(+), 156 deletions(-) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index a3c7f8125..b234019a9 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -807,14 +807,23 @@ OVS_END_SHELL_HELPERS m4_define([OVN_POPULATE_ARP], [AT_CHECK(ovn_populate_arp__, [0], [ignore])]) -# Defines a versions of a test with all combinations of northd and -# datapath groups. +# Defines versions of the test with all combinations of northd, +# parallelization on/off and conditional monitoring on/off. m4_define([OVN_FOR_EACH_NORTHD], [m4_foreach([NORTHD_TYPE], [ovn-northd], [m4_foreach([NORTHD_USE_PARALLELIZATION], [yes, no], [m4_foreach([OVN_MONITOR_ALL], [yes, no], [$1 ])])])]) +# Defines versions of the test with all combinations of northd and +# parallelization on/off. To be used when the ovn-controller configuration +# is not relevant. +m4_define([OVN_FOR_EACH_NORTHD_NO_HV], + [m4_foreach([NORTHD_TYPE], [ovn-northd], + [m4_foreach([NORTHD_USE_PARALLELIZATION], [yes, no], [$1 +])])]) + + # OVN_NBCTL(NBCTL_COMMAND) adds NBCTL_COMMAND to list of commands to be run by RUN_OVN_NBCTL(). m4_define([OVN_NBCTL], [ command="${command} -- $1" diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index a210fc575..2b87048e8 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -1,6 +1,6 @@ AT_BANNER([OVN northd]) -OVN_FOR_EACH_NORTHD([ +OVN_FOR_EACH_NORTHD_NO_HV([ AT_SETUP([check from NBDB to SBDB]) ovn_start @@ -69,9 +69,7 @@ check_row_count Gateway_Chassis 0 check_row_count Ha_Chassis_Group 0 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check up state of VIF LSP]) ovn_start @@ -84,9 +82,7 @@ ovn-sbctl lsp-bind S1-vm1 hv1 wait_row_count nb:Logical_Switch_Port 1 name=S1-vm1 'up=true' AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check up state of router LSP linked to a distributed LR]) ovn_start @@ -101,9 +97,7 @@ ovn-nbctl --wait=sb lsp-set-options S1-R1 router-port=R1-S1 AT_CHECK([test x`ovn-nbctl lsp-get-up S1-R1` = xup]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check up state of router LSP linked to a gateway LR]) ovn_start @@ -122,9 +116,7 @@ ovn-sbctl lsp-bind S1-R1 gw1 AT_CHECK([test x`ovn-nbctl lsp-get-up S1-R1` = xup]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check up state of router LSP linked to an LRP with set Gateway Chassis]) ovn_start @@ -142,9 +134,7 @@ ovn-nbctl --wait=sb lsp-set-options S1-R1 router-port=R1-S1 AT_CHECK([test x`ovn-nbctl lsp-get-up S1-R1` = xup]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check LRP external id propagation to SBDB]) ovn_start @@ -154,9 +144,7 @@ ovn-nbctl --wait=sb set logical_router_port lrp0 external_ids=test=123 check_column "test=123" sb:Port_Binding external_ids logical_port=lrp0 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check IPv6 RA config propagation to SBDB]) ovn_start @@ -266,9 +254,7 @@ AT_CHECK_UNQUOTED([ovn-sbctl get Port_Binding ${uuid} options:ipv6_ra_prefixes], ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([test unixctl]) ovn_init_db ovn-sb; ovn-sbctl init ovn_init_db ovn-nb; ovn-nbctl init @@ -307,9 +293,7 @@ as northd OVS_APP_EXIT_AND_WAIT([NORTHD_TYPE]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check HA_Chassis_Group propagation from NBDB to SBDB]) ovn_start @@ -658,9 +642,7 @@ as northd OVS_APP_EXIT_AND_WAIT([NORTHD_TYPE]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn-northd pause and resume]) # By starting the backup northd paused, we ensure that the primary # northd is active; otherwise, there's a race. (We also test that @@ -735,9 +717,7 @@ check ovn-nbctl --wait=sb sync check_row_count Datapath_Binding 1 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn-northd restart]) ovn_start --backup-northd=none @@ -762,9 +742,7 @@ ovn_start_northd primary wait_row_count Datapath_Binding 2 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([northbound database reconnection]) ovn_start --backup-northd=none @@ -794,9 +772,7 @@ dp2=$(fetch_column Datapath_Binding _uuid external_ids:name=sw1) wait_column "$dp1 $dp2" Logical_DP_Group datapaths AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([southbound database reconnection]) ovn_start --backup-northd=none @@ -828,9 +804,7 @@ dp2=$(fetch_column Datapath_Binding _uuid external_ids:name=sw1) wait_column "$dp1 $dp2" Logical_DP_Group datapaths AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check Redirect Chassis propagation from NB to SB]) ovn_start @@ -853,9 +827,7 @@ wait_row_count Port_Binding 1 logical_port=cr-R1-S1 options:redirect-type=bridge ovn-nbctl lrp-set-redirect-type R1-S1 overlay wait_row_count Port_Binding 1 logical_port=cr-R1-S1 options:redirect-type=overlay AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check stateless dnat_and_snat rule]) ovn_start @@ -913,9 +885,7 @@ ovn-nbctl --wait=sb --stateless lr-nat-add R1 dnat_and_snat fd01::1 fd11::2 check_flow_match_sets 2 0 0 0 0 1 1 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check portrange dnat, snat and dnat_and_snat rules]) ovn_start @@ -965,9 +935,7 @@ AT_CHECK([grep 'ct_[s]dnat.*172\.16\.1\.2.*3000' sbflows3], [1]) ovn-nbctl lr-nat-del R1 dnat_and_snat 172.16.1.1 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check allowed/disallowed external dnat, snat and dnat_and_snat rules]) ovn_start @@ -1186,9 +1154,7 @@ AT_CHECK([grep -e "lr_out_snat" crflows6 | sed 's/table=../table=??/' | sort], [ ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check Load balancer health check and Service Monitor sync]) ovn_start NORTHD_TYPE check ovn-nbctl lb-add lb1 10.0.0.10:80 10.0.0.3:80,20.0.0.3:80 @@ -1450,9 +1416,7 @@ OVS_WAIT_FOR_OUTPUT( ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([Load balancer VIP in NAT entries]) AT_SKIP_IF([test $HAVE_PYTHON = no]) ovn_start @@ -1525,9 +1489,7 @@ AT_CHECK([grep "lr_in_unsnat" sbflows | sort], [0], [dnl ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([LRP same IP as VIP or SNAT]) ovn_start @@ -1611,9 +1573,7 @@ AT_CHECK([grep "lr_in_ip_input" sbflows | grep 'ip.\.dst == {' | grep drop | sed ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([DNAT force snat IP]) ovn_start @@ -1632,9 +1592,7 @@ AT_CHECK([ovn-sbctl lflow-list lr0 | grep lr_in_unsnat | sort], [0], [dnl ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check reconcile stale Datapath_Binding]) ovn_start @@ -1660,9 +1618,7 @@ echo nb_uuid="$nb_uuid" lr_uuid="$lr_uuid" AT_CHECK([test "${nb_uuid}" = "${lr_uuid}"]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check reconcile stale tunnel keys]) ovn_start @@ -1684,9 +1640,7 @@ check_column 1 Port_Binding tunnel_key logical_port=lsp1 check_column 2 Port_Binding tunnel_key logical_port=lsp2 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check reconcile stale Ha_Chassis_Group]) ovn_start @@ -1712,9 +1666,7 @@ AT_CHECK([ovn-nbctl --wait=sb sync], [0]) check_row_count HA_Chassis_Group 0 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check NB/SB Port_Group translation (lsp add/del)]) ovn_start @@ -1762,9 +1714,7 @@ ovn-nbctl --wait=sb clear Port_Group pg_test ports AT_CHECK([test 0 = $(ovn-sbctl --columns _uuid list Port_Group | grep uuid -c)]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check NB/SB Port_Group translation (ls del)]) ovn_start @@ -1789,9 +1739,7 @@ wait_row_count Port_Group 1 check_row_count Port_Group 1 name=${ls2_key}_pg_test AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check router ARP/NS responder]) ovn_start @@ -2013,7 +1961,6 @@ action=(eth.dst = eth.src; eth.src = 00:00:00:00:00:02; arp.op = 2; /* ARP reply AT_CHECK([ovn-sbctl lflow-list | grep "xreg0\[[0..47\]]" | grep -vE 'lr_in_admission|lr_in_ip_input'], [1], []) AT_CLEANUP -]) # This test case tests that when a logical switch has load balancers associated # (with VIPs configured), the below logical flow is added by ovn-northd. @@ -2027,7 +1974,6 @@ AT_CLEANUP # So make sure that the above lflow is added even if one load balancer has VIP # associated. -OVN_FOR_EACH_NORTHD([ AT_SETUP([Load balancer - missing ls_out_pre_lb flows]) ovn_start @@ -2114,9 +2060,7 @@ AT_CHECK([ovn-sbctl lflow-list | grep "ls_out_pre_lb.*priority=100" | grep reg0 ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ignore_lsp_down]) ovn_start @@ -2131,9 +2075,7 @@ ovn-nbctl --wait=sb set NB_Global . options:ignore_lsp_down=true AT_CHECK([ovn-sbctl lflow-list | grep arp | grep 10\.0\.0\.1], [0], [ignore]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn-northd -- reject ACL]) ovn_start @@ -2204,9 +2146,7 @@ sw1flows3: table=4 (ls_out_acl ), priority=2003 , match=((reg0[[10]] == sw1flows3: table=4 (ls_out_acl ), priority=2003 , match=((reg0[[9]] == 1) && outport == @pg0 && ip6 && udp), action=(reg0 = 0; reject { /* eth.dst <-> eth.src; ip.dst <-> ip.src; is implicit. */ outport <-> inport; next(pipeline=ingress,table=23); };) ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ACL fair Meters]) AT_KEYWORDS([acl log meter fair]) ovn_start @@ -2317,9 +2257,7 @@ check_meter_by_name meter_me meter_me__${acl3} check_meter_by_name NOT meter_me__${acl1} meter_me__${acl2} AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ACL skip hints for stateless config]) AT_KEYWORDS([acl]) ovn_start @@ -2425,9 +2363,7 @@ AT_CHECK([ovn-sbctl lflow-list ls | grep -e ls_in_acl_hint -e ls_out_acl_hint -e AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([datapath requested-tnl-key]) AT_KEYWORDS([requested tnl tunnel key keys]) ovn_start @@ -2473,7 +2409,6 @@ AT_CHECK( get_tunnel_keys AT_CHECK([test $ls2 = 3]) AT_CLEANUP -]) AT_SETUP([LR requested-tnl-key]) ovn_start @@ -2493,7 +2428,6 @@ AT_CHECK( AT_CLEANUP -OVN_FOR_EACH_NORTHD([ AT_SETUP([port requested-tnl-key]) AT_KEYWORDS([requested tnl tunnel key keys]) ovn_start @@ -2550,9 +2484,7 @@ get_tunnel_keys AT_CHECK([test $lsp02 = 3 && test $ls1 = 123]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([NB to SB load balancer sync]) ovn_start @@ -2722,9 +2654,7 @@ echo "__file__:__line__: Delete load balancers lb1 and lbg1 and check that datap ovn-nbctl --wait=sb lb-del lb1 -- lb-del lbg1 check_column "" sb:datapath_binding load_balancers external_ids:name=sw1 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([LS load balancer hairpin logical flows]) ovn_start @@ -2797,9 +2727,7 @@ AT_CHECK([ovn-sbctl lflow-list sw0 | grep ls_in_hairpin | sort | sed 's/table=.. ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([Router policies - ECMP reroute]) AT_KEYWORDS([router policies ecmp reroute]) ovn_start @@ -2930,9 +2858,7 @@ sed 's/reg8\[[0..15\]] == [[0-9]]*/reg8\[[0..15\]] == <cleared>/' | sed 's/table ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ACL allow-stateless omit conntrack - Logical_Switch]) ovn_start @@ -3071,9 +2997,7 @@ ct_lb_mark { ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ACL allow-stateless omit conntrack - Port_Group]) ovn_start @@ -3215,9 +3139,7 @@ ct_lb_mark { ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ACL allow-stateless overrides stateful rules with higher priority - Logical_Switch]) ovn_start @@ -3270,9 +3192,7 @@ output("lsp2"); ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check BFD config propagation to SBDB]) AT_KEYWORDS([northd-bfd]) ovn_start @@ -3343,9 +3263,7 @@ check ovn-sbctl set bfd $bfd2_uuid status=up wait_column up nb:bfd status logical_port=r0-sw2 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- check CoPP config]) AT_KEYWORDS([northd-CoPP]) @@ -3526,7 +3444,6 @@ ls2_copp_uuid=$(ovn-nbctl get Logical_Switch sw2 copp) AT_CHECK([test "$ls2_copp_uuid" = "$copp_uuid"]) AT_CLEANUP -]) AT_SETUP([check LSP attached to multiple LS]) ovn_start @@ -3595,7 +3512,6 @@ wait_row_count nb:Logical_Switch_Port 1 up=false name=lsp1 AT_CLEANUP -OVN_FOR_EACH_NORTHD([ AT_SETUP([Load Balancers and lb_force_snat_ip for Gateway Routers]) ovn_start @@ -3857,7 +3773,6 @@ AT_CHECK([grep "lr_out_post_undnat" lr0flows | sed 's/table=./table=?/' | sort], ]) AT_CLEANUP -]) AT_SETUP([HA chassis group cleanup for external port ]) ovn_start @@ -3899,7 +3814,6 @@ check_column "" Port_Binding chassis logical_port=sw0-p1 AT_CLEANUP -OVN_FOR_EACH_NORTHD([ AT_SETUP([FDB cleanup]) ovn_start @@ -3959,9 +3873,7 @@ wait_row_count FDB 0 ovn-sbctl list FDB AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([LS load balancer logical flows]) ovn_start @@ -4104,9 +4016,7 @@ AT_CHECK([grep "ls_out_stateful" sw0flows | sort], [0], [dnl ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- ACL label usage]) ovn_start @@ -4197,9 +4107,7 @@ AT_CHECK([grep "ls_out_stateful" sw0flows | sort], [0], [dnl table=7 (ls_out_stateful ), priority=100 , match=(reg0[[1]] == 1 && reg0[[13]] == 1), action=(ct_commit { ct_mark.blocked = 0; ct_label.label = reg3; }; next;) ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- ct.inv usage]) ovn_start @@ -4274,9 +4182,7 @@ AT_CHECK([grep -c "ct.inv" sw0flows], [0], [dnl ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([northd ssl file change]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) PKIDIR="$(cd $abs_top_builddir/tests && pwd)" @@ -4327,9 +4233,7 @@ check ovn-nbctl --wait=sb sync OVS_APP_EXIT_AND_WAIT([NORTHD_TYPE]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([trace with IPv4 dnat]) AT_KEYWORDS([dnat]) ovn_start @@ -4366,9 +4270,7 @@ check ovn-nbctl --wait=sb sync AT_CHECK([ovn_trace --minimal 'inport == "sw1-port1" && eth.src == 50:54:00:00:00:03 && eth.dst == 00:00:00:00:ff:02 && ip4.dst == 42.42.42.42 && ip4.src == 11.0.0.2 && ip.ttl == 64' | grep "output(\"sw0-port1\")"], [1], [ignore]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([trace with IPv6 dnat]) AT_KEYWORDS([dnat]) ovn_start @@ -4405,9 +4307,7 @@ check ovn-nbctl --wait=sb sync AT_CHECK([ovn_trace --minimal 'inport == "sw1-port1" && eth.src == 50:54:00:00:00:03 && eth.dst == 00:00:00:00:ff:02 && ip6.dst == fd42::42 && ip6.src == fd11::2 && ip.ttl == 64' | grep "output(\"sw0-port1\")"], [1], [ignore]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([DHCP options]) AT_KEYWORDS([dnat]) ovn_start @@ -4455,9 +4355,7 @@ AT_CHECK([grep -w "ls_in_dhcp_options" sw0flows | sort | sed 's/table=../table=? ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- NAT and Load Balancer flows]) # Determine if expected flows are present. The only parameter to this @@ -4696,9 +4594,7 @@ check ovn-nbctl --wait=sb clear logical_router_port ro2-sw ha_chassis_group check_lflows 0 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- ARP flows for unreachable addresses - NAT and LB]) ovn_start @@ -4902,9 +4798,7 @@ AT_CHECK([grep "ls_in_l2_lkup" ls1_lflows | grep "192.168.4.100" | grep -v clone ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- LR NAT flows]) ovn_start @@ -5449,9 +5343,7 @@ AT_CHECK([grep "lr_out_snat" lr0flows | sed 's/table=./table=?/' | sort], [0], [ ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([Load Balancer SB duplicates]) ovn_start @@ -5466,9 +5358,7 @@ check ovn-nbctl --wait=sb sync check_row_count Load_Balancer 1 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- Add tags to logical flows]) ovn_start @@ -5493,9 +5383,7 @@ AT_CHECK([ovn-sbctl --columns=tags list logical_flow | grep lsp0 -c], [0], [dnl ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- gateway mtu check pkt larger flows]) ovn_start @@ -5719,9 +5607,7 @@ AT_CHECK([grep "lr_in_admission" lr0flows | grep -e "check_pkt_larger" | sort], ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- static routes flows]) AT_KEYWORDS([static-routes-flows]) ovn_start @@ -5820,7 +5706,6 @@ AT_CHECK([grep -e "lr_in_ip_routing.*2.0.0.0" lr0flows | sed 's/table=../table=? ]) AT_CLEANUP -]) AT_SETUP([ovn-northd -- lr multiple gw ports]) AT_KEYWORDS([multiple-l3dgw-ports]) @@ -5901,9 +5786,7 @@ AT_CHECK([grep lr_in_gw_redirect lrflows | grep cr-DR | sed 's/table=../table=?? ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn-northd -- lr admission with vtep lports]) AT_KEYWORDS([multiple-l3dgw-ports]) ovn_start NORTHD_TYPE @@ -5969,10 +5852,8 @@ AT_CHECK([grep lr_in_admission lrflows | grep lrp1 | sed 's/table=../table=??/' ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check options:requested-chassis fills requested_chassis col]) ovn_start NORTHD_TYPE @@ -6015,12 +5896,10 @@ ovn-nbctl --wait=sb set logical_switch_port S1-vm2 \ wait_row_count Port_binding 1 logical-port=S1-vm2 requested_chassis=$ch2_uuid AT_CLEANUP -]) # Duplicated datapaths shouldn't be created, but in case it is created because # of bug or dirty data, it should be properly deleted instead of causing # permanent failure in northd. -OVN_FOR_EACH_NORTHD([ AT_SETUP([handling duplicated datapaths]) ovn_start @@ -6035,9 +5914,7 @@ AT_CHECK([ovn-sbctl --id=@dp create Datapath_Binding external_ids:logical-switch wait_row_count Datapath_Binding 1 AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([conntrack nat implies conntrack]) ovn_start @@ -6072,7 +5949,6 @@ ct_dnat /* assuming no un-dnat entry, so no change */ /* default (use --ct to cu ]) AT_CLEANUP -]) AT_SETUP([route tables -- flows]) AT_KEYWORDS([route-tables-flows]) @@ -6138,9 +6014,7 @@ AT_CHECK([grep -e "(lr_in_ip_routing ).*outport" lr0flows | sed 's/table=../ta ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([check exclude-lb-vips-from-garp option]) ovn_start @@ -6170,9 +6044,7 @@ ovn-nbctl --wait=sb lsp-set-options S1-R1 router-port=R1-S1 nat-addresses="route AT_CHECK([ovn-sbctl get Port_Binding S1-R1 nat_addresses |grep -q 172.16.1.10], [1]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ACL log replies -- flows]) set_acl_options() { @@ -6421,9 +6293,7 @@ check_log_flows_count 0 out check_log_flows_count 0 in AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([Static IP multicast report forwarding]) ovn_start @@ -6464,9 +6334,7 @@ AT_CHECK([grep -e 'lr_in_ip_routing ' lrflows | grep -e 'igmp' -e 'mld' | sed ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ACLs after lb]) AT_KEYWORDS([acl]) ovn_start @@ -6635,9 +6503,7 @@ AT_CHECK([grep -e "ls_in_stateful" lsflows | sed 's/table=../table=??/' | sort], ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn-northd -- lr multiple gw ports NAT]) AT_KEYWORDS([multiple-l3dgw-ports]) ovn_start @@ -6833,9 +6699,7 @@ AT_CHECK([ovn-sbctl dump-flows DR | grep -e lr_in_unsnat -e lr_out_snat -e lr_in ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([LR NB Static_MAC_Binding table]) ovn_start @@ -6859,9 +6723,7 @@ ovn-nbctl --may-exist static-mac-binding-add lr0-p0 192.168.10.100 00:00:22:33:5 wait_row_count Static_MAC_Binding 1 logical_port=lr0-p0 ip=192.168.10.100 mac="00\:00\:22\:33\:55\:66" AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([LR neighbor lookup and learning flows]) ovn_start @@ -6885,9 +6747,7 @@ AT_CHECK([cat lrflows | grep -e lr_in_lookup_neighbor -e lr_in_learn_neighbor | ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([LS default ACL drop]) AT_KEYWORDS([acl]) @@ -7332,9 +7192,7 @@ ct_next(ct_state=new|trk); ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([northd-parallelization unixctl]) ovn_start @@ -7376,9 +7234,7 @@ ovn-appctl: ovn-northd: server returned an error ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([northd-parallelization runtime]) ovn_start @@ -7441,9 +7297,7 @@ ovn-sbctl dump-flows | sed 's/arp.tpa == 10.1.0..../arp.tpa == 10.1.0.??/' | sed AT_CHECK([diff flows1 flows3]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([Port security lflows]) ovn_start @@ -7610,10 +7464,8 @@ sort | sed 's/table=../table=??/' ], [0], [dnl ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([Load balancer ct_lb_mark backwards compatibility]) AT_KEYWORDS([lb]) ovn_start @@ -7661,9 +7513,7 @@ AT_CHECK([ovn-sbctl lflow-list | grep -e natted -e ct_lb], [0], [dnl ]) AT_CLEANUP -]) -OVN_FOR_EACH_NORTHD([ AT_SETUP([ACL ct_mark.blocked backwards compatibility]) AT_KEYWORDS([acl]) ovn_start @@ -7740,7 +7590,6 @@ AT_CHECK([ovn-sbctl lflow-list | grep 'ls.*acl.*blocked' ], [0], [dnl ]) AT_CLEANUP -]) AT_SETUP([Localnet MAC learning option]) ovn_start @@ -7776,7 +7625,6 @@ AT_CHECK([ovn-sbctl dump-flows ls0 | grep -e 'ls_in_\(put\|lookup\)_fdb' | sort ]) AT_CLEANUP -]) AT_SETUP([check install_ls_lb_from_router option]) AT_KEYWORDS([lb-ls-install-from-lrouter]) @@ -7860,7 +7708,6 @@ AT_CHECK([grep "ls_in_lb" S1flows | sort], [0], [dnl check_column "" sb:load_balancer datapaths name=lb0 AT_CLEANUP -]) AT_SETUP([check fip flows with redirect-type bridged]) AT_KEYWORDS([fip-redirect-type-bridged]) @@ -7897,4 +7744,6 @@ AT_CHECK([grep "lr_in_arp_resolve" R1flows | grep priority=90 | sort], [0], [dnl ]) AT_CLEANUP + +dnl NOTE: All new ovn-northd.at tests should be added above this line. ]) -- 2.31.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
