| Message ID | 20230530205146.960485-1-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] test: Fix expected OpenFlow table numbers. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
+1. Thanks Dumitru for cleaning it up! Reviewed-By: Ihar Hrachyshka <ihrachys@redhat.com> On Tue, May 30, 2023 at 4:51 PM Dumitru Ceara <dceara@redhat.com> wrote: > > Commit 549e8ccebca7 ("ovn-controller.c: Fix assertion failure during > address set update.") added a new ovn-controller.at test and commit > 740f23c19577 ("Add new egress tables to accommodate for too-big packets > handling") went in without updating the expected numbers for that test. > > Fixes: 740f23c19577 ("Add new egress tables to accommodate for too-big packets handling") > Signed-off-by: Dumitru Ceara <dceara@redhat.com> > --- > tests/ovn-controller.at | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at > index 4edd62b24e..7109ff19b2 100644 > --- a/tests/ovn-controller.at > +++ b/tests/ovn-controller.at > @@ -2088,7 +2088,7 @@ ovn-appctl -t ovn-controller vlog/set file:dbg > ovn-nbctl create address_set name=as1 addresses=8.8.8.8 > check ovn-nbctl acl-add ls1 to-lport 100 'outport == "ls1-lp1" && ip4.src == $as1' drop > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=44 | grep -c "priority=1100"], [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c "priority=1100"], [0], [1 > ]) > > # pause ovn-northd > @@ -2104,13 +2104,13 @@ check as northd-backup ovn-appctl -t ovn-northd pause > # undefined. This test runs the scenario ten times to make sure different > # orders are covered and handled properly. > > -flow_count=$(ovs-ofctl dump-flows br-int table=44 | grep -c "priority=1100") > +flow_count=$(ovs-ofctl dump-flows br-int table=47 | grep -c "priority=1100") > for i in $(seq 10); do > # Delete and recreate the SB address set with same name and an extra IP. > addrs_=$(fetch_column address_set addresses name=as1) > addrs=${addrs_// /,} > AT_CHECK([ovn-sbctl destroy address_set as1 -- create address_set name=as1 addresses=$addrs,1.1.1.$i], [0], [ignore]) > - OVS_WAIT_UNTIL([test $(as hv1 ovs-ofctl dump-flows br-int table=44 | grep -c "priority=1100") = "$(($i + 1))"]) > + OVS_WAIT_UNTIL([test $(as hv1 ovs-ofctl dump-flows br-int table=47 | grep -c "priority=1100") = "$(($i + 1))"]) > done > > OVN_CLEANUP([hv1]) > -- > 2.31.1 >
On 5/30/23 22:54, Ihar Hrachyshka wrote: > +1. Thanks Dumitru for cleaning it up! > > Reviewed-By: Ihar Hrachyshka <ihrachys@redhat.com> > Applied to main and branch-23.06, thanks!
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index 4edd62b24e..7109ff19b2 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -2088,7 +2088,7 @@ ovn-appctl -t ovn-controller vlog/set file:dbg ovn-nbctl create address_set name=as1 addresses=8.8.8.8 check ovn-nbctl acl-add ls1 to-lport 100 'outport == "ls1-lp1" && ip4.src == $as1' drop check ovn-nbctl --wait=hv sync -AT_CHECK([ovs-ofctl dump-flows br-int table=44 | grep -c "priority=1100"], [0], [1 +AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c "priority=1100"], [0], [1 ]) # pause ovn-northd @@ -2104,13 +2104,13 @@ check as northd-backup ovn-appctl -t ovn-northd pause # undefined. This test runs the scenario ten times to make sure different # orders are covered and handled properly. -flow_count=$(ovs-ofctl dump-flows br-int table=44 | grep -c "priority=1100") +flow_count=$(ovs-ofctl dump-flows br-int table=47 | grep -c "priority=1100") for i in $(seq 10); do # Delete and recreate the SB address set with same name and an extra IP. addrs_=$(fetch_column address_set addresses name=as1) addrs=${addrs_// /,} AT_CHECK([ovn-sbctl destroy address_set as1 -- create address_set name=as1 addresses=$addrs,1.1.1.$i], [0], [ignore]) - OVS_WAIT_UNTIL([test $(as hv1 ovs-ofctl dump-flows br-int table=44 | grep -c "priority=1100") = "$(($i + 1))"]) + OVS_WAIT_UNTIL([test $(as hv1 ovs-ofctl dump-flows br-int table=47 | grep -c "priority=1100") = "$(($i + 1))"]) done OVN_CLEANUP([hv1])
Commit 549e8ccebca7 ("ovn-controller.c: Fix assertion failure during address set update.") added a new ovn-controller.at test and commit 740f23c19577 ("Add new egress tables to accommodate for too-big packets handling") went in without updating the expected numbers for that test. Fixes: 740f23c19577 ("Add new egress tables to accommodate for too-big packets handling") Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- tests/ovn-controller.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)