[ovs-dev] [PATCH] tests: Fix test broken by introduction of ONFOXM_ET_TCP_FLAGS.

[Jarno Rajahalme]

LGTM,

Acked-by: Jarno Rajahalme <jrajahalme at nicira.com>

  Jarno

On Nov 25, 2014, at 8:39 AM, Ben Pfaff <blp at nicira.com> wrote:

> Commit 847ddeab372220 (meta-flow: Add support for ONF OpenFlow 1.3
> extension ONFOXM_ET_TCP_FLAGS.) failed to update a test to match the new
> OXM extension.  This fixes the problem.
> 
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
> I already applied this as an obvious fix for the problem that I introduced
> yesterday with the commit mentioned above.  Sorry for causing trouble!
> 
> diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
> index eafaa63..9a5c71d 100644
> --- a/tests/ovs-ofctl.at
> +++ b/tests/ovs-ofctl.at
> @@ -2340,14 +2340,20 @@ AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-nxm], [0],
>   [NXM_OF_ETH_TYPE(0800), NXM_OF_IP_PROTO(06), NXM_NX_TCP_FLAGS(0fff)
> ])
> 
> -# Check that marshaling in OXM for OF1.2 through OF1.4 gives OXM
> -# headers except for TCP flags, which didn't have an OXM definition until
> -# OF1.5.
> -for version in OpenFlow12 OpenFlow13 OpenFlow14; do
> -    AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-oxm $version], [0],
> -      [OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), NXM_NX_TCP_FLAGS(0fff)
> +# Check that marshaling in OXM for OF1.2 gives OXM headers except for
> +# TCP flags, which didn't have an OXM definition.
> +AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow12], [0],
> +    [OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), NXM_NX_TCP_FLAGS(0fff)
> +])
> +
> +# Check that marshaling in OXM for OF1.3 and OF1.4 gives OXM headers,
> +# including the ONF extension for TCP flags introduced in OF1.3.
> +AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow13], [0],
> +    [OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), ONFOXM_ET_TCP_FLAGS(0fff)
> +])
> +AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow14], [0],
> +    [OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), ONFOXM_ET_TCP_FLAGS(0fff)
> ])
> -done
> 
> # OpenFlow 1.5 added an OXM header for TCP flags:
> AT_CHECK([echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow15], [0],
> -- 
> 2.1.3
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev