diff mbox series

[ovs-dev] tests: Add missing ovn_wait_remote_input_flows() implementation.

Message ID 20220901201743.3896849-1-dceara@redhat.com
State Rejected
Headers show
Series [ovs-dev] tests: Add missing ovn_wait_remote_input_flows() implementation. | expand

Checks

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

Commit Message

Dumitru Ceara Sept. 1, 2022, 8:17 p.m. UTC
This implementation was removed by accident between V4 [0] and V5 [1]
of a7c7d4519e50 ("controller: avoid recomputes triggered by SBDB
Port_Binding updates.").

[0] https://patchwork.ozlabs.org/project/ovn/patch/20220819151853.2149088-1-xsimonar@redhat.com/
[1] https://patchwork.ozlabs.org/project/ovn/patch/20220819154008.2592647-1-xsimonar@redhat.com/

Fixes: a7c7d4519e50 ("controller: avoid recomputes triggered by SBDB Port_Binding updates.")
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
---
 tests/ovn.at | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Dumitru Ceara Sept. 1, 2022, 8:20 p.m. UTC | #1
On 9/1/22 22:17, Dumitru Ceara wrote:
> This implementation was removed by accident between V4 [0] and V5 [1]
> of a7c7d4519e50 ("controller: avoid recomputes triggered by SBDB
> Port_Binding updates.").
> 
> [0] https://patchwork.ozlabs.org/project/ovn/patch/20220819151853.2149088-1-xsimonar@redhat.com/
> [1] https://patchwork.ozlabs.org/project/ovn/patch/20220819154008.2592647-1-xsimonar@redhat.com/
> 
> Fixes: a7c7d4519e50 ("controller: avoid recomputes triggered by SBDB Port_Binding updates.")
> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
> ---

Hi Xavier,

This is essentially just your code, I didn't change anything.  If you're
ok with adding your "Signed-off-by" then I'm fine with changing mine
into an Acked-by.

Regards,
Dumitru

>  tests/ovn.at | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/tests/ovn.at b/tests/ovn.at
> index c2bcb721a..db1d29737 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -105,6 +105,18 @@ m4_divert_text([PREPARE_TESTS],
>           test 1 -le $(as $hv1 ovs-ofctl dump-flows br-int | grep -c "output:$ofport")
>       ])
>     }
> +
> +   ovn_wait_remote_input_flows () {
> +     hv1=$1
> +     hv2=$2
> +     echo "$3: waiting for flows for remote input on $hv1"
> +     # Wait for a flow outputing  to remote input
> +     OVS_WAIT_UNTIL([
> +         ofport=$(as $hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-${hv2}-0)
> +         echo "tunnel port=$ofport"
> +         test 1 -le $(as $hv1 ovs-ofctl dump-flows br-int | grep -c "in_port=$ofport")
> +     ])
> +   }
>  ])
>  
>  m4_define([OVN_CHECK_PACKETS],
Dumitru Ceara Sept. 21, 2022, 2:36 p.m. UTC | #2
On 9/1/22 22:20, Dumitru Ceara wrote:
> On 9/1/22 22:17, Dumitru Ceara wrote:
>> This implementation was removed by accident between V4 [0] and V5 [1]
>> of a7c7d4519e50 ("controller: avoid recomputes triggered by SBDB
>> Port_Binding updates.").
>>
>> [0] https://patchwork.ozlabs.org/project/ovn/patch/20220819151853.2149088-1-xsimonar@redhat.com/
>> [1] https://patchwork.ozlabs.org/project/ovn/patch/20220819154008.2592647-1-xsimonar@redhat.com/
>>
>> Fixes: a7c7d4519e50 ("controller: avoid recomputes triggered by SBDB Port_Binding updates.")
>> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
>> ---
> 
> Hi Xavier,
> 
> This is essentially just your code, I didn't change anything.  If you're
> ok with adding your "Signed-off-by" then I'm fine with changing mine
> into an Acked-by.
> 

Never mind, this code has already made it into main branch via recent
commit b16c0a97270f ("tests: fixed multiple flaky tests").

We can drop my patch.

Regards,
Dumitru
diff mbox series

Patch

diff --git a/tests/ovn.at b/tests/ovn.at
index c2bcb721a..db1d29737 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -105,6 +105,18 @@  m4_divert_text([PREPARE_TESTS],
          test 1 -le $(as $hv1 ovs-ofctl dump-flows br-int | grep -c "output:$ofport")
      ])
    }
+
+   ovn_wait_remote_input_flows () {
+     hv1=$1
+     hv2=$2
+     echo "$3: waiting for flows for remote input on $hv1"
+     # Wait for a flow outputing  to remote input
+     OVS_WAIT_UNTIL([
+         ofport=$(as $hv1 ovs-vsctl --bare --columns ofport find Interface name=ovn-${hv2}-0)
+         echo "tunnel port=$ofport"
+         test 1 -le $(as $hv1 ovs-ofctl dump-flows br-int | grep -c "in_port=$ofport")
+     ])
+   }
 ])
 
 m4_define([OVN_CHECK_PACKETS],