Here's an incremental. As discussed offline, I decided to keep
ofctl_monitor.log.
---
tests/ofproto-dpif.at | 67 +++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 73bca1d..f51d6c6 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -170,10 +170,11 @@ OVS_VSWITCHD_START([dnl
add-port br0 p1 -- set Interface p1 type=dummy
])
+AT_CAPTURE_FILE([ofctl_monitor.log])
AT_DATA([flows.txt], [dnl
-cookie=0x0 dl_src=11:11:11:11:11:11 actions=controller
-cookie=0x1 dl_src=22:22:22:22:22:22 actions=controller,resubmit:80
-cookie=0x2 dl_src=33:33:33:33:33:33 actions=mod_vlan_vid:15,controller
+cookie=0x0 dl_src=10:11:11:11:11:11 actions=controller
+cookie=0x1 dl_src=20:22:22:22:22:22 actions=controller,resubmit:80
+cookie=0x2 dl_src=30:33:33:33:33:33 actions=mod_vlan_vid:15,controller
cookie=0x3 in_port=80 actions=mod_vlan_vid:80,controller,resubmit:81
cookie=0x4 in_port=81
actions=mod_dl_src:81:81:81:81:81:81,controller,resubmit:82
@@ -186,7 +187,7 @@ cookie=0x9 in_port=86
actions=mod_tp_dst:86,controller,controller
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
dnl Flow miss.
-AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2>
ofctl_monitor.log])AT_CAPTURE_FILE([ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2> ofctl_monitor.log])
for i in 1 2 3 ; do
ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
@@ -205,57 +206,57 @@ priority:0,tunnel:0,in_port:0000,tci(0)
mac(50:54:00:00:00:05->50:54:00:00:00:07
])
dnl Singleton controller action.
-AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2>
ofctl_monitor.log])AT_CAPTURE_FILE([ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2> ofctl_monitor.log])
for i in 1 2 3 ; do
- ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=11:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10)'
+ ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10)'
done
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log], [0], [dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(0)
mac(11:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,tunnel:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(0)
mac(11:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,tunnel:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(0)
mac(11:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,tunnel:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
])
dnl Modified controller action.
-AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2>
ofctl_monitor.log])AT_CAPTURE_FILE([ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2> ofctl_monitor.log])
for i in 1 2 3 ; do
- ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=33:33:33:33:33:33,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10)'
+ ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=30:33:33:33:33:33,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10)'
done
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log], [0], [dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(vlan:15,pcp:0)
mac(33:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,tunnel:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(vlan:15,pcp:0)
mac(33:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,tunnel:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(vlan:15,pcp:0)
mac(33:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,tunnel:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
])
dnl Checksum TCP.
-AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2>
ofctl_monitor.log])AT_CAPTURE_FILE([ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2> ofctl_monitor.log])
for i in 1 ; do
- ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=22:22:22:22:22:22,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=11)'
+ ovs-appctl netdev-dummy/receive p1
'in_port(1),eth(src=20:22:22:22:22:22,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=11)'
done
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log], [0], [dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(0)
mac(22:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
+priority:0,tunnel:0,in_port:0000,tci(0)
mac(20:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0)
mac(22:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
+priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0)
mac(20:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0)
mac(81:81:81:81:81:81->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
@@ -280,19 +281,19 @@ priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0)
mac(81:81:81:81:81:81->82:82
])
dnl Checksum UDP.
-AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2>
ofctl_monitor.log])AT_CAPTURE_FILE([ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor br0 65534 --detach --pidfile 2> ofctl_monitor.log])
for i in 1 ; do
- ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 22 22 22 22 22 22 08
00 45 00 00 1C 00 00 00 00 00 11 00 00 C0 A8 00 01 C0 A8 00 02 00 08 00 0B 00
00 12 34 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 20 22 22 22 22 22 08
00 45 00 00 1C 00 00 00 00 00 11 00 00 C0 A8 00 01 C0 A8 00 02 00 08 00 0B 00
00 12 34 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
done
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log], [0], [dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(0)
mac(22:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:17 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) udp_csum:1234
+priority:0,tunnel:0,in_port:0000,tci(0)
mac(20:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:17 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) udp_csum:1234
dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
-priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0)
mac(22:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:17 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) udp_csum:1234
+priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0)
mac(20:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:17 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) udp_csum:1234
dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0)
mac(81:81:81:81:81:81->50:54:00:00:00:07) type:0800 proto:17 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) udp_csum:1234
@@ -316,17 +317,17 @@ OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via
action) data_len=64 (unbuf
priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0)
mac(81:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:17 tos:0 ttl:0
ip(83.83.83.83->84.84.84.84) port(85->86) udp_csum:43a1
])
-AT_CHECK([ovs-ofctl dump-flows br0 | sed
's/duration=[[0-9]]*\.[[0-9]]*s,/duration=\<omitted\>,/' | sort], [0], [dnl
- cookie=0x0, duration=<omitted>, table=0, n_packets=1, n_bytes=60,
dl_src=11:11:11:11:11:11 actions=CONTROLLER:65535
- cookie=0x1, duration=<omitted>, table=0, n_packets=2, n_bytes=120,
dl_src=22:22:22:22:22:22 actions=CONTROLLER:65535,resubmit:80
- cookie=0x2, duration=<omitted>, table=0, n_packets=1, n_bytes=60,
dl_src=33:33:33:33:33:33 actions=mod_vlan_vid:15,CONTROLLER:65535
- cookie=0x3, duration=<omitted>, table=0, n_packets=2, n_bytes=120, in_port=80
actions=mod_vlan_vid:80,CONTROLLER:65535,resubmit:81
- cookie=0x4, duration=<omitted>, table=0, n_packets=2, n_bytes=120, in_port=81
actions=mod_dl_src:81:81:81:81:81:81,CONTROLLER:65535,resubmit:82
- cookie=0x5, duration=<omitted>, table=0, n_packets=2, n_bytes=120, in_port=82
actions=mod_dl_dst:82:82:82:82:82:82,CONTROLLER:65535,resubmit:83
- cookie=0x6, duration=<omitted>, table=0, n_packets=2, n_bytes=120, in_port=83
actions=mod_nw_src:83.83.83.83,CONTROLLER:65535,resubmit:84
- cookie=0x7, duration=<omitted>, table=0, n_packets=2, n_bytes=120, in_port=84
actions=mod_nw_dst:84.84.84.84,CONTROLLER:65535,resubmit:85
- cookie=0x8, duration=<omitted>, table=0, n_packets=2, n_bytes=120, in_port=85
actions=mod_tp_src:85,CONTROLLER:65535,resubmit:86
- cookie=0x9, duration=<omitted>, table=0, n_packets=2, n_bytes=120, in_port=86
actions=mod_tp_dst:86,CONTROLLER:65535,CONTROLLER:65535
+AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_DURATION | sort], [0], [dnl
+ cookie=0x0, duration=?s, table=0, n_packets=1, n_bytes=60,
dl_src=10:11:11:11:11:11 actions=CONTROLLER:65535
+ cookie=0x1, duration=?s, table=0, n_packets=2, n_bytes=120,
dl_src=20:22:22:22:22:22 actions=CONTROLLER:65535,resubmit:80
+ cookie=0x2, duration=?s, table=0, n_packets=1, n_bytes=60,
dl_src=30:33:33:33:33:33 actions=mod_vlan_vid:15,CONTROLLER:65535
+ cookie=0x3, duration=?s, table=0, n_packets=2, n_bytes=120, in_port=80
actions=mod_vlan_vid:80,CONTROLLER:65535,resubmit:81
+ cookie=0x4, duration=?s, table=0, n_packets=2, n_bytes=120, in_port=81
actions=mod_dl_src:81:81:81:81:81:81,CONTROLLER:65535,resubmit:82
+ cookie=0x5, duration=?s, table=0, n_packets=2, n_bytes=120, in_port=82
actions=mod_dl_dst:82:82:82:82:82:82,CONTROLLER:65535,resubmit:83
+ cookie=0x6, duration=?s, table=0, n_packets=2, n_bytes=120, in_port=83
actions=mod_nw_src:83.83.83.83,CONTROLLER:65535,resubmit:84
+ cookie=0x7, duration=?s, table=0, n_packets=2, n_bytes=120, in_port=84
actions=mod_nw_dst:84.84.84.84,CONTROLLER:65535,resubmit:85
+ cookie=0x8, duration=?s, table=0, n_packets=2, n_bytes=120, in_port=85
actions=mod_tp_src:85,CONTROLLER:65535,resubmit:86
+ cookie=0x9, duration=?s, table=0, n_packets=2, n_bytes=120, in_port=86
actions=mod_tp_dst:86,CONTROLLER:65535,CONTROLLER:65535
NXST_FLOW reply (xid=0x4):
])
--
1.7.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
