aboutsummaryrefslogtreecommitdiff
path: root/tests/ofproto.at
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-02-22 13:43:14 -0800
committerBen Pfaff <blp@nicira.com>2011-03-01 14:20:52 -0800
commit0fbc9f11c027cce9c89de12525de852e6b2ae332 (patch)
tree10a953e24bcaeb80109b02b753c1b077ada6192f /tests/ofproto.at
parentb9d5a387b2a0f822737ab78e0848884f2e1b5742 (diff)
ovs-ofctl: Implement documented semantics of --flow-format for flow_mods.
Also adds a test and moves some code around in tests/ to make sure that OFPROTO_START and OFPROTO_STOP are available in tests/ovs-ofctl.at. Reported-by: Michael Mao <mmao@nicira.com> Bug #4566.
Diffstat (limited to 'tests/ofproto.at')
-rw-r--r--tests/ofproto.at17
1 files changed, 0 insertions, 17 deletions
diff --git a/tests/ofproto.at b/tests/ofproto.at
index a7dda06f..f266f34b 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -1,22 +1,5 @@
AT_BANNER([ofproto])
-m4_define([STRIP_XIDS], [[sed 's/ (xid=0x[0-9a-fA-F]*)//']])
-m4_define([STRIP_DURATION], [[sed 's/\bduration=[0-9.]*s/duration=?s/']])
-
-m4_define([OFPROTO_START],
- [OVS_RUNDIR=$PWD; export OVS_RUNDIR
- OVS_LOGDIR=$PWD; export OVS_LOGDIR
- trap 'kill `cat ovs-openflowd.pid`' 0
- AT_CAPTURE_FILE([ovs-openflowd.log])
- AT_CHECK(
- [ovs-openflowd --detach --pidfile --enable-dummy --log-file dummy@br0 none --datapath-id=fedcba9876543210 $1],
- [0], [ignore], [ignore])
-])
-
-m4_define([OFPROTO_STOP],
- [AT_CHECK([ovs-appctl -t ovs-openflowd exit])
- trap '' 0])
-
AT_SETUP([ofproto - echo request])
OFPROTO_START
AT_CHECK([ovs-ofctl -vANY:ANY:WARN probe br0])