Fix rewriting of LINC-OE config for long controller IPs (ONOS-834).
Change-Id: I1e60ca4dc4d5d444eca905e13e234ad781009755
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 )