oftest: Update default controller port number to match recent OFTest.

Also, document how to work around it if you use an older OFTest.

Reported-by: Simon Horman <horms@verge.net.au>
Reported-by: Lori Jakab <lojakab@cisco.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/README-OFTest b/README-OFTest
index 1b8516be54eb60ec88c8c429aa29894866054b03..cdca06d37b1e5d263da43eec8e5c2e60f1edcf26 100644 (file)
--- a/README-OFTest
+++ b/README-OFTest
@@ -50,6 +50,13 @@ default) and enable verbose logging:
 
     make check-oftest OFT=<oft-binary> OFTFLAGS='--verbose -T basic.Echo'
 
+If you use OFTest that does not include commit 4d1f3eb2c792 (oft:
+change default port to 6653), merged into the OFTest repository in
+October 2013, then you need to add an option to use the IETF-assigned
+controller port:
+
+    make check-oftest OFT=<oft-binary> OFTFLAGS='--port=6653'
+
 Interpreting OFTest Results
 ---------------------------
 

diff --git a/tests/run-oftest b/tests/run-oftest
index d12a22fc0c21f8d761aad0085785e58d9a8a6cf3..c73c25c902f3a83fa950f02dd36bd592e705ab89 100755 (executable)
--- a/tests/run-oftest
+++ b/tests/run-oftest
@@ -74,7 +74,7 @@ for port in p1 p2 p3 p4; do
                                options:pstream=punix:$OVS_RUNDIR/$port
 done
 run ovs-vsctl \
-    -- set-controller br0 tcp:127.0.0.1 \
+    -- set-controller br0 tcp:127.0.0.1:6653 \
     -- set controller br0 connection-mode=out-of-band max-backoff=1000
 
 # Run OFTest.