Sort the flow dump results to always have them in consistent order.

Signed-off-by: Jarno Rajahalme <[email protected]>
---
 tests/ovs-ofctl.at |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
index bc25d85..eafaa63 100644
--- a/tests/ovs-ofctl.at
+++ b/tests/ovs-ofctl.at
@@ -2765,17 +2765,15 @@ AT_CHECK([ovs-ofctl -O OpenFlow14 add-flow br0 
priority=21,importance=21,actions
 AT_CHECK([ovs-ofctl add-flow br0 priority=22,importance=22,actions=normal])
 
 dnl Importance parameter will only be visible of flows that are added via 
OF1.4+ if dumped via OF1.4+
-AT_CHECK([ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip], [0], [dnl
-OFPST_FLOW reply (OF1.4):
- priority=22 actions=NORMAL
+AT_CHECK([ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/ST_FLOW 
reply/d' | sort], [0], [dnl
  importance=21, priority=21 actions=NORMAL
+ priority=22 actions=NORMAL
 ])
 
 dnl Importance parameter will not be visible if flow is dumped with previous 
version prior to OF1.4+ whether added via OF1.4+
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0], [dnl
-NXST_FLOW reply:
- priority=22 actions=NORMAL
+AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | 
sort], [0], [dnl
  priority=21 actions=NORMAL
+ priority=22 actions=NORMAL
 ])
 
 OVS_VSWITCHD_STOP
-- 
1.7.10.4

_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev

Reply via email to