ofproto-dpif: Keep track of exact-match flow info

This patch adds more flow related stats to the output of
"ovs-appctl dpif/show".  Specifically, the follow information
are added per ofproto:

- Max flow table size
- Average flow table size
- Average flow table add rate
- Average flow table delete rate
- Average flow entry life in milliseconds

Feature #15366

Signed-off-by: Andy Zhou <azhou@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

2 files changed, 65 insertions, 18 deletions

diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index f390f2924..a692d9047 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -1481,13 +1481,15 @@ ADD_OF_PORTS([br1], [3])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (dummy)
 	p2 2/2: (dummy)
 br1 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br1 65534/101: (dummy)
 	p3 3/3: (dummy)
 ])
@@ -1495,7 +1497,8 @@ br1 (dummy@ovs-dummy):
 AT_CHECK([ovs-appctl dpif/show br0], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (dummy)
 	p2 2/2: (dummy)
@@ -1588,13 +1591,15 @@ warped
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:9 missed:1
-	flows: 1
+	flows: cur: 1, avg: 1.000, max: 1, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p2 2/2: (dummy)
 	pbr0 1/none: (patch: peer=pbr1)
 br1 (dummy@ovs-dummy):
 	lookups: hit:4 missed:1
-	flows: 1
+	flows: cur: 1, avg: 1.000, max: 1, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br1 65534/101: (dummy)
 	p3 3/3: (dummy)
 	pbr1 1/none: (patch: peer=pbr0)
@@ -1621,3 +1626,32 @@ OFPST_PORT reply (xid=0x4): 1 ports
 
 OVS_VSWITCHD_STOP
 AT_CLEANUP
+
+AT_SETUP([ofproto-dpif - ovs-appctl dpif/show rates])
+OVS_VSWITCHD_START([set Bridge br0 fail-mode=secure])
+ADD_OF_PORTS([br0], 1, 2)
+
+AT_CHECK([ovs-ofctl add-flow br0 actions=LOCAL,output:1,output:2])
+
+for i in $(seq 1 61); do
+    ovs-appctl netdev-dummy/receive br0 '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=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
+    ovs-appctl time/warp 10000
+    ovs-appctl time/warp 50000
+done
+
+AT_CHECK([ovs-appctl time/warp 10000], [0], [warped
+])
+
+AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+br0 (dummy@ovs-dummy):
+	lookups: hit:0 missed:61
+	flows: cur: 0, avg: 1.000, max: 1, life span: 10001(ms)
+		hourly avg: add rate: 0.641/min, del rate: 0.635/min
+		overall avg: add rate: 1.000/min, del rate: 0.984/min
+	br0 65534/100: (dummy)
+	p1 1/1: (dummy)
+	p2 2/2: (dummy)
+])
+
+OVS_VSWITCHD_STOP
+AT_CLEANUP
diff --git a/tests/tunnel.at b/tests/tunnel.at
index aee543eb7..78e43f517 100644
--- a/tests/tunnel.at
+++ b/tests/tunnel.at
@@ -17,7 +17,8 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (gre: remote_ip=1.1.1.1)
 	p2 2/1: (gre: local_ip=2.2.2.2, remote_ip=1.1.1.1)
@@ -43,7 +44,8 @@ AT_CHECK([ovs-vsctl set Interface p2 type=gre options:local_ip=2.2.2.3 \
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (gre: remote_ip=1.1.1.1)
 	p2 2/1: (gre: csum=true, df_default=false, local_ip=2.2.2.3, remote_ip=1.1.1.1, ttl=1)
@@ -81,7 +83,8 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (gre: remote_ip=1.1.1.1)
 	p2 2/2: (dummy)
@@ -128,7 +131,8 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (gre: key=5, local_ip=2.2.2.2, remote_ip=1.1.1.1)
 	p2 2/2: (dummy)
@@ -163,7 +167,8 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (gre: remote_ip=1.1.1.1, tos=inherit, ttl=inherit)
 	p2 2/2: (dummy)
@@ -208,7 +213,8 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (gre: key=flow, remote_ip=1.1.1.1)
 	p2 2/1: (gre: key=flow, remote_ip=2.2.2.2)
@@ -243,7 +249,8 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (gre: key=1, remote_ip=1.1.1.1)
 	p2 2/1: (gre: in_key=2, out_key=3, remote_ip=1.1.1.1)
@@ -298,7 +305,8 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (gre: key=flow, remote_ip=1.1.1.1)
 	p2 2/1: (gre: key=3, remote_ip=3.3.3.3)
@@ -337,7 +345,8 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=vxlan \
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (vxlan: remote_ip=1.1.1.1)
 ])
@@ -352,7 +361,8 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=lisp \
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (lisp: remote_ip=1.1.1.1)
 ])
@@ -367,7 +377,8 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=vxlan \
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (vxlan: dst_port=4341, remote_ip=1.1.1.1)
 ])
@@ -379,7 +390,8 @@ AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=5000])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/2: (vxlan: dst_port=5000, remote_ip=1.1.1.1)
 ])
@@ -391,7 +403,8 @@ AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=8472])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 br0 (dummy@ovs-dummy):
 	lookups: hit:0 missed:0
-	flows: 0
+	flows: cur: 0, avg: 0.000, max: 0, life span: 0(ms)
+		overall avg: add rate: 0.000/min, del rate: 0.000/min
 	br0 65534/100: (dummy)
 	p1 1/1: (vxlan: remote_ip=1.1.1.1)
 ])