Bump timeout differences, because timeouts different by 1s might end up
to have the same position in the heap as rule_eviction_priority() uses
1024ms as a unit.
Also, use time/stop to avoid relying on how long an add-flow would take.
These tests were introduced by commit 6d56c1f1.
("ofproto: Update rule's priority in eviction group.")
Signed-off-by: YAMAMOTO Takashi <yamam...@valinux.co.jp>
---
tests/ofproto.at | 42 ++++++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/tests/ofproto.at b/tests/ofproto.at
index e98b526..46ae9e9 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -1375,27 +1375,28 @@ AT_CHECK(
| ${PERL} $srcdir/uuidfilt.pl],
[0], [<0>
])
+ovs-appctl time/stop
# Add 4 flows.
for in_port in 4 3 2 1; do
- ovs-ofctl add-flow br0
hard_timeout=1${in_port},in_port=$in_port,actions=drop
+ ovs-ofctl add-flow br0
hard_timeout=1${in_port}0,in_port=$in_port,actions=drop
done
AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
- hard_timeout=11, in_port=1 actions=drop
- hard_timeout=12, in_port=2 actions=drop
- hard_timeout=13, in_port=3 actions=drop
- hard_timeout=14, in_port=4 actions=drop
+ hard_timeout=110, in_port=1 actions=drop
+ hard_timeout=120, in_port=2 actions=drop
+ hard_timeout=130, in_port=3 actions=drop
+ hard_timeout=140, in_port=4 actions=drop
NXST_FLOW reply:
])
# Sleep and modify the one that expires soonest
-sleep 2
+ovs-appctl time/warp 20000
AT_CHECK([ovs-ofctl mod-flows br0 in_port=1,actions=drop])
-sleep 2
+ovs-appctl time/warp 20000
# Adding another flow will cause the one that expires soonest to be evicted.
AT_CHECK([ovs-ofctl add-flow br0 in_port=5,actions=drop])
AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
- hard_timeout=11, in_port=1 actions=drop
- hard_timeout=13, in_port=3 actions=drop
- hard_timeout=14, in_port=4 actions=drop
+ hard_timeout=110, in_port=1 actions=drop
+ hard_timeout=130, in_port=3 actions=drop
+ hard_timeout=140, in_port=4 actions=drop
in_port=5 actions=drop
NXST_FLOW reply:
])
@@ -1414,26 +1415,27 @@ AT_CHECK(
])
# Add 4 flows.
for in_port in 4 3 2 1; do
- ovs-ofctl add-flow br0
idle_timeout=1${in_port},in_port=$in_port,actions=drop
+ ovs-ofctl add-flow br0
idle_timeout=1${in_port}0,in_port=$in_port,actions=drop
done
+ovs-appctl time/stop
AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
- idle_timeout=11, in_port=1 actions=drop
- idle_timeout=12, in_port=2 actions=drop
- idle_timeout=13, in_port=3 actions=drop
- idle_timeout=14, in_port=4 actions=drop
+ idle_timeout=110, in_port=1 actions=drop
+ idle_timeout=120, in_port=2 actions=drop
+ idle_timeout=130, in_port=3 actions=drop
+ idle_timeout=140, in_port=4 actions=drop
NXST_FLOW reply:
])
# Sleep and receive on the flow that expires soonest
-sleep 2
+ovs-appctl time/warp 20000
AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1)'])
-sleep 2
+ovs-appctl time/warp 20000
# Adding another flow will cause the one that expires soonest to be evicted.
AT_CHECK([ovs-ofctl add-flow br0 in_port=5,actions=drop])
AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
- idle_timeout=13, in_port=3 actions=drop
- idle_timeout=14, in_port=4 actions=drop
+ idle_timeout=130, in_port=3 actions=drop
+ idle_timeout=140, in_port=4 actions=drop
in_port=5 actions=drop
- n_packets=1, n_bytes=60, idle_timeout=11, in_port=1 actions=drop
+ n_packets=1, n_bytes=60, idle_timeout=110, in_port=1 actions=drop
NXST_FLOW reply:
])
OVS_VSWITCHD_STOP
--
1.8.3.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
