commit 029be65ba98c4f129148151cdaedda5f526629ac
author Charles Chan <rascov@gmail.com> Mon Aug 24 01:46:10 2015 +0800
committer Charles Chan <rascov@gmail.com> Tue Sep 15 16:27:41 2015 +0800
tree 16fb709822c027599f27034687f2e3bc7d021828
parent 7d1eacfafb566f4af969fd9d70f40485c2141ab5

[Emu] Changes default OpenFlow port to 6653. Remove trailing spaces.

Change-Id: Iebb2f8bc115efeb88f26b109eb93650bda7ce2fd

TestON/tests/SDNIPperf/Dependency/SDNIPperfMininet.py

diff --git a/TestON/tests/SDNIPperf/Dependency/SDNIPperfMininet.py b/TestON/tests/SDNIPperf/Dependency/SDNIPperfMininet.py
index 4971bd9..0784c2a 100755
--- a/TestON/tests/SDNIPperf/Dependency/SDNIPperfMininet.py
+++ b/TestON/tests/SDNIPperf/Dependency/SDNIPperfMininet.py
@@ -195,12 +195,12 @@
 
 
     sw1, sw2, sw3, sw4, sw5, sw6 = net.get( 'sw1', 'sw2', 'sw3', 'sw4', 'sw5', 'sw6' )
-    sw1.cmd( 'ovs-vsctl set-controller sw1 tcp:10.254.1.201:6633' )
-    sw2.cmd( 'ovs-vsctl set-controller sw2 tcp:10.254.1.201:6633' )
-    sw3.cmd( 'ovs-vsctl set-controller sw3 tcp:10.254.1.201:6633' )
-    sw4.cmd( 'ovs-vsctl set-controller sw4 tcp:10.254.1.201:6633' )
-    sw5.cmd( 'ovs-vsctl set-controller sw5 tcp:10.254.1.201:6633' )
-    sw6.cmd( 'ovs-vsctl set-controller sw6 tcp:10.254.1.201:6633' )
+    sw1.cmd( 'ovs-vsctl set-controller sw1 tcp:10.254.1.201:6653' )
+    sw2.cmd( 'ovs-vsctl set-controller sw2 tcp:10.254.1.201:6653' )
+    sw3.cmd( 'ovs-vsctl set-controller sw3 tcp:10.254.1.201:6653' )
+    sw4.cmd( 'ovs-vsctl set-controller sw4 tcp:10.254.1.201:6653' )
+    sw5.cmd( 'ovs-vsctl set-controller sw5 tcp:10.254.1.201:6653' )
+    sw6.cmd( 'ovs-vsctl set-controller sw6 tcp:10.254.1.201:6653' )
 
     # Set up sw100 as a learning
     sw100 = net.get( 'sw100' )

TestON/tests/SDNIPperf/SDNIPperf.params

diff --git a/TestON/tests/SDNIPperf/SDNIPperf.params b/TestON/tests/SDNIPperf/SDNIPperf.params
index b3c8f7a..a7c774d 100644
--- a/TestON/tests/SDNIPperf/SDNIPperf.params
+++ b/TestON/tests/SDNIPperf/SDNIPperf.params
@@ -9,7 +9,7 @@
     <CTRL>
         <numCtrl>1</numCtrl>
         <ip1>10.254.1.201</ip1>
-        <port1>6633</port1>
+        <port1>6653</port1>
     </CTRL>
 
     <GIT>