On Fri, Jun 19, 2020 at 6:25 PM Han Zhou <[email protected]> wrote:
>
> Add the hint to remind user about --ecmp option when needed.
>
> Signed-off-by: Han Zhou <[email protected]>
This patch needs a review. It seems to be forgotten.
Thanks,
Han
> ---
> tests/ovn-nbctl.at | 2 +-
> utilities/ovn-nbctl.c | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at
> index 14de1a8..54b4ad2 100644
> --- a/tests/ovn-nbctl.at
> +++ b/tests/ovn-nbctl.at
> @@ -1414,7 +1414,7 @@ AT_CHECK([ovn-nbctl lr-route-add lr0 10.0.0.1/24
11.0.0.2])
>
> dnl Add overlapping route with 10.0.0.1/24
> AT_CHECK([ovn-nbctl lr-route-add lr0 10.0.0.111/24 11.0.0.1], [1], [],
> - [ovn-nbctl: duplicate prefix: 10.0.0.0/24 (policy: dst-ip)
> + [ovn-nbctl: duplicate prefix: 10.0.0.0/24 (policy: dst-ip). Use option
--ecmp to allow this for ECMP routing.
> ])
> AT_CHECK([ovn-nbctl lr-route-add lr0 10.0.0.111a/24 11.0.0.1], [1], [],
> [ovn-nbctl: bad prefix argument: 10.0.0.111a/24
> diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c
> index 6ccc702..75fd8f9 100644
> --- a/utilities/ovn-nbctl.c
> +++ b/utilities/ovn-nbctl.c
> @@ -3833,7 +3833,8 @@ nbctl_lr_route_add(struct ctl_context *ctx)
> }
>
> if (!may_exist) {
> - ctl_error(ctx, "duplicate prefix: %s (policy: %s)",
> + ctl_error(ctx, "duplicate prefix: %s (policy: %s). Use
option"
> + " --ecmp to allow this for ECMP routing.",
> prefix, is_src_route ? "src-ip" : "dst-ip");
> free(next_hop);
> free(rt_prefix);
> --
> 2.1.0
>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
