Adding more T-ports to big topo
Setting up bidirectional T-ports in OpticalPathProvisioner
Change-Id: I4e97b2eb53d3d4182aae9c98a227de982f492950
(cherry picked from commit d6843bed27c4b2b4e95984c99de3c54edcefc67f)
diff --git a/tools/test/topos/opticalUtils.py b/tools/test/topos/opticalUtils.py
index 521c59a..f0c78fa 100644
--- a/tools/test/topos/opticalUtils.py
+++ b/tools/test/topos/opticalUtils.py
@@ -220,10 +220,11 @@
onosDir = os.environ[ 'ONOS_ROOT' ]
except:
onosDir = findDir( 'onos' )
- os.environ[ 'ONOS_ROOT' ] = onosDir
if not onosDir:
error( 'Please set ONOS_ROOT environment variable!\n' )
return False
+ else:
+ os.environ[ 'ONOS_ROOT' ] = onosDir
info( '*** Writing Topology.json file\n' )
with open( 'Topology.json', 'w' ) as outfile:
@@ -284,7 +285,7 @@
intf2 = intfList[ 0 ]
intf.node.attach( findTap( intf2.node, intf2.node.ports[ intf2 ] ) )
- info( '*** Press any key to push Topology.json to onos...\n' )
+ info( '*** Press ENTER to push Topology.json to onos...\n' )
raw_input() # FIXME... we should eventually remove this
info( '*** Pushing Topology.json to ONOS\n' )
output = quietRun( '%s/tools/test/bin/onos-topo-cfg %s Topology.json' % ( onosDir, net.controllers[ 0 ].ip ), shell=True )