[ovs-dev] tests: Ignore more error messages for hidden rules test.
diff mbox

Message ID 1443547177-32675-1-git-send-email-blp@nicira.com
State Accepted
Headers show

Commit Message

Ben Pfaff Sept. 29, 2015, 5:19 p.m. UTC
This test intentionally configures an unreachable controller.  It ignored
some error messages in the log, specifically
    br0: cannot find route for controller (240.0.0.1): ...
but a bug report says that other forms of messages can also appear, e.g.
    br0<->tcp:240.0.0.1:6653: connection dropped (No route to host)
This commit therefore expands the logged error messages that will be
ignored to any message that includes the IP address 240.0.0.1.

Reported-by: "Kurek, Tytus" <Tytus.Kurek@pega.com>
Reported-at: http://openvswitch.org/pipermail/discuss/2015-September/018910.html
Signed-off-by: Ben Pfaff <blp@nicira.com>
---
 AUTHORS          | 1 +
 tests/ofproto.at | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Justin Pettit Sept. 29, 2015, 9:06 p.m. UTC | #1
Acked-by: Justin Pettit <jpettit@nicira.com>

--Justin


> On Sep 29, 2015, at 10:19 AM, Ben Pfaff <blp@nicira.com> wrote:
> 
> This test intentionally configures an unreachable controller.  It ignored
> some error messages in the log, specifically
>    br0: cannot find route for controller (240.0.0.1): ...
> but a bug report says that other forms of messages can also appear, e.g.
>    br0<->tcp:240.0.0.1:6653: connection dropped (No route to host)
> This commit therefore expands the logged error messages that will be
> ignored to any message that includes the IP address 240.0.0.1.
> 
> Reported-by: "Kurek, Tytus" <Tytus.Kurek@pega.com>
> Reported-at: http://openvswitch.org/pipermail/discuss/2015-September/018910.html
> Signed-off-by: Ben Pfaff <blp@nicira.com>
> ---
> AUTHORS          | 1 +
> tests/ofproto.at | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/AUTHORS b/AUTHORS
> index 3f01a0f..cba0535 100644
> --- a/AUTHORS
> +++ b/AUTHORS
> @@ -371,6 +371,7 @@ Teemu Koponen           koponen@nicira.com
> Thomas Morin            thomas.morin@orange.com
> Timothy Chen            tchen@nicira.com
> Torbjorn Tornkvist      kruskakli@gmail.com
> +Tytus Kurek             Tytus.Kurek@pega.com
> Valentin Bud            valentin@hackaserver.com
> Vasiliy Tolstov         v.tolstov@selfip.ru
> Vasu Dasari             vdasari@gmail.com
> diff --git a/tests/ofproto.at b/tests/ofproto.at
> index 1ad80d3..c012a34 100644
> --- a/tests/ofproto.at
> +++ b/tests/ofproto.at
> @@ -1411,7 +1411,7 @@ ditto() {
> }
> (head_table classifier; ditto 1 253) > expout
> AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout])
> -OVS_VSWITCHD_STOP(["/cannot find route for controller/d"])
> +OVS_VSWITCHD_STOP(["/240\.0\.0\.1/d"])
> AT_CLEANUP
> 
> AT_SETUP([ofproto - flow table configuration (OpenFlow 1.2)])
> -- 
> 2.1.3
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
Ben Pfaff Sept. 29, 2015, 10:30 p.m. UTC | #2
Thanks, applied to master and branch-2.4.

On Tue, Sep 29, 2015 at 02:06:37PM -0700, Justin Pettit wrote:
> Acked-by: Justin Pettit <jpettit@nicira.com>
> 
> --Justin
> 
> 
> > On Sep 29, 2015, at 10:19 AM, Ben Pfaff <blp@nicira.com> wrote:
> > 
> > This test intentionally configures an unreachable controller.  It ignored
> > some error messages in the log, specifically
> >    br0: cannot find route for controller (240.0.0.1): ...
> > but a bug report says that other forms of messages can also appear, e.g.
> >    br0<->tcp:240.0.0.1:6653: connection dropped (No route to host)
> > This commit therefore expands the logged error messages that will be
> > ignored to any message that includes the IP address 240.0.0.1.
> > 
> > Reported-by: "Kurek, Tytus" <Tytus.Kurek@pega.com>
> > Reported-at: http://openvswitch.org/pipermail/discuss/2015-September/018910.html
> > Signed-off-by: Ben Pfaff <blp@nicira.com>
> > ---
> > AUTHORS          | 1 +
> > tests/ofproto.at | 2 +-
> > 2 files changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/AUTHORS b/AUTHORS
> > index 3f01a0f..cba0535 100644
> > --- a/AUTHORS
> > +++ b/AUTHORS
> > @@ -371,6 +371,7 @@ Teemu Koponen           koponen@nicira.com
> > Thomas Morin            thomas.morin@orange.com
> > Timothy Chen            tchen@nicira.com
> > Torbjorn Tornkvist      kruskakli@gmail.com
> > +Tytus Kurek             Tytus.Kurek@pega.com
> > Valentin Bud            valentin@hackaserver.com
> > Vasiliy Tolstov         v.tolstov@selfip.ru
> > Vasu Dasari             vdasari@gmail.com
> > diff --git a/tests/ofproto.at b/tests/ofproto.at
> > index 1ad80d3..c012a34 100644
> > --- a/tests/ofproto.at
> > +++ b/tests/ofproto.at
> > @@ -1411,7 +1411,7 @@ ditto() {
> > }
> > (head_table classifier; ditto 1 253) > expout
> > AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout])
> > -OVS_VSWITCHD_STOP(["/cannot find route for controller/d"])
> > +OVS_VSWITCHD_STOP(["/240\.0\.0\.1/d"])
> > AT_CLEANUP
> > 
> > AT_SETUP([ofproto - flow table configuration (OpenFlow 1.2)])
> > -- 
> > 2.1.3
> > 
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
>

Patch
diff mbox

diff --git a/AUTHORS b/AUTHORS
index 3f01a0f..cba0535 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -371,6 +371,7 @@  Teemu Koponen           koponen@nicira.com
 Thomas Morin            thomas.morin@orange.com
 Timothy Chen            tchen@nicira.com
 Torbjorn Tornkvist      kruskakli@gmail.com
+Tytus Kurek             Tytus.Kurek@pega.com
 Valentin Bud            valentin@hackaserver.com
 Vasiliy Tolstov         v.tolstov@selfip.ru
 Vasu Dasari             vdasari@gmail.com
diff --git a/tests/ofproto.at b/tests/ofproto.at
index 1ad80d3..c012a34 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -1411,7 +1411,7 @@  ditto() {
 }
 (head_table classifier; ditto 1 253) > expout
 AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout])
-OVS_VSWITCHD_STOP(["/cannot find route for controller/d"])
+OVS_VSWITCHD_STOP(["/240\.0\.0\.1/d"])
 AT_CLEANUP
 
 AT_SETUP([ofproto - flow table configuration (OpenFlow 1.2)])