Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986

Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f

6 files changed, 27 insertions, 27 deletions

diff --git a/framework/src/onos/tools/test/topos/onos.py b/framework/src/onos/tools/test/topos/onos.py
index ae6045e3..f9d4ba23 100755
--- a/framework/src/onos/tools/test/topos/onos.py
+++ b/framework/src/onos/tools/test/topos/onos.py
@@ -31,7 +31,7 @@ class ONOS( Controller ):
         Controller.__init__( self, name, **kwargs )
         # the following have been done for us:
         #self.ip = ip ('127.0.0.1')
-        #self.port = port (6633)
+        #self.port = port (6653)
         #self.protocol = protocol ('tcp')
         #self.checkListening()
 
diff --git a/framework/src/onos/tools/test/topos/optical2.py b/framework/src/onos/tools/test/topos/optical2.py
index 36cdbadd..b778592c 100644
--- a/framework/src/onos/tools/test/topos/optical2.py
+++ b/framework/src/onos/tools/test/topos/optical2.py
@@ -69,7 +69,7 @@ topos = {'optical': ( lambda: OpticalTopo() )}
 
 
 def run():
-    c = RemoteController('c','127.0.0.1',6633)
+    c = RemoteController('c','127.0.0.1',6653)
     net = Mininet( topo=OpticalTopo(),controller=None,autoSetMacs=True)
     net.addController(c)
     net.start()
diff --git a/framework/src/onos/tools/test/topos/solar.py b/framework/src/onos/tools/test/topos/solar.py
index ea11b664..f316162a 100644
--- a/framework/src/onos/tools/test/topos/solar.py
+++ b/framework/src/onos/tools/test/topos/solar.py
@@ -23,7 +23,7 @@ class Solar(object):
         # We are creating the controller with local-loopback on purpose to avoid
         # having the switches connect immediately. Instead, we'll set controller
         # explicitly for each switch after configuring it as we want.
-        self.ctrls = [ RemoteController(cname, cip, 6633) for cip in cips ]
+        self.ctrls = [ RemoteController(cname, cip, 6653) for cip in cips ]
         self.net = Mininet(controller=RemoteController, switch = OVSKernelSwitch,
                            build=False)
 
diff --git a/framework/src/onos/tools/test/topos/sys-nonlinear-10.config b/framework/src/onos/tools/test/topos/sys-nonlinear-10.config
index 2b999d39..b3a718dd 100644
--- a/framework/src/onos/tools/test/topos/sys-nonlinear-10.config
+++ b/framework/src/onos/tools/test/topos/sys-nonlinear-10.config
@@ -56,7 +56,7 @@
           [{switch,1,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -66,7 +66,7 @@
            {switch,2,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -76,7 +76,7 @@
            {switch,3,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -86,7 +86,7 @@
            {switch,4,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -96,7 +96,7 @@
            {switch,5,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:05"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -107,7 +107,7 @@
            {switch,7,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:07"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -118,7 +118,7 @@
            {switch,8,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:08"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -128,7 +128,7 @@
            {switch,9,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:09"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -138,7 +138,7 @@
            {switch,10,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:0A"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -148,7 +148,7 @@
            {switch,6,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:06"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
diff --git a/framework/src/onos/tools/test/topos/sys-nonlinear-4.config b/framework/src/onos/tools/test/topos/sys-nonlinear-4.config
index b843146a..b1451bee 100644
--- a/framework/src/onos/tools/test/topos/sys-nonlinear-4.config
+++ b/framework/src/onos/tools/test/topos/sys-nonlinear-4.config
@@ -18,7 +18,7 @@
           [{switch,1,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -28,7 +28,7 @@
            {switch,3,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -37,7 +37,7 @@
            {switch,2,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -47,7 +47,7 @@
            {switch,4,
               [{backend,linc_us4_oe},
                {datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
-               {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+               {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                {controllers_listener,disabled},
                {queues_status,disabled},
                {ports,
diff --git a/framework/src/onos/tools/test/topos/sys.config b/framework/src/onos/tools/test/topos/sys.config
index 2b999d39..b3a718dd 100644
--- a/framework/src/onos/tools/test/topos/sys.config
+++ b/framework/src/onos/tools/test/topos/sys.config
@@ -56,7 +56,7 @@
           [{switch,1,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -66,7 +66,7 @@
            {switch,2,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -76,7 +76,7 @@
            {switch,3,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -86,7 +86,7 @@
            {switch,4,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -96,7 +96,7 @@
            {switch,5,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:05"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -107,7 +107,7 @@
            {switch,7,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:07"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -118,7 +118,7 @@
            {switch,8,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:08"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -128,7 +128,7 @@
            {switch,9,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:09"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -138,7 +138,7 @@
            {switch,10,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:0A"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -148,7 +148,7 @@
            {switch,6,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:06"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,