Segment Routing tests
Change-Id: I9f7614372e7dd9b3524b6e37204b5bde9fafb8bd
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 54e7d0f..a34741a 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -181,7 +181,7 @@
main.log.info(
"Starting Mininet from topo file " +
topoFile )
- cmdString += topoFile + " "
+ cmdString += "-E python " + topoFile + " "
if args is None:
args = ''
# TODO: allow use of args from .topo file?
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 7df5a6c..43cff72 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -671,7 +671,7 @@
main.exit()
def createCellFile( self, benchIp, fileName, mnIpAddrs,
- appString, onosIpAddrs ):
+ appString, onosIpAddrs, onosUser="sdn" ):
"""
Creates a cell file based on arguments
Required:
@@ -683,6 +683,8 @@
supported currently
* ONOS IP addresses ( onosIpAddrs )
- Must be passed in as last arguments
+ * ONOS USER (onosUser)
+ - optional argument to set ONOS_USER environment variable
NOTE: Assumes cells are located at:
~/<self.home>/tools/test/cells/
@@ -702,6 +704,8 @@
# Note that you may not want certain apps listed
# on here.
appString = "export ONOS_APPS=" + appString
+ onosGroup = "export ONOS_GROUP=" + onosUser
+ onosUser = "export ONOS_USER=" + onosUser
mnString = "export OCN="
if mnIpAddrs == "":
mnString = ""
@@ -734,6 +738,8 @@
cellFile.write( "export OCI=$OC1\n" )
cellFile.write( mnString + "\"" + mnIpAddrs + "\"\n" )
cellFile.write( appString + "\n" )
+ cellFile.write( onosGroup + "\n" )
+ cellFile.write( onosUser + "\n" )
cellFile.close()
# We use os.system to send the command to TestON cluster