Hi Han, Yes, somehow I’ve not seen your comments for the test, sorry. I’m okay with those changes, thanks.
Regards, Vladislav Odintsov > On 7 Sep 2021, at 21:02, Han Zhou <hz...@ovn.org> wrote: > > On Tue, Sep 7, 2021 at 4:51 AM Vladislav Odintsov <odiv...@gmail.com> wrote: >> >> When IC port_binding exists and transit switch is deleted, >> the orphan port_binding is left in the IC_SB_DB. >> >> This patch fixes such situation and adds test for this case. >> >> Signed-off-by: Vladislav Odintsov <odiv...@gmail.com> >> --- >> v1 -> v2: >> - moved port_binding cleanup from ts_run() to port_binding_run() >> according to Han's suggestion > > Hi Vladislav, thanks for the revision. All looks good except that you may > have missed my comments for the tests/ovn-ic.at. Since those are very minor > points, I just modified before merging, and I hope it is fine for you. I > applied to both master and branch-21.06. > > Please see the diff below: > ------------------- ><8 > ----------------------------------------------------------------------8>< > ----------------------- > diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at > index b6a8edb68..319329841 100644 > --- a/tests/ovn-ic.at > +++ b/tests/ovn-ic.at > @@ -64,8 +64,8 @@ OVN_CLEANUP_IC([az1]) > AT_CLEANUP > ]) > > - > -AT_SETUP([ovn-ic -- port bindings]) > +OVN_FOR_EACH_NORTHD([ > +AT_SETUP([ovn-ic -- port bindings deletion upon TS deletion]) > > ovn_init_ic_db > net_add n1 > @@ -94,7 +94,7 @@ check ovn-nbctl lsp-add ts1 lsp1 -- \ > lsp-set-type lsp1 router -- \ > lsp-set-options lsp1 router-port=lrp1 > > -OVS_WAIT_UNTIL([ovn-sbctl list datapath_binding | grep interconn-ts | grep > ts1]) > +wait_row_count Datapath_Binding 1 external_ids:interconn-ts=ts1 > > # check port binding appeared > AT_CHECK([ovn-ic-sbctl show | grep -A2 lsp1], [0], [dnl > @@ -105,7 +105,7 @@ AT_CHECK([ovn-ic-sbctl show | grep -A2 lsp1], [0], [dnl > > # remove transit switch and check if port_binding is deleted > check ovn-ic-nbctl ts-del ts1 > -OVS_WAIT_UNTIL([test -z "$(ovn-ic-sbctl show | grep lsp1)"]) > +wait_row_count ic-sb:Port_Binding 0 logical_port=lsp1 > > for i in 1 2; do > az=az$i > @@ -114,7 +114,7 @@ for i in 1 2; do > done > OVN_CLEANUP_IC > AT_CLEANUP > - > +]) > > OVN_FOR_EACH_NORTHD([ > AT_SETUP([ovn-ic -- gateway sync]) > _______________________________________________ > dev mailing list > d...@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
