Looks good.
--Justin
On Jul 6, 2012, at 2:49 PM, Ben Pfaff wrote:
> Somehow we've overlooked this for a long time. I guess that feature
> doesn't get used very much.
>
> Also updates the test output for OFPT_FLOW_MOD to include the out_port
> output and adds out_port to the NXT_FLOW_MOD tests.
>
> Signed-off-by: Ben Pfaff <b...@nicira.com>
> ---
> lib/ofp-print.c | 5 +++++
> tests/ofp-print.at | 12 ++++++------
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/lib/ofp-print.c b/lib/ofp-print.c
> index c7c8a19..baa7a6c 100644
> --- a/lib/ofp-print.c
> +++ b/lib/ofp-print.c
> @@ -753,6 +753,11 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header
> *oh,
> if (fm.buffer_id != UINT32_MAX) {
> ds_put_format(s, "buf:0x%"PRIx32" ", fm.buffer_id);
> }
> + if (fm.out_port != OFPP_NONE) {
> + ds_put_format(s, "out_port:");
> + ofputil_format_port(fm.out_port, s);
> + ds_put_char(s, ' ');
> + }
> if (fm.flags != 0) {
> uint16_t flags = fm.flags;
>
> diff --git a/tests/ofp-print.at b/tests/ofp-print.at
> index c7b4ddb..2014851 100644
> --- a/tests/ofp-print.at
> +++ b/tests/ofp-print.at
> @@ -357,7 +357,7 @@ AT_CHECK([ovs-ofctl '-vPATTERN:console:%c|%p|%m'
> ofp-print "\
> 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 00 \
> 00 00 01 0e 00 00 00 00 00 00 00 08 00 03 00 00 \
> " 2], [0], [dnl
> -OFPT_FLOW_MOD (xid=0x0): ADD
> priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2
> idle:5 buf:0x10e actions=output:3
> +OFPT_FLOW_MOD (xid=0x0): ADD
> priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2
> idle:5 buf:0x10e out_port:0 actions=output:3
> ], [dnl
> ofp_util|INFO|normalization changed ofp_match, details:
> ofp_util|INFO| pre:
> priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2,nw_tos=0,tp_src=0,tp_dst=0
> @@ -376,7 +376,7 @@ AT_CHECK([ovs-ofctl '-vPATTERN:console:%c|%p|%m'
> ofp-print "\
> 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 00 \
> 00 00 01 0e 00 00 00 00 00 00 00 08 00 03 00 00 \
> " 3], [0], [dnl
> -OFPT_FLOW_MOD (xid=0x0): ADD
> arp,in_port=1,dl_vlan=65535,dl_vlan_pcp=0,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2,nw_tos=0,tp_src=0,tp_dst=0
> idle:5 pri:65535 buf:0x10e actions=output:3
> +OFPT_FLOW_MOD (xid=0x0): ADD
> arp,in_port=1,dl_vlan=65535,dl_vlan_pcp=0,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2,nw_tos=0,tp_src=0,tp_dst=0
> idle:5 pri:65535 buf:0x10e out_port:0 actions=output:3
> ], [dnl
> ofp_util|INFO|normalization changed ofp_match, details:
> ofp_util|INFO| pre:
> priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2,nw_tos=0,tp_src=0,tp_dst=0
> @@ -826,12 +826,12 @@ AT_KEYWORDS([ofp-print])
> AT_CHECK([ovs-ofctl ofp-print "\
> 01 04 00 60 00 00 00 02 00 00 23 20 00 00 00 0d \
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80 00 \
> -ff ff ff ff ff ff 00 00 00 14 00 00 00 00 00 00 \
> +ff ff ff ff 00 10 00 00 00 14 00 00 00 00 00 00 \
> 00 01 20 08 00 00 00 00 00 00 01 c8 00 01 00 04 \
> 00 00 00 7b 00 00 00 00 ff ff 00 18 00 00 23 20 \
> 00 07 00 1f 00 01 00 04 00 00 00 00 00 00 00 05 \
> " 2], [0], [dnl
> -NXT_FLOW_MOD (xid=0x2): ADD reg0=0x7b,tun_id=0x1c8
> actions=load:0x5->NXM_NX_REG0[[]]
> +NXT_FLOW_MOD (xid=0x2): ADD reg0=0x7b,tun_id=0x1c8 out_port:16
> actions=load:0x5->NXM_NX_REG0[[]]
> ])
> AT_CLEANUP
>
> @@ -842,12 +842,12 @@ AT_KEYWORDS([ofp-print])
> AT_CHECK([ovs-ofctl ofp-print "\
> 01 04 00 60 00 00 00 02 00 00 23 20 00 00 00 0d \
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80 00 \
> -ff ff ff ff ff ff 00 00 00 14 00 00 00 00 00 00 \
> +ff ff ff ff 01 00 00 00 00 14 00 00 00 00 00 00 \
> 00 01 20 08 00 00 00 00 00 00 01 c8 00 01 00 04 \
> 00 00 00 7b 00 00 00 00 ff ff 00 18 00 00 23 20 \
> 00 07 00 1f 00 01 00 04 00 00 00 00 00 00 00 05 \
> " 3], [0], [dnl
> -NXT_FLOW_MOD (xid=0x2): ADD NXM_NX_TUN_ID(00000000000001c8),
> NXM_NX_REG0(0000007b) actions=load:0x5->NXM_NX_REG0[[]]
> +NXT_FLOW_MOD (xid=0x2): ADD NXM_NX_TUN_ID(00000000000001c8),
> NXM_NX_REG0(0000007b) out_port:256 actions=load:0x5->NXM_NX_REG0[[]]
> ])
> AT_CLEANUP
>
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
