[ovs-dev] [PATCH branch 2.12] ovn-controller: Fix inject-pkt command error response.

[Justin Pettit]

Thanks.  I added a reference to the OVN repo commit and merged this into branch-2.12.

--Justin


> On Aug 5, 2019, at 9:10 AM, Han Zhou <zhouhan at gmail.com> wrote:
> 
> From: Han Zhou <zhouhan at gmail.com>
> 
> From: Han Zhou <hzhou8 at ebay.com>
> 
> When using unixctl command inject-packet, it always respond with
> failure "server not ready", although the command was actually executed
> successfully.
> 
> Fixes: 0bd4d85c36ef ("ovn-controller: Initial use of incremental engine - quiet mode.")
> Signed-off-by: Han Zhou <hzhou8 at ebay.com>
> Acked-by: Dumitru Ceara <dceara at redhat.com>
> Signed-off-by: Numan Siddique <nusiddiq at redhat.com>
> ---
> ovn/controller/ovn-controller.c | 12 +++++++-----
> tests/ovn.at                    |  2 +-
> 2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
> index cf6c8ae..3f03a18 100644
> --- a/ovn/controller/ovn-controller.c
> +++ b/ovn/controller/ovn-controller.c
> @@ -2055,12 +2055,14 @@ main(int argc, char *argv[])
>                         unixctl_command_reply_error(pending_pkt.conn, error);
>                         free(error);
>                     } else {
> -                        VLOG_DBG("Pending_pkt conn but br_int %p or chassis "
> -                                 "%p not ready. run-id: %"PRIu64, br_int,
> -                                 chassis, engine_run_id);
> -                        unixctl_command_reply_error(pending_pkt.conn,
> -                            "ovn-controller not ready.");
> +                        unixctl_command_reply(pending_pkt.conn, NULL);
>                     }
> +                } else {
> +                    VLOG_DBG("Pending_pkt conn but br_int %p or chassis "
> +                             "%p not ready. run-id: %"PRIu64, br_int,
> +                             chassis, engine_run_id);
> +                    unixctl_command_reply_error(pending_pkt.conn,
> +                        "ovn-controller not ready.");
>                 }
>                 pending_pkt.conn = NULL;
>                 free(pending_pkt.flow_s);
> diff --git a/tests/ovn.at b/tests/ovn.at
> index 5d6c90c..372ba01 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -3723,7 +3723,7 @@ sleep 1
> packet="inport==\"ls1-lp1\" && eth.src==$ls1_lp1_mac && eth.dst==$rp_ls1_mac &&
>         ip4 && ip.ttl==64 && ip4.src==$ls1_lp1_ip && ip4.dst==$ls2_lp1_ip &&
>         udp && udp.src==53 && udp.dst==4369"
> -as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"
> +AT_CHECK([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"])
> 
> 
> echo "---------NB dump-----"
> -- 
> 2.1.0
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev