diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-10-24 10:36:01 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-10-24 10:36:01 -0700 |
| commit | 023e1e0a4d0a9f6937d9a2c66ba30d502029c4df (patch) | |
| tree | f98b8b68537616a7abbfdcc284c0192a958e322a /tests/ofproto-macros.at | |
| parent | 63adcc7d3fa1e136685f44edb03887222ea74bd8 (diff) | |
test-openflowd: Remove.
Some users were still confused by its presence.
Diffstat (limited to 'tests/ofproto-macros.at')
| -rw-r--r-- | tests/ofproto-macros.at | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 229e014b..5bc431c1 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -2,26 +2,6 @@ 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([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m']) -m4_define([OFPROTO_START], - [OVS_RUNDIR=$PWD; export OVS_RUNDIR - OVS_LOGDIR=$PWD; export OVS_LOGDIR - trap 'kill `cat test-openflowd.pid`' 0 - AT_CAPTURE_FILE([test-openflowd.log]) - AT_CHECK( - [test-openflowd --detach --pidfile --enable-dummy --log-file --fail=closed dummy@br0 none --datapath-id=fedcba9876543210 $1], - [0], [], [stderr]) - AT_CHECK([[sed < stderr ' -/vlog|INFO|opened log file/d -/openflowd|INFO|Open vSwitch version/d -/openflowd|INFO|OpenFlow protocol version/d -/ofproto|INFO|using datapath ID/d -/ofproto|INFO|datapath ID changed to fedcba9876543210/d']]) -]) - -m4_define([OFPROTO_STOP], - [AT_CHECK([ovs-appctl -t test-openflowd exit]) - trap '' 0]) - m4_define([OVS_VSWITCHD_START], [dnl Skip this test if running as root. Otherwise ovs-vswitchd will tear dnl down any existing datapaths if the kernel module is loaded. @@ -57,7 +37,7 @@ m4_define([OVS_VSWITCHD_START], /ofproto|INFO|datapath ID changed to fedcba9876543210/d']]) dnl Add bridges, ports, etc. - AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 -- $1]) + AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 fail-mode=secure -- $1]) ]) m4_define([OVS_VSWITCHD_STOP], |