Acked-by: Jarno Rajahalme <ja...@ovn.org>
> On Jan 27, 2016, at 9:51 AM, Ben Pfaff <b...@ovn.org> wrote:
>
> There's no need for these to be macros; shell functions are conceptually
> cleaner and make the generated testsuite smaller.
>
> Also remove conflicting definition of STRIP_USED from rstp.at. It wasn't
> actually used anywhere in that file.
>
> Signed-off-by: Ben Pfaff <b...@ovn.org>
> ---
> tests/ofproto-dpif.at | 42 +++++++++++++++++++++---------------------
> tests/ofproto-macros.at | 13 +++++++++++--
> tests/rstp.at | 7 -------
> 3 files changed, 32 insertions(+), 30 deletions(-)
>
> diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
> index 1443d73..bbd081e 100644
> --- a/tests/ofproto-dpif.at
> +++ b/tests/ofproto-dpif.at
> @@ -5812,21 +5812,21 @@ AT_CHECK([ovs-appctl netdev-dummy/receive p1
> 'in_port(1),eth(src=50:54:00:00:00:
> AT_CHECK([ovs-appctl netdev-dummy/receive p2
> 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)'])
> AT_CHECK([ovs-appctl netdev-dummy/receive p3
> 'in_port(3),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'])
> ovs-appctl revalidator/wait
> -AT_CHECK([ovs-appctl dpif/dump-flows br0 | STRIP_UFID | STRIP_USED | sort],
> [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows br0 | strip_ufid | strip_used | sort],
> [0], [dnl
> recirc_id(0),in_port(1),eth_type(0x0800),ipv4(frag=no), packets:0, bytes:0,
> used:never, actions:drop
> recirc_id(0),in_port(2),eth_type(0x0800),ipv4(frag=no), packets:0, bytes:0,
> used:never, actions:drop
> ])
>
> -AT_CHECK([ovs-appctl dpif/dump-flows br1 | STRIP_UFID | STRIP_USED | sort],
> [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows br1 | strip_ufid | strip_used | sort],
> [0], [dnl
> recirc_id(0),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:0, bytes:0,
> used:never, actions:drop
> ])
>
> -AT_CHECK([ovs-appctl dpif/dump-flows -m br0 | STRIP_UFID | STRIP_USED |
> sort], [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows -m br0 | strip_ufid | strip_used |
> sort], [0], [dnl
> skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(p1),eth(src=50:54:00:00:00:05/00:00:00:00:00:00,dst=50:54:00:00:00:07/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=192.168.0.1/0.0.0.0,dst=192.168.0.2/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=8/0,code=0/0),
> packets:0, bytes:0, used:never, actions:drop
> skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(p2),eth(src=50:54:00:00:00:07/00:00:00:00:00:00,dst=50:54:00:00:00:05/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=192.168.0.2/0.0.0.0,dst=192.168.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=0/0,code=0/0),
> packets:0, bytes:0, used:never, actions:drop
> ])
>
> -AT_CHECK([ovs-appctl dpif/dump-flows -m br1 | STRIP_UFID | STRIP_USED |
> sort], [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows -m br1 | strip_ufid | strip_used |
> sort], [0], [dnl
> skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(p3),eth(src=50:54:00:00:00:09/00:00:00:00:00:00,dst=50:54:00:00:00:0a/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=10.0.0.2/0.0.0.0,dst=10.0.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=8/0,code=0/0),
> packets:0, bytes:0, used:never, actions:drop
> ])
>
> @@ -5879,7 +5879,7 @@ for dl_src in 00 01; do
> AT_CHECK([ovs-appctl netdev-dummy/receive p1 "505400000007
> 6066666666$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78
> c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44
> 00 00 48 4f 47 45"])
> done
> sleep 1 # wait for the datapath flow installed
> -AT_CHECK_UNQUOTED([cat ovs-vswitchd.log | STRIP_UFID | FILTER_FLOW_INSTALL |
> STRIP_USED], [0], [dnl
> +AT_CHECK_UNQUOTED([cat ovs-vswitchd.log | strip_ufid | FILTER_FLOW_INSTALL |
> strip_used], [0], [dnl
> recirc_id=0,mpls,in_port=1,vlan_tci=0x0000,dl_src=60:66:66:66:66:00,mpls_label=20,mpls_tc=0,mpls_ttl=32,mpls_bos=0,mpls_lse1=82208,
> actions:userspace(pid=0,slow_path(controller))
> recirc_id=0,mpls,in_port=1,vlan_tci=0x0000,dl_src=60:66:66:66:66:01,mpls_bos=0,mpls_lse1=82208,
> actions:userspace(pid=0,slow_path(controller))
> ])
> @@ -5918,7 +5918,7 @@ for dl_src in 00 01; do
> AT_CHECK([ovs-appctl netdev-dummy/receive p1 "505400000007
> 6066666666$dl_src 8847 00014020 00014120 45 00 00 2c 00 00 00 00 40 06 3b 78
> c0 a8 00 01 c0 a8 00 02 00 50 00 00 00 00 00 2a 00 00 00 2a 50 00 27 10 77 44
> 00 00 48 4f 47 45"])
> done
> sleep 1 # wait for the datapath flow installed
> -AT_CHECK_UNQUOTED([cat ovs-vswitchd.log | STRIP_UFID | FILTER_FLOW_INSTALL |
> STRIP_USED], [0], [dnl
> +AT_CHECK_UNQUOTED([cat ovs-vswitchd.log | strip_ufid | FILTER_FLOW_INSTALL |
> strip_used], [0], [dnl
> recirc_id=0,mpls,in_port=1,vlan_tci=0x0000,dl_src=60:66:66:66:66:00,mpls_label=20,mpls_tc=0,mpls_ttl=32,mpls_bos=0,mpls_lse1=82208,
> actions:userspace(pid=0,slow_path(controller))
> recirc_id=0,mpls,in_port=1,vlan_tci=0x0000,dl_src=60:66:66:66:66:01,mpls_bos=0,mpls_lse1=82208,
> actions:userspace(pid=0,slow_path(controller))
> ])
> @@ -5974,15 +5974,15 @@ dummy@ovs-dummy: hit:13 missed:2
> pbr1 1/none: (patch: peer=pbr0)
> ])
>
> -AT_CHECK([cat ovs-vswitchd.log | STRIP_UFID | FILTER_FLOW_INSTALL |
> STRIP_USED], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | strip_ufid | FILTER_FLOW_INSTALL |
> strip_used], [0], [dnl
> recirc_id=0,ip,in_port=100,vlan_tci=0x0000,nw_frag=no, actions:101,3,2
> recirc_id=0,ip,in_port=101,vlan_tci=0x0000,nw_frag=no, actions:100,2,3
> ])
>
> -AT_CHECK([cat ovs-vswitchd.log | grep -e 'in_port(100).*packets:9' |
> STRIP_UFID | FILTER_FLOW_DUMP], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | grep -e 'in_port(100).*packets:9' |
> strip_ufid | FILTER_FLOW_DUMP], [0], [dnl
> skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(100),eth(src=50:54:00:00:00:05/00:00:00:00:00:00,dst=50:54:00:00:00:07/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=192.168.0.1/0.0.0.0,dst=192.168.0.2/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=8/0,code=0/0),
> packets:9, bytes:540, used:0.0s, actions:101,3,2
> ])
> -AT_CHECK([cat ovs-vswitchd.log | grep -e 'in_port(101).*packets:4' |
> STRIP_UFID | FILTER_FLOW_DUMP], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | grep -e 'in_port(101).*packets:4' |
> strip_ufid | FILTER_FLOW_DUMP], [0], [dnl
> skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(101),eth(src=50:54:00:00:00:07/00:00:00:00:00:00,dst=50:54:00:00:00:05/00:00:00:00:00:00),eth_type(0x0800),ipv4(src=192.168.0.2/0.0.0.0,dst=192.168.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no),icmp(type=8/0,code=0/0),
> packets:4, bytes:240, used:0.0s, actions:100,2,3
> ])
>
> @@ -6039,7 +6039,7 @@ dummy@ovs-dummy: hit:0 missed:1
> pbr1 1/none: (patch: peer=pbr0)
> ])
>
> -AT_CHECK([cat ovs-vswitchd.log | STRIP_UFID | FILTER_FLOW_INSTALL |
> STRIP_USED], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | strip_ufid | FILTER_FLOW_INSTALL |
> strip_used], [0], [dnl
> recirc_id=0,ip,in_port=100,vlan_tci=0x0000,nw_src=192.168.0.1,nw_frag=no,
> actions:101,set(ipv4(src=255.255.255.254)),2
> ])
>
> @@ -6546,7 +6546,7 @@ sleep 1
> dnl The first packet is essentially a no-op, as the new destination MAC is the
> dnl same as the original. The second entry actually updates the destination
> dnl MAC.
> -AT_CHECK([cat ovs-vswitchd.log | STRIP_UFID | FILTER_FLOW_INSTALL |
> STRIP_USED], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | strip_ufid | FILTER_FLOW_INSTALL |
> strip_used], [0], [dnl
> recirc_id=0,ip,in_port=1,vlan_tci=0x0000,dl_dst=50:54:00:00:00:0a,nw_frag=no,
> actions:2
> recirc_id=0,ip,in_port=1,vlan_tci=0x0000,dl_dst=50:54:00:00:00:0c,nw_frag=no,
> actions:set(eth(dst=50:54:00:00:00:0a)),2
> ])
> @@ -6575,11 +6575,11 @@ for i in 1 2 3 4; do
> fi
> done
> sleep 1
> -AT_CHECK([cat ovs-vswitchd.log | STRIP_UFID | FILTER_FLOW_INSTALL |
> STRIP_USED], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | strip_ufid | FILTER_FLOW_INSTALL |
> strip_used], [0], [dnl
> pkt_mark=0,recirc_id=0,dp_hash=0,skb_priority=0,ct_state=0,ct_zone=0,ct_mark=0,ct_label=0,icmp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:09,dl_dst=50:54:00:00:00:0a,nw_src=10.0.0.2,nw_dst=10.0.0.1,nw_tos=0,nw_ecn=0,nw_ttl=64,icmp_type=8,icmp_code=0,
> actions:2
> pkt_mark=0,recirc_id=0,dp_hash=0,skb_priority=0,ct_state=0,ct_zone=0,ct_mark=0,ct_label=0,icmp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:0b,dl_dst=50:54:00:00:00:0c,nw_src=10.0.0.4,nw_dst=10.0.0.3,nw_tos=0,nw_ecn=0,nw_ttl=64,icmp_type=8,icmp_code=0,
> actions:drop
> ])
> -AT_CHECK([cat ovs-vswitchd.log | STRIP_UFID | FILTER_FLOW_DUMP | grep
> 'packets:3'], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | strip_ufid | FILTER_FLOW_DUMP | grep
> 'packets:3'], [0], [dnl
> skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0),
> packets:3, bytes:180, used:0.0s, actions:2
> skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:0b,dst=50:54:00:00:00:0c),eth_type(0x0800),ipv4(src=10.0.0.4,dst=10.0.0.3,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0),
> packets:3, bytes:180, used:0.0s, actions:drop
> ])
> @@ -7098,7 +7098,7 @@ for i in 1 2 3; do
> ovs-appctl netdev-dummy/receive p1
> 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x1234)'
> done
>
> -AT_CHECK([ovs-appctl dpif/dump-flows br0 | STRIP_UFID | STRIP_USED | sort],
> [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows br0 | strip_ufid | strip_used | sort],
> [0], [dnl
> recirc_id(0),in_port(1),eth_type(0x1234), packets:2, bytes:120, used:0.0s,
> actions:push_vlan(vid=3,pcp=0),100
> ])
>
> @@ -7111,11 +7111,11 @@ for i in 1 2 3; do
> ovs-appctl netdev-dummy/receive p1
> 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x1234)'
> done
>
> -AT_CHECK([ovs-appctl dpif/dump-flows br0 | STRIP_UFID | STRIP_USED | sort],
> [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows br0 | strip_ufid | strip_used | sort],
> [0], [dnl
> recirc_id(0),in_port(1),eth_type(0x1234), packets:5, bytes:300, used:0.0s,
> actions:push_vlan(vid=4,pcp=0),100
> ])
>
> -AT_CHECK([cat ovs-vswitchd.log | grep 'modify' | STRIP_UFID ], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | grep 'modify' | strip_ufid ], [0], [dnl
> dpif|DBG|dummy@ovs-dummy: put[[modify]]
> skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(1),eth(src=50:54:00:00:00:09/00:00:00:00:00:00,dst=50:54:00:00:00:0a/00:00:00:00:00:00),eth_type(0x1234),
> actions:push_vlan(vid=4,pcp=0),100
> ])
> OVS_VSWITCHD_STOP
> @@ -7139,7 +7139,7 @@ for i in 1 2 3; do
> ovs-appctl netdev-dummy/receive p1
> 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x1234)'
> done
>
> -AT_CHECK([ovs-appctl dpif/dump-flows br0 | STRIP_UFID | STRIP_USED | sort],
> [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows br0 | strip_ufid | strip_used | sort],
> [0], [dnl
> recirc_id(0),in_port(1),eth_type(0x1234), packets:2, bytes:120, used:0.0s,
> actions:100
> ])
>
> @@ -7155,7 +7155,7 @@ for i in 1 2 3; do
> ovs-appctl netdev-dummy/receive p1
> 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x1234)'
> done
>
> -AT_CHECK([ovs-appctl dpif/dump-flows br0 | STRIP_UFID | STRIP_USED | sort],
> [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows br0 | strip_ufid | strip_used | sort],
> [0], [dnl
> recirc_id(0),in_port(1),eth_type(0x1234), packets:5, bytes:300, used:0.0s,
> actions:drop
> ])
>
> @@ -7170,7 +7170,7 @@ for i in 1 2 3; do
> ovs-appctl netdev-dummy/receive p1
> 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x1234)'
> done
>
> -AT_CHECK([ovs-appctl dpif/dump-flows br0 | STRIP_UFID | STRIP_USED | sort],
> [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows br0 | strip_ufid | strip_used | sort],
> [0], [dnl
> recirc_id(0),in_port(1),eth_type(0x1234), packets:8, bytes:480, used:0.0s,
> actions:100
> ])
>
> @@ -7179,14 +7179,14 @@ for i in 1 2 3; do
> ovs-appctl netdev-dummy/receive p1
> 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x8100),vlan(vid=99,pcp=7),encap(eth_type(0x1234))'
> done
>
> -AT_CHECK([ovs-appctl dpif/dump-flows br0 | STRIP_UFID | STRIP_USED | sort],
> [0], [dnl
> +AT_CHECK([ovs-appctl dpif/dump-flows br0 | strip_ufid | strip_used | sort],
> [0], [dnl
> recirc_id(0),in_port(1),eth_type(0x1234), packets:8, bytes:480, used:0.0s,
> actions:100
> recirc_id(0),in_port(1),eth_type(0x8100),vlan(vid=99/0x0,pcp=7/0x0),encap(eth_type(0x1234)),
> packets:2, bytes:120, used:0.0s, actions:drop
> ])
>
> # Check that the new flow matches the CFI bit, while both vid and pcp
> # are wildcarded.
> -AT_CHECK([cat ovs-vswitchd.log | grep '\(modify\)\|\(flow_add\)' |
> STRIP_UFID ], [0], [dnl
> +AT_CHECK([cat ovs-vswitchd.log | grep '\(modify\)\|\(flow_add\)' |
> strip_ufid ], [0], [dnl
> dpif_netdev|DBG|flow_add:
> recirc_id=0,in_port=1,vlan_tci=0x0000,dl_type=0x1234, actions:100
> dpif|DBG|dummy@ovs-dummy: put[[modify]]
> skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(1),eth(src=50:54:00:00:00:09/00:00:00:00:00:00,dst=50:54:00:00:00:0a/00:00:00:00:00:00),eth_type(0x1234)
> dpif|DBG|dummy@ovs-dummy: put[[modify]]
> skb_priority(0/0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(1),eth(src=50:54:00:00:00:09/00:00:00:00:00:00,dst=50:54:00:00:00:0a/00:00:00:00:00:00),eth_type(0x1234),
> actions:100
> diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
> index 7afda4e..4215ee9 100644
> --- a/tests/ofproto-macros.at
> +++ b/tests/ofproto-macros.at
> @@ -235,11 +235,20 @@ ovn_populate_arp() {
> strip_xids () {
> sed 's/ (xid=0x[[0-9a-fA-F]]*)//'
> }
> +
> +# Changes all 'used:...' to say 'used:0.0', to make output easier to compare.
> +strip_used () {
> + sed 's/used:[[0-9]]\.[[0-9]]*/used:0.0/'
> +}
> +
> +# Strips 'ufid:...' from output, to make it easier to compare.
> +# (ufids are random.)
> +strip_ufid () {
> + sed 's/ufid:[[-0-9a-f]]* //'
> +}
> m4_divert_pop([PREPARE_TESTS])
>
> m4_define([STRIP_DURATION], [[sed 's/\bduration=[0-9.]*s/duration=?s/']])
> -m4_define([STRIP_USED], [[sed 's/used:[0-9]\.[0-9]*/used:0.0/']])
> -m4_define([STRIP_UFID], [[sed 's/ufid:[-0-9a-f]* //']])
> m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m'])
>
> # _OVS_VSWITCHD_START([vswitchd-aux-args])
> diff --git a/tests/rstp.at b/tests/rstp.at
> index ace693d..ba48c0a 100644
> --- a/tests/rstp.at
> +++ b/tests/rstp.at
> @@ -148,13 +148,6 @@ check 2 = F:400000 Di F F F F F F
> AT_CHECK([ovstest test-rstp test-rstp-ieee802.1d-2004-fig17.7], [0], [])
> AT_CLEANUP
>
> -# Strips out uninteresting parts of flow output, as well as parts
> -# that vary from one run to another (e.g., timing and bond actions).
> -m4_define([STRIP_USED], [[sed '
> - s/used:[0-9]*\.[0-9]*/used:0.0/
> - s/duration=[0-9.]*s*/duration=Xs/
> - s/idle_age=[0-9]*,/idle_age=X,/
> -']])
> m4_define([FILTER_STP_TOPOLOGY], [[
> grep 'STP state changed' | sed '
> s/.*ofproto_dpif|.*|//
> --
> 2.1.3
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
