| Message ID | 20211102133103.4156460-1-frode.nordahl@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] tests: Fix requested-chassis localport test | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
| ovsrobot/github-robot-_Build_and_Test | fail | github build: failed |
On 11/2/21 2:31 PM, Frode Nordahl wrote: > The ovn-controller requested-chassis localport test currently > makes a change to the NB DB with --wait=sb, and subsequently does > an immediate check for change on a chassis. This does not allways > succeed. > > Update the test to use `--wait=hv` instead. > > Fixes: ad77db239d9a ("controller: Make use of Port_Binding:requested_chassis.") > Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com> > --- Hi Frode, This looks good to me, thanks! Acked-by: Dumitru Ceara <dceara@redhat.com> Regards, Dumitru
On Tue, Nov 2, 2021 at 12:40 PM Dumitru Ceara <dceara@redhat.com> wrote: > > On 11/2/21 2:31 PM, Frode Nordahl wrote: > > The ovn-controller requested-chassis localport test currently > > makes a change to the NB DB with --wait=sb, and subsequently does > > an immediate check for change on a chassis. This does not allways > > succeed. > > > > Update the test to use `--wait=hv` instead. > > > > Fixes: ad77db239d9a ("controller: Make use of Port_Binding:requested_chassis.") > > Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com> > > --- > > Hi Frode, > > This looks good to me, thanks! > > Acked-by: Dumitru Ceara <dceara@redhat.com> Thanks. Applied. Numan > > Regards, > Dumitru > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/tests/ovn.at b/tests/ovn.at index 7cfdede77..72a397ae0 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -28723,12 +28723,12 @@ AT_CHECK([as hv1 ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 | grep -q in_ AT_CHECK([as hv2 ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 | grep -q in_port=13], [0], []) # Set requested-chassis to one of the HVs -check ovn-nbctl --wait=sb lsp-set-options sw0-lport requested-chassis="hv1" +check ovn-nbctl --wait=hv lsp-set-options sw0-lport requested-chassis="hv1" AT_CHECK([as hv1 ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 | grep -q in_port=13], [0], []) AT_CHECK([as hv2 ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 | grep -q in_port=13], [1], []) # Set requested-chassis to empty string -check ovn-nbctl --wait=sb lsp-set-options sw0-lport requested-chassis="" +check ovn-nbctl --wait=hv lsp-set-options sw0-lport requested-chassis="" AT_CHECK([as hv1 ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 | grep -q in_port=13], [0], []) AT_CHECK([as hv2 ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 | grep -q in_port=13], [0], [])
The ovn-controller requested-chassis localport test currently makes a change to the NB DB with --wait=sb, and subsequently does an immediate check for change on a chassis. This does not allways succeed. Update the test to use `--wait=hv` instead. Fixes: ad77db239d9a ("controller: Make use of Port_Binding:requested_chassis.") Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com> --- tests/ovn.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)