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 )