diff mbox series

[ovs-dev,v2,2/2] missed during test simplification.

Message ID 20240326163208.1425569-2-jtanenba@redhat.com
State Accepted
Headers show
Series [ovs-dev,v2,1/2] Merge QoS logical pipelines. | expand

Checks

Context Check Description
ovsrobot/apply-robot warning apply and check: warning
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes success github build: passed

Commit Message

Jacob Tanenbaum March 26, 2024, 4:32 p.m. UTC
the testing was changed to remove the hardcoded table numbers from
flows. Two referances to table=28 where missed, this patch corrects that
and adds the correct variable name to the flow.

Fixes: f614335abca1 ("tests: Remove table numbers from "action parsing".")
Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
---
v2: addressed formatting seen by the day-0 bot and an additional referance
    to table=28 was identified

Comments

Ales Musil March 28, 2024, 9:04 a.m. UTC | #1
On Tue, Mar 26, 2024 at 5:32 PM Jacob Tanenbaum <jtanenba@redhat.com> wrote:

Hi Jacob,

thank you for the v2. As 0-day suggests the commit subject should stat with
capital letter.

the testing was changed to remove the hardcoded table numbers from
> flows. Two referances to table=28 where missed, this patch corrects that
>

typo: s/where/were/


> and adds the correct variable name to the flow.
>
> Fixes: f614335abca1 ("tests: Remove table numbers from "action parsing".")
>

This should be:
Fixes: 180749965eda ("tests: Use the ovn-debug binary to determine table
numbers.")


> Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
> ---
> v2: addressed formatting seen by the day-0 bot and an additional referance
>     to table=28 was identified
>
> diff --git a/tests/ovn.at b/tests/ovn.at
> index f04b74210..d269077ac 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -22070,7 +22070,7 @@ check_row_count Port_Binding 1
> logical_port=sw0-vir virtual_parent=sw0-p1
>  wait_for_ports_up sw0-vir
>  check ovn-nbctl --wait=hv sync
>  AT_CHECK([test 2 = `cat hv1/ovn-controller.log | grep "pinctrl received
> packet-in" | \
> -grep opcode=BIND_VPORT | grep OF_Table_ID=28 | wc -l`])
> +grep opcode=BIND_VPORT | grep OF_Table_ID=$(ovn-debug
> lflow-stage-to-oftable ls_in_arp_rsp) | wc -l`])
>
>  wait_row_count Port_Binding 1 logical_port=sw0-vir6 chassis=$hv1_ch_uuid
>  check_row_count Port_Binding 1 logical_port=sw0-vir6 virtual_parent=sw0-p1
> @@ -37684,7 +37684,7 @@ tpa=$(ip_to_hex 10 0 0 10)
>  send_garp 1 1 $eth_src $eth_dst $spa $tpa
>
>  OVS_WAIT_UNTIL([test 1 = `cat hv1/ovn-controller.log | grep "pinctrl
> received  packet-in" | \
> -grep opcode=BIND_VPORT | grep OF_Table_ID=28 | wc -l`])
> +grep opcode=BIND_VPORT | grep OF_Table_ID=$(ovn-debug
> lflow-stage-to-oftable ls_in_arp_rsp) | wc -l`])
>
>  sleep_controller hv1
>
> --
> 2.42.0
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
>
Other than those minor things it looks good, let's wait with v3 as I think
maintainers might be willing to amend those changes in during merge.

Acked-by: Ales Musil <amusil@redhat.com>
Mark Michelson April 4, 2024, 10:29 p.m. UTC | #2
Thanks Jacob and Ales. I fixed the subject line and fixed the typo below 
(as well as s/referances/references/) and pushed both patches in the 
series to main.

On 3/28/24 05:04, Ales Musil wrote:
> On Tue, Mar 26, 2024 at 5:32 PM Jacob Tanenbaum <jtanenba@redhat.com> wrote:
> 
> Hi Jacob,
> 
> thank you for the v2. As 0-day suggests the commit subject should stat with
> capital letter.
> 
> the testing was changed to remove the hardcoded table numbers from
>> flows. Two referances to table=28 where missed, this patch corrects that
>>
> 
> typo: s/where/were/
> 
> 
>> and adds the correct variable name to the flow.
>>
>> Fixes: f614335abca1 ("tests: Remove table numbers from "action parsing".")
>>
> 
> This should be:
> Fixes: 180749965eda ("tests: Use the ovn-debug binary to determine table
> numbers.")
> 
> 
>> Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
>> ---
>> v2: addressed formatting seen by the day-0 bot and an additional referance
>>      to table=28 was identified
>>
>> diff --git a/tests/ovn.at b/tests/ovn.at
>> index f04b74210..d269077ac 100644
>> --- a/tests/ovn.at
>> +++ b/tests/ovn.at
>> @@ -22070,7 +22070,7 @@ check_row_count Port_Binding 1
>> logical_port=sw0-vir virtual_parent=sw0-p1
>>   wait_for_ports_up sw0-vir
>>   check ovn-nbctl --wait=hv sync
>>   AT_CHECK([test 2 = `cat hv1/ovn-controller.log | grep "pinctrl received
>> packet-in" | \
>> -grep opcode=BIND_VPORT | grep OF_Table_ID=28 | wc -l`])
>> +grep opcode=BIND_VPORT | grep OF_Table_ID=$(ovn-debug
>> lflow-stage-to-oftable ls_in_arp_rsp) | wc -l`])
>>
>>   wait_row_count Port_Binding 1 logical_port=sw0-vir6 chassis=$hv1_ch_uuid
>>   check_row_count Port_Binding 1 logical_port=sw0-vir6 virtual_parent=sw0-p1
>> @@ -37684,7 +37684,7 @@ tpa=$(ip_to_hex 10 0 0 10)
>>   send_garp 1 1 $eth_src $eth_dst $spa $tpa
>>
>>   OVS_WAIT_UNTIL([test 1 = `cat hv1/ovn-controller.log | grep "pinctrl
>> received  packet-in" | \
>> -grep opcode=BIND_VPORT | grep OF_Table_ID=28 | wc -l`])
>> +grep opcode=BIND_VPORT | grep OF_Table_ID=$(ovn-debug
>> lflow-stage-to-oftable ls_in_arp_rsp) | wc -l`])
>>
>>   sleep_controller hv1
>>
>> --
>> 2.42.0
>>
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>
>>
> Other than those minor things it looks good, let's wait with v3 as I think
> maintainers might be willing to amend those changes in during merge.
> 
> Acked-by: Ales Musil <amusil@redhat.com>
>
diff mbox series

Patch

diff --git a/tests/ovn.at b/tests/ovn.at
index f04b74210..d269077ac 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -22070,7 +22070,7 @@  check_row_count Port_Binding 1 logical_port=sw0-vir virtual_parent=sw0-p1
 wait_for_ports_up sw0-vir
 check ovn-nbctl --wait=hv sync
 AT_CHECK([test 2 = `cat hv1/ovn-controller.log | grep "pinctrl received  packet-in" | \
-grep opcode=BIND_VPORT | grep OF_Table_ID=28 | wc -l`])
+grep opcode=BIND_VPORT | grep OF_Table_ID=$(ovn-debug lflow-stage-to-oftable ls_in_arp_rsp) | wc -l`])
 
 wait_row_count Port_Binding 1 logical_port=sw0-vir6 chassis=$hv1_ch_uuid
 check_row_count Port_Binding 1 logical_port=sw0-vir6 virtual_parent=sw0-p1
@@ -37684,7 +37684,7 @@  tpa=$(ip_to_hex 10 0 0 10)
 send_garp 1 1 $eth_src $eth_dst $spa $tpa
 
 OVS_WAIT_UNTIL([test 1 = `cat hv1/ovn-controller.log | grep "pinctrl received  packet-in" | \
-grep opcode=BIND_VPORT | grep OF_Table_ID=28 | wc -l`])
+grep opcode=BIND_VPORT | grep OF_Table_ID=$(ovn-debug lflow-stage-to-oftable ls_in_arp_rsp) | wc -l`])
 
 sleep_controller hv1