Migrate existing SRRouting tests to use the new functions
Change-Id: I5d1fd5c3e0555126873f94109bd2af1e1c3b9fb5
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index bd00623..3f7e6dd 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -2379,12 +2379,12 @@
"""
try:
self.handle.sendline( '' )
- i = self.handle.expect( [ 'mininet>', pexpect.EOF, pexpect.TIMEOUT ],
+ i = self.handle.expect( [ 'mininet>', self.hostPrompt, pexpect.EOF, pexpect.TIMEOUT ],
timeout=2 )
response = main.TRUE
if i == 0:
response = self.stopNet()
- elif i == 1:
+ elif i == 2:
return main.TRUE
# print "Disconnecting Mininet"
if self.handle:
@@ -3020,7 +3020,7 @@
main.log.exception( self.name + ": Uncaught exception!" )
main.cleanAndExit()
- def getHosts( self, verbose=False, updateTimeout=1000,
+ def getHosts( self, verbose=False, update=True, updateTimeout=1000,
hostClass=[ "Host", "DhcpClient", "Dhcp6Client", "DhcpServer", "Dhcp6Server", "DhcpRelay" ],
getInterfaces=True ):
"""
@@ -3047,8 +3047,9 @@
ifaceRE = r"(?P<ifname>[^:]+)\:(?P<ip>[^\s,]+),?"
ifacesRE = r"(?P<ifaces>[^:]+\:[^\s]+)"
hostRE = r"" + classRE + "\s(?P<name>[^:]+)\:(" + ifacesRE + "*\spid=(?P<pid>[^>]+))"
- # update mn port info
- self.update( updateTimeout )
+ if update:
+ # update mn port info
+ self.update( updateTimeout )
# Get mininet dump
dump = self.dump().split( "\n" )
hosts = {}
@@ -3456,7 +3457,7 @@
main.log.exception( self.name + ": Uncaught exception!" )
main.cleanAndExit()
- def verifyHostIp( self, hostList=[], prefix="" ):
+ def verifyHostIp( self, hostList=[], prefix="", update=True ):
"""
Description:
Verify that all hosts have IP address assigned to them
@@ -3465,12 +3466,13 @@
in hostList
prefix: at least one of the ip address assigned to the host
needs to have the specified prefix
+ update: Update Mininet information if True
Returns:
main.TRUE if all hosts have specific IP address assigned;
main.FALSE otherwise
"""
try:
- hosts = self.getHosts( getInterfaces=False )
+ hosts = self.getHosts( update=update, getInterfaces=False )
if not hostList:
hostList = hosts.keys()
for hostName in hosts.keys():
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 76cc415..e3d07b8 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -6369,7 +6369,6 @@
if sHost and dHost:
break
assert sHost, "Not able to find host with IP {}".format( sAddr )
- assert dHost, "Not able to find host with IP {}".format( dAddr )
cmdStr = "t3-troubleshoot"
if verbose:
cmdStr += " -vv"
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 6afc3a0..0cb30a5 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -969,6 +969,9 @@
# configured further.
returnString = handleBefore
return returnString
+ except pexpect.TIMEOUT:
+ main.log.exception( self.name + ": Timeout when sending " + cmdstr )
+ return main.FALSE
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )