Fixed some type and added extra condition in multi->single & single->multi function
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 628257d..192597b 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -273,12 +273,12 @@
pexpect.TIMEOUT ],
timeout )
if i == 0:
- main.log.info("mininet> prompt found!")
- response = str(self.handle.before)
+ main.log.info( "mininet> prompt found!" )
+ response = str( self.handle.before )
if i == 1:
- main.log.info( self.name + ": Cannot ping some of the Host")
- main.log.info(str(self.handle.before))
- response = str(self.handle.before)
+ main.log.info( self.name + ": Cannot ping some of the hosts")
+ main.log.info( str( self.handle.before ) )
+ response = str( self.handle.before )
if i == 2:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index d20d044..2bd8480 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -1291,7 +1291,9 @@
cmd += " " + \
str( ingressDevice ) + "/" +\
str( portIngress ) + " "
-
+ else:
+ main.log.error( "Device list and port list does not have the same length" )
+ return main.FALSE
if "/" in egressDevice:
cmd += " " + str( egressDevice )
else:
@@ -1450,6 +1452,9 @@
cmd += " " + \
str( egressDevice ) + "/" +\
str( portEgress )
+ else:
+ main.log.error( "Device list and port list does not have the same length" )
+ return main.FALSE
print "cmd= ", cmd
handle = self.sendline( cmd )
diff --git a/TestON/tests/OnosCHO/OnosCHO.py b/TestON/tests/OnosCHO/OnosCHO.py
index 71449b7..3706a03 100644
--- a/TestON/tests/OnosCHO/OnosCHO.py
+++ b/TestON/tests/OnosCHO/OnosCHO.py
@@ -537,7 +537,6 @@
installResult = main.TRUE
# Activate fwd app
appResults = main.CLIs[0].activateApp( "org.onosproject.fwd" )
-
appCheck = main.TRUE
pool = []
for cli in main.CLIs:
@@ -561,7 +560,7 @@
main.step( "Verify Pingall" )
ping_result = main.FALSE
time1 = time.time()
- ping_result = main.Mininet1.pingall(timeout=main.pingTimeout)
+ ping_result = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -641,7 +640,7 @@
main.step( "Verify Pingall" )
ping_result = main.FALSE
time1 = time.time()
- ping_result = main.Mininet1.pingall(timeout=main.pingTimeout)
+ ping_result = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -721,7 +720,7 @@
main.step( "Verify Pingall" )
ping_result = main.FALSE
time1 = time.time()
- ping_result = main.Mininet1.pingall(timeout=main.pingTimeout)
+ ping_result = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -902,7 +901,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -964,7 +963,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1025,7 +1024,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1107,7 +1106,7 @@
main.step( "Verify Ping across all hosts" )
pingResultLinkDown = main.FALSE
time1 = time.time()
- pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1251,7 +1250,7 @@
main.step( "Verify Ping across all hosts" )
pingResultLinkDown = main.FALSE
time1 = time.time()
- pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1374,7 +1373,7 @@
main.step( "Verify Ping across all hosts" )
pingResultLinkDown = main.FALSE
time1 = time.time()
- pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1487,7 +1486,7 @@
main.step( "Verify Ping across all hosts" )
pingResultLinkDown = main.FALSE
time1 = time.time()
- pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1609,7 +1608,7 @@
main.step( "Verify Ping across all hosts" )
pingResultLinkDown = main.FALSE
time1 = time.time()
- pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResultLinkDown = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1722,7 +1721,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1785,7 +1784,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1852,7 +1851,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1913,7 +1912,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -1969,7 +1968,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2026,7 +2025,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(
@@ -2081,7 +2080,7 @@
main.step( "Verify Ping across all hosts" )
pingResult = main.FALSE
time1 = time.time()
- pingResult = main.Mininet1.pingall(timeout=main.pingTimeout)
+ pingResult = main.Mininet1.pingall(timeout=main.pingTimeout,shortCircuit=True)
time2 = time.time()
timeDiff = round( ( time2 - time1 ), 2 )
main.log.report(