commit cb9c0ba6c5d96a003dccfbd99751bb63c92b42ef
author Marc De Leenheer <marc@onlab.us> Thu Jan 22 14:50:04 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Jan 28 22:15:32 2015 +0000
tree ccde819d0f9d34a6596ef249ed5f540ea720bf9f
parent 93356bcabc6e47e0d1717abe877f1867230a6ca6

Fix rewriting of LINC-OE config for long controller IPs (ONOS-834).

Change-Id: I1e60ca4dc4d5d444eca905e13e234ad781009755

tools/test/topos/opticalUtils.py

diff --git a/tools/test/topos/opticalUtils.py b/tools/test/topos/opticalUtils.py
index f0c78fa..b645c14 100644
--- a/tools/test/topos/opticalUtils.py
+++ b/tools/test/topos/opticalUtils.py
@@ -248,11 +248,11 @@
         return False
 
     info ('*** Setting multiple controllers in sys.config...\n' )
-    searchStr = '{controllers,.*$'
+    searchStr = '\[{"Switch.*$'
     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
+    replaceStr = '[%s]},' % ctrlStr[:-1]         # Cut off last comma
     sedCmd = 'sed -i \'s/%s/%s/\' sys.config' % (searchStr, replaceStr)
     output = quietRun( sedCmd, shell=True )