[ovs-dev,17/21] ofproto-dpif.at: Workaround a race
diff mbox

Message ID 1445228952-22445-17-git-send-email-yamamoto@midokura.com
State Awaiting Upstream
Headers show

Commit Message

Takashi Yamamoto Oct. 19, 2015, 4:29 a.m. UTC
Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
---
 tests/ofproto-dpif.at | 1 +
 1 file changed, 1 insertion(+)

Comments

Ben Pfaff Nov. 10, 2015, 4:30 a.m. UTC | #1
On Mon, Oct 19, 2015 at 01:29:08PM +0900, YAMAMOTO Takashi wrote:
> Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>

Acked-by: Ben Pfaff <blp@ovn.org>
Joe Stringer Nov. 10, 2015, 4:53 a.m. UTC | #2
On 18 October 2015 at 21:29, YAMAMOTO Takashi <yamamoto@midokura.com> wrote:
> Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
> ---
>  tests/ofproto-dpif.at | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
> index f64c56c..b93c8fb 100644
> --- a/tests/ofproto-dpif.at
> +++ b/tests/ofproto-dpif.at
> @@ -844,6 +844,7 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
>  AT_CHECK([ovs-ofctl mod-port br0 5 noforward])
>  AT_CHECK([ovs-ofctl mod-port br0 6 noflood])
>
> +sleep 1  # wait for revalidation

Is it possible to use ovs-appctl revalidator/wait?
Ben Pfaff Nov. 10, 2015, 4:55 a.m. UTC | #3
On Mon, Nov 09, 2015 at 08:53:14PM -0800, Joe Stringer wrote:
> On 18 October 2015 at 21:29, YAMAMOTO Takashi <yamamoto@midokura.com> wrote:
> > Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
> > ---
> >  tests/ofproto-dpif.at | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
> > index f64c56c..b93c8fb 100644
> > --- a/tests/ofproto-dpif.at
> > +++ b/tests/ofproto-dpif.at
> > @@ -844,6 +844,7 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
> >  AT_CHECK([ovs-ofctl mod-port br0 5 noforward])
> >  AT_CHECK([ovs-ofctl mod-port br0 6 noflood])
> >
> > +sleep 1  # wait for revalidation
> 
> Is it possible to use ovs-appctl revalidator/wait?

I forgot we had that!  I hope it works too.
Takashi Yamamoto Nov. 19, 2015, 4:17 a.m. UTC | #4
i forgot it too.  i'll investigate if it can be used.

On Tue, Nov 10, 2015 at 1:55 PM, Ben Pfaff <blp@ovn.org> wrote:
> On Mon, Nov 09, 2015 at 08:53:14PM -0800, Joe Stringer wrote:
>> On 18 October 2015 at 21:29, YAMAMOTO Takashi <yamamoto@midokura.com> wrote:
>> > Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
>> > ---
>> >  tests/ofproto-dpif.at | 1 +
>> >  1 file changed, 1 insertion(+)
>> >
>> > diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
>> > index f64c56c..b93c8fb 100644
>> > --- a/tests/ofproto-dpif.at
>> > +++ b/tests/ofproto-dpif.at
>> > @@ -844,6 +844,7 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
>> >  AT_CHECK([ovs-ofctl mod-port br0 5 noforward])
>> >  AT_CHECK([ovs-ofctl mod-port br0 6 noflood])
>> >
>> > +sleep 1  # wait for revalidation
>>
>> Is it possible to use ovs-appctl revalidator/wait?
>
> I forgot we had that!  I hope it works too.

Patch
diff mbox

diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index f64c56c..b93c8fb 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -844,6 +844,7 @@  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 AT_CHECK([ovs-ofctl mod-port br0 5 noforward])
 AT_CHECK([ovs-ofctl mod-port br0 6 noflood])
 
+sleep 1  # wait for revalidation
 AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
 AT_CHECK([tail -1 stdout \
 | sed -e 's/Datapath actions: //' | tr ',' '\n' | sort], [0], [dnl