Specifically handle ONOS cli exiting in one function and
some HA Test improvements
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 5207f1e..d4900ad 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -281,9 +281,12 @@
lvlStr = "--level=" + level
self.handle.sendline( "" )
- i = self.handle.expect( [ "onos>", pexpect.TIMEOUT ] )
- # TODO: look for bash prompt as well
+ i = self.handle.expect( [ "onos>","\$", pexpect.TIMEOUT ] )
if i == 1:
+ main.log.error( self.name + ": onos cli session closed." )
+ main.cleanup()
+ main.exit()
+ if i == 2:
self.handle.sendline( "" )
self.handle.expect( "onos>" )
self.handle.sendline( "log:log " + lvlStr + " " + cmdStr )