Add back deleted function still in use, minor improvments to script
Change-Id: Ifc91c8af7658b56ed24acef506bfc28e581bb2ea
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 6b4efdd..54e7d0f 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -1302,6 +1302,9 @@
if re.search( "Unknown command", response ):
main.log.warn( response )
return main.FALSE
+ if re.search( "Permission denied", response ):
+ main.log.warn( response )
+ return main.FALSE
except pexpect.TIMEOUT:
main.log.error( self.name + ": pexpect.TIMEOUT found" )
main.cleanup()
@@ -1903,6 +1906,24 @@
else:
main.log.error( "Connection failed to the Mininet host" )
+ def checkFlows( self, sw, dumpFormat=None ):
+ if dumpFormat:
+ command = "sh ovs-ofctl -F " + \
+ dumpFormat + " dump-flows " + str( sw )
+ else:
+ command = "sh ovs-ofctl dump-flows " + str( sw )
+ try:
+ response = self.execute(
+ cmd=command,
+ prompt="mininet>",
+ timeout=10 )
+ return response
+ except pexpect.EOF:
+ main.log.error( self.name + ": EOF exception found" )
+ main.log.error( self.name + ": " + self.handle.before )
+ main.cleanup()
+ main.exit()
+
def flowTableComp( self, flowTable1, flowTable2 ):
# This function compares the selctors and treatments of each flow
try: