On Wed, Sep 6, 2023 at 1:12 AM Ales Musil <[email protected]> wrote: > > > > On Wed, Sep 6, 2023 at 8:31 AM Han Zhou <[email protected]> wrote: >> >> ct_lb is only for backward compatibility, so update the test to align to >> the latest behavior with ct_lb_mark. >> >> Signed-off-by: Han Zhou <[email protected]> >> --- >> tests/ovn-northd.at | 33 +++++++++++++++++---------------- >> 1 file changed, 17 insertions(+), 16 deletions(-) >> >> diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at >> index 23dbe111fb7b..ae2c953f43d8 100644 >> --- a/tests/ovn-northd.at >> +++ b/tests/ovn-northd.at >> @@ -1287,7 +1287,8 @@ ovn-nbctl --wait=sb lsp-add sw1 sw1-p1 -- lsp-set-addresses sw1-p1 \ >> "02:00:00:00:00:03 20.0.0.3" >> >> # service_monitors state online requires corresponding port_binding to be "up" >> -ovn-sbctl chassis-add hv1 geneve 127.0.0.1 >> +ovn-sbctl chassis-add hv1 geneve 127.0.0.1 -- \ >> + set chassis hv1 other_config:ct-no-masked-label=true >> ovn-sbctl lsp-bind sw0-p1 hv1 >> ovn-sbctl lsp-bind sw1-p1 hv1 >> wait_row_count nb:Logical_Switch_Port 1 name=sw0-p1 'up=true' >> @@ -1306,7 +1307,7 @@ check ovn-nbctl --wait=sb ls-lb-add sw0 lb1 >> AT_CAPTURE_FILE([sbflows]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows | grep 'priority=120.*backends' | sed 's/table=..//'], 0, [dnl >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:80,20.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:80,20.0.0.3:80);) >> ]) >> >> # disabled LSPs should not be a backend of Load Balancer >> @@ -1315,7 +1316,7 @@ check ovn-nbctl lsp-set-enabled sw0-p1 disabled >> AT_CAPTURE_FILE([sbflows]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows | grep 'priority=120.*backends' | sed 's/table=..//'], 0, [dnl >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends=20.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends=20.0.0.3:80);) >> ]) >> wait_row_count Service_Monitor 1 >> >> @@ -1324,7 +1325,7 @@ check ovn-nbctl lsp-set-enabled sw0-p1 enabled >> AT_CAPTURE_FILE([sbflows]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows | grep 'priority=120.*backends' | sed 's/table=..//'], 0, [dnl >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:80,20.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:80,20.0.0.3:80);) >> ]) >> wait_row_count Service_Monitor 2 >> >> @@ -1335,7 +1336,7 @@ wait_row_count Service_Monitor 0 >> AT_CAPTURE_FILE([sbflows2]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows2 | grep 'priority=120.*backends' | sed 's/table=..//'], [0], >> -[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:80,20.0.0.3:80);) >> +[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:80,20.0.0.3:80);) >> ]) >> >> AS_BOX([Create the Load_Balancer_Health_Check again.]) >> @@ -1347,7 +1348,7 @@ check ovn-nbctl --wait=sb sync >> >> ovn-sbctl dump-flows sw0 | grep backends | grep priority=120 > lflows.txt >> AT_CHECK([cat lflows.txt | sed 's/table=..//'], [0], [dnl >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:80,20.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:80,20.0.0.3:80);) >> ]) >> >> AS_BOX([Get the uuid of both the service_monitor]) >> @@ -1357,7 +1358,7 @@ sm_sw1_p1=$(fetch_column Service_Monitor _uuid logical_port=sw1-p1) >> AT_CAPTURE_FILE([sbflows3]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows 3 | grep 'priority=120.*backends' | sed 's/table=..//'], [0], >> -[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:80,20.0.0.3:80);) >> +[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:80,20.0.0.3:80);) >> ]) >> >> AS_BOX([Set the service monitor for sw1-p1 to offline]) >> @@ -1368,7 +1369,7 @@ check ovn-nbctl --wait=sb sync >> AT_CAPTURE_FILE([sbflows4]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows4 | grep 'priority=120.*backends' | sed 's/table=..//'], [0], >> -[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends=10.0.0.3:80);) >> +[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends=10.0.0.3:80);) >> ]) >> >> AS_BOX([Set the service monitor for sw0-p1 to offline]) >> @@ -1397,7 +1398,7 @@ check ovn-nbctl --wait=sb sync >> AT_CAPTURE_FILE([sbflows7]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows7 | grep backends | grep priority=120 | sed 's/table=..//'], 0, >> -[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:80,20.0.0.3:80);) >> +[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:80,20.0.0.3:80);) >> ]) >> >> AS_BOX([Set the service monitor for sw1-p1 to error]) >> @@ -1408,7 +1409,7 @@ check ovn-nbctl --wait=sb sync >> ovn-sbctl dump-flows sw0 | grep "ip4.dst == 10.0.0.10 && tcp.dst == 80" \ >> | grep priority=120 > lflows.txt >> AT_CHECK([cat lflows.txt | grep ls_in_lb | sed 's/table=..//'], [0], [dnl >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends=10.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends=10.0.0.3:80);) >> ]) >> >> AS_BOX([Add one more vip to lb1]) >> @@ -1434,8 +1435,8 @@ AT_CAPTURE_FILE([sbflows9]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows9 | grep backends | grep priority=120 | sed 's/table=..//' | sort], >> 0, >> -[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends=10.0.0.3:80);) >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.40 && tcp.dst == 1000), action=(reg0[[1]] = 0; ct_lb(backends=10.0.0.3:1000);) >> +[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends=10.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.40 && tcp.dst == 1000), action=(reg0[[1]] = 0; ct_lb_mark(backends=10.0.0.3:1000);) >> ]) >> >> AS_BOX([Set the service monitor for sw1-p1 to online]) >> @@ -1448,8 +1449,8 @@ AT_CAPTURE_FILE([sbflows10]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw0 | tee sbflows10 | grep backends | grep priority=120 | sed 's/table=..//' | sort], >> 0, >> -[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:80,20.0.0.3:80);) >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.40 && tcp.dst == 1000), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:1000,20.0.0.3:80);) >> +[ (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:80,20.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.40 && tcp.dst == 1000), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:1000,20.0.0.3:80);) >> ]) >> >> AS_BOX([Associate lb1 to sw1]) >> @@ -1458,8 +1459,8 @@ AT_CAPTURE_FILE([sbflows11]) >> OVS_WAIT_FOR_OUTPUT( >> [ovn-sbctl dump-flows sw1 | tee sbflows11 | grep backends | grep priority=120 | sed 's/table=..//' | sort], >> 0, [dnl >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:80,20.0.0.3:80);) >> - (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.40 && tcp.dst == 1000), action=(reg0[[1]] = 0; ct_lb(backends= 10.0.0.3:1000,20.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.10 && tcp.dst == 80), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:80,20.0.0.3:80);) >> + (ls_in_lb ), priority=120 , match=(ct.new && ip4.dst == 10.0.0.40 && tcp.dst == 1000), action=(reg0[[1]] = 0; ct_lb_mark(backends= 10.0.0.3:1000,20.0.0.3:80);) >> ]) >> >> AS_BOX([Now create lb2 same as lb1 but udp protocol.]) >> -- >> 2.38.1 >> >> _______________________________________________ >> dev mailing list >> [email protected] >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> > > Looks good to me, thanks! > > Acked-by: Ales Musil <[email protected]> >
Thanks! Applied to main. Han > > -- > > Ales Musil > > Senior Software Engineer - OVN Core > > Red Hat EMEA > > [email protected] IM: amusil _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
