Change the switch start scripts to connect to onos controller port 6653 over 6633.
This also makes it compatible with the ovs running on cord also using 6653.
Change-Id: I296e424d34ac6614a96f945bc8188e4fa74556ed
diff --git a/src/test/setup/of-bridge-local.sh b/src/test/setup/of-bridge-local.sh
index 8dfc5ad..8ad125d 100755
--- a/src/test/setup/of-bridge-local.sh
+++ b/src/test/setup/of-bridge-local.sh
@@ -14,7 +14,8 @@
ovs-vsctl del-br $bridge
ovs-vsctl add-br $bridge
my_ip=`ifconfig docker0 | grep "inet addr" | tr -s ' ' | cut -d":" -f2 |cut -d" " -f1`
-ovs-vsctl set-controller $bridge ptcp:6653:$my_ip tcp:$controller:6633
+#ovs-vsctl set-controller $bridge ptcp:6653:$my_ip tcp:$controller:6633
+ovs-vsctl set-controller $bridge tcp:$controller:6653
ovs-vsctl set controller $bridge max_backoff=1000
ovs-vsctl set bridge $bridge protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13
ovs-vsctl show
diff --git a/src/test/setup/of-bridge.sh b/src/test/setup/of-bridge.sh
index eff43d3..2957160 100755
--- a/src/test/setup/of-bridge.sh
+++ b/src/test/setup/of-bridge.sh
@@ -29,7 +29,8 @@
ovs-vsctl add-port $bridge veth$i
done
my_ip=`ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d":" -f2 |cut -d" " -f1`
-ovs-vsctl set-controller $bridge ptcp:6653:$my_ip tcp:$controller:6633
+#ovs-vsctl set-controller $bridge ptcp:6653:$my_ip tcp:$controller:6633
+ovs-vsctl set-controller $bridge tcp:$controller:6653
ovs-vsctl set controller $bridge max_backoff=1000
ovs-vsctl set bridge $bridge protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13
ovs-vsctl show