[ovs-dev] [PATCH v2 11/11] ofproto-dpif: Add MPLS tests

[YAMAMOTO Takashi]

> Co-Authored-by: Joe Stringer <joe at wand.net.nz>
> Signed-off-by: Simon Horman <horms at verge.net.au>
> 
> ---
> 
> Previously part of "Add packet recirculation" (v18)
> 
> v2
> * Use OVS_APP_EXIT_AND_WAIT(ovs-ofctl)
> * Add resubmit and goto_table tests
> * Clean up documentation of MPLS unicast and multicast types in packet descriptions
> * Exercise recirculation of ARP
> * Patch port and packet out tests
> 
> Signed-off-by: Simon Horman <horms at verge.net.au>
> ---
>  ofproto/ofproto-dpif-xlate.c |   8 +-
>  tests/ofproto-dpif.at        | 915 ++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 918 insertions(+), 5 deletions(-)
> 
> diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
> index 85d4fc5..be01b44 100644
> --- a/ofproto/ofproto-dpif-xlate.c
> +++ b/ofproto/ofproto-dpif-xlate.c
> @@ -2255,10 +2255,6 @@ compose_recirculate_action(struct xlate_ctx *ctx,
>              return;
>          }
>  
> -        ctx->xout->recirc_ofproto = ctx->xbridge->ofproto;
> -        ctx->xout->recirc_md = pkt_metadata_from_flow(&ctx->xin->flow);
> -        ctx->xout->recirc_md.recirc_id = id;
> -
>          match_init_recirc(&match, id);
>  
>          ofpbuf_use_const(&ofpacts, ofpact_current, ofpacts_len);
> @@ -2280,6 +2276,10 @@ compose_recirculate_action(struct xlate_ctx *ctx,
>          ofpbuf_put(&ctx->xout->recirc_ofpacts, ofpact_current, ofpacts_len);
>      }
>  
> +    ctx->xout->recirc_ofproto = ctx->xbridge->ofproto;
> +    ctx->xout->recirc_md = pkt_metadata_from_flow(&ctx->xin->flow);
> +    ctx->xout->recirc_md.recirc_id = id;
> +
>      ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow,
>                                            &ctx->xout->odp_actions,
>                                            &ctx->xout->wc);

these hunks shouldn't be a part of this commit, i guess.

YAMAMOTO Takashi