Configure LINC-OE to use multiple controllers

[Merged from onos-1.0]

Change-Id: I69b1c8935acdc8869cd19eb916e310965d8a2f48
(cherry picked from commit 16268818)

@@ -197,18 +197,12 @@ def switchJSON( switch ):
     return configDict
     return configDict
 
 
 
 
-def startOE( net, controllerIP=None, controllerPort=None ):
+def startOE( net ):
     "Start the LINC optical emulator within a mininet instance"
     "Start the LINC optical emulator within a mininet instance"
     opticalJSON = {}
     opticalJSON = {}
     linkConfig = []
     linkConfig = []
     devices = []
     devices = []
     
     
-    # if we are not given a controller IP or Port, we use the first found in Mininet
-    if controllerIP is None:
-        controllerIP = net.controllers[ 0 ].ip
-    if controllerPort is None:
-        controllerPort = net.controllers[ 0 ].port
-
     for switch in net.switches:
     for switch in net.switches:
         if isinstance( switch, OpticalSwitch ):
         if isinstance( switch, OpticalSwitch ):
             devices.append( switch.json() )
             devices.append( switch.json() )
@@ -247,11 +241,20 @@ def startOE( net, controllerIP=None, controllerPort=None ):
         error( "***ERROR: Could not find LINC-config-generator in user's home directory\n" )
         error( "***ERROR: Could not find LINC-config-generator in user's home directory\n" )
         return False
         return False
     output = quietRun( '%s/config_generator TopoConfig.json %s/sys.config.template %s %s'
     output = quietRun( '%s/config_generator TopoConfig.json %s/sys.config.template %s %s'
-                    % ( configGen, configGen, controllerIP, controllerPort ), shell=True )
+                    % ( configGen, configGen, net.controllers[ 0 ].ip, net.controllers[ 0 ].port ), shell=True )
     if output:
     if output:
         error( '***ERROR: Error creating sys.config file: %s\n' % output )
         error( '***ERROR: Error creating sys.config file: %s\n' % output )
         return False
         return False
 
 
+    info ('*** Setting multiple controllers in sys.config...\n' )
+    searchStr = '{controllers,.*$'
+    ctrlStr = ''
+    for index in range(len(net.controllers)):
+        ctrlStr += '{"Switch%d-Controller","%s",%d,tcp},' % (index, net.controllers[index].ip, net.controllers[index].port)
+    replaceStr = '{controllers,[%s]},' % ctrlStr[:-1]         # Cut off last comma
+    sedCmd = 'sed -i \'s/%s/%s/\' sys.config' % (searchStr, replaceStr)
+    output = quietRun( sedCmd, shell=True )
+
     info( '*** Copying sys.config to linc-oe directory: ', output + '\n' )
     info( '*** Copying sys.config to linc-oe directory: ', output + '\n' )
     lincDir = findDir( 'linc-oe' )
     lincDir = findDir( 'linc-oe' )
     if not lincDir:
     if not lincDir:
@@ -284,7 +287,7 @@ def startOE( net, controllerIP=None, controllerPort=None ):
     info( '*** Press any key to push Topology.json to onos...\n' )
     info( '*** Press any key to push Topology.json to onos...\n' )
     raw_input() # FIXME... we should eventually remove this
     raw_input() # FIXME... we should eventually remove this
     info( '*** Pushing Topology.json to ONOS\n' )
     info( '*** Pushing Topology.json to ONOS\n' )
-    output = quietRun( '%s/tools/test/bin/onos-topo-cfg %s Topology.json' % ( onosDir, controllerIP ), shell=True )
+    output = quietRun( '%s/tools/test/bin/onos-topo-cfg %s Topology.json' % ( onosDir, net.controllers[ 0 ].ip ), shell=True )
     # successful output contains the two characters '{}'
     # successful output contains the two characters '{}'
     # if there is more output than this, there is an issue
     # if there is more output than this, there is an issue
     if output.strip( '{}' ):
     if output.strip( '{}' ):