refactored pingHosts and pingIPv6Hosts
Change-Id: Ie474067e198d52d82262f4cb475fe6cdabe5778c
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index be42136..0996652 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -424,12 +424,17 @@
main.log.info( "Testing reachability between specified hosts" )
isReachable = main.TRUE
+ pingResponse = ""
+ main.info.log("IPv4 ping across specified hosts")
for host in hostList:
listIndex = hostList.index( host )
# List of hosts to ping other than itself
pingList = hostList[ :listIndex ] + \
hostList[ ( listIndex + 1 ): ]
+
+ pingResponse += str(str(host) + " -> ")
+
for temp in pingList:
# Current host pings all other hosts specified
pingCmd = str( host ) + cmd + str( temp )
@@ -438,12 +443,13 @@
response = self.handle.before
if re.search( ',\s0\%\spacket\sloss', response ):
main.log.info( str( host ) + " -> " + str( temp ) )
+ pingResponse += str(" h" + str( temp[1:] ))
else:
- main.log.warn(
- str( host ) + " -> X (" + str( temp ) + ") "
- " Destination Unreachable" )
+ pingResponse += " X"
# One of the host to host pair is unreachable
isReachable = main.FALSE
+ pingResponse += "\n"
+ main.log.info(pingResponse)
return isReachable
except pexpect.TIMEOUT:
main.log.exception( self.name + ": TIMEOUT exception" )
@@ -493,8 +499,8 @@
pingResponse += " X"
# One of the host to host pair is unreachable
isReachable = main.FALSE
- main.log.info(pingResponse)
- pingResponse = ""
+ pingResponse += "\n"
+ main.log.info(pingResponse)
return isReachable
except pexpect.TIMEOUT: