Refactoring to adhere to new mininetclidriver, and robustness debugging
diff --git a/TestON/tests/IntentPerfNext/IntentPerfNext.py b/TestON/tests/IntentPerfNext/IntentPerfNext.py
index 0661073..c965612 100644
--- a/TestON/tests/IntentPerfNext/IntentPerfNext.py
+++ b/TestON/tests/IntentPerfNext/IntentPerfNext.py
@@ -45,6 +45,9 @@
main.case( "Setting up test environment" )
+ main.step( "Starting mininet topology" )
+ main.Mininet1.startNet()
+
main.step( "Creating cell file" )
cellFileResult = main.ONOSbench.createCellFile(
BENCHIp, cellName, MN1Ip,
diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.py b/TestON/tests/TopoPerfNext/TopoPerfNext.py
index d0b66c9..24e3c9f 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.py
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.py
@@ -63,6 +63,9 @@
main.log.report( "Setting up test environment" )
+ main.step( "Starting mininet topology " )
+ main.Mininet1.startNet()
+
main.step( "Cleaning previously installed ONOS if any" )
main.ONOSbench.onosUninstall( nodeIp=ONOS2Ip )
main.ONOSbench.onosUninstall( nodeIp=ONOS3Ip )
@@ -309,7 +312,7 @@
main.log.info( "Object read in from OFP capture: " +
str( lineOfp ) )
- if len( lineOfp ) > 1:
+ if len( obj ) > 1:
t0Ofp = float( obj[ 1 ] ) * 1000.0
else:
main.log.error( "Tshark output file for OFP" +