Add stratum bmv2 for SROnosFailure and SRLinkFailure
- Add running stratum switches to these tests
- Add support for docker in SROnosFailure functions
- Add xconnect to cfgtranslator
- Rework switch roles in cfgtranslator
Change-Id: Ic0b386107a7813810de9bf7c34bdf2d869eafa84
(cherry picked from commit d2c84e79dd2257cba150dcde5c089b9d0bf81140)
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 3ac31dd..a2fade7 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1306,23 +1306,26 @@
try:
self.handle.sendline( "" )
self.handle.expect( self.prompt )
- cmdStr = "onos-die " + str( nodeIp )
- self.handle.sendline( cmdStr )
- i = self.handle.expect( [
- "Killing\sONOS",
- "ONOS\sprocess\sis\snot\srunning",
- pexpect.TIMEOUT ], timeout=60 )
- if i == 0:
- main.log.info( self.name + ": ONOS instance " + str( nodeIp ) +
- " was killed and stopped" )
- self.handle.sendline( "" )
- self.handle.expect( self.prompt )
- return main.TRUE
- elif i == 1:
- main.log.info( self.name + ": ONOS process was not running" )
- self.handle.sendline( "" )
- self.handle.expect( self.prompt )
- return main.FALSE
+ if self.inDocker:
+ return self.dockerStop( self.name )
+ else:
+ cmdStr = "onos-die " + str( nodeIp )
+ self.handle.sendline( cmdStr )
+ i = self.handle.expect( [
+ "Killing\sONOS",
+ "ONOS\sprocess\sis\snot\srunning",
+ pexpect.TIMEOUT ], timeout=60 )
+ if i == 0:
+ main.log.info( self.name + ": ONOS instance " + str( nodeIp ) +
+ " was killed and stopped" )
+ self.handle.sendline( "" )
+ self.handle.expect( self.prompt )
+ return main.TRUE
+ elif i == 1:
+ main.log.info( self.name + ": ONOS process was not running" )
+ self.handle.sendline( "" )
+ self.handle.expect( self.prompt )
+ return main.FALSE
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )