Stability fixes for SR Tests and small fixes for running ONOS in docker
- move checkOptions to component driver
- use karafTimeout for SR tests
- Fix some docker options
- Make sure mn docker can resolve own hostname
- Fix config file ip format for DHCP relay app
Change-Id: I85e8c52384e0fb478462fa9bbaf0b31a599b632b
(cherry picked from commit 521ecde3f8d28288303ea11129faa0cfd86b9bcd)
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
index f36719f..7ddd2aa 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
@@ -31,37 +31,42 @@
self.topo[ '4x4' ] = ( 4, 4, '--leaf=4 --spine=4', '4x4 Leaf-spine' )
def runTest( self, main, caseNum, numNodes, Topo, minFlow, testing, killList=[ 0, 1, 2 ] ):
- description = "Cluster Restart test with " + self.topo[ Topo ][ 3 ]
- caseTitle = 'CASE{}_'.format( caseNum ) + testing
- main.case( description )
- if not hasattr( main, 'apps' ):
- run.initTest( main )
- main.cfgName = Topo
- main.Cluster.setRunningNode( numNodes )
- run.installOnos( main )
- run.loadJson( main )
- run.loadChart( main )
- if hasattr( main, 'Mininet1' ):
- run.startMininet( main, 'cord_fabric.py', args=self.topo[ Topo ][ 2 ] )
- else:
- # Run the test with physical devices
- # TODO: connect TestON to the physical network
- pass
- # pre-configured routing and bridging test
- run.checkFlows( main, minFlowCount=minFlow )
- run.pingAll( main )
- switch = '{}'.format( self.topo[ Topo ][ 0 ] + self.topo[ Topo ][ 1 ] )
- link = '{}'.format( ( self.topo[ Topo ][ 0 ] + self.topo[ Topo ][ 1 ] ) * self.topo[ Topo ][ 0 ] )
- run.killOnos( main, killList, switch, link, '0' )
- run.pingAll( main, caseTitle, dumpflows=False )
- run.recoverOnos( main, killList, switch, link, '{}'.format( numNodes ) )
- run.checkFlows( main, minFlowCount=minFlow, tag=caseTitle )
- run.pingAll( main, caseTitle )
- # TODO Dynamic config of hosts in subnet
- # TODO Dynamic config of host not in subnet
- # TODO Dynamic config of vlan xconnect
- # TODO Vrouter integration
- # TODO Mcast integration
+ try:
+ description = "Cluster Restart test with " + self.topo[ Topo ][ 3 ]
+ caseTitle = 'CASE{}_'.format( caseNum ) + testing
+ main.case( description )
+ if not hasattr( main, 'apps' ):
+ run.initTest( main )
+ main.cfgName = Topo
+ main.Cluster.setRunningNode( numNodes )
+ run.installOnos( main )
+ run.loadJson( main )
+ run.loadChart( main )
+ if hasattr( main, 'Mininet1' ):
+ run.startMininet( main, 'cord_fabric.py', args=self.topo[ Topo ][ 2 ] )
+ else:
+ # Run the test with physical devices
+ # TODO: connect TestON to the physical network
+ pass
+ # pre-configured routing and bridging test
+ run.checkFlows( main, minFlowCount=minFlow )
+ run.pingAll( main )
+ switch = '{}'.format( self.topo[ Topo ][ 0 ] + self.topo[ Topo ][ 1 ] )
+ link = '{}'.format( ( self.topo[ Topo ][ 0 ] + self.topo[ Topo ][ 1 ] ) * self.topo[ Topo ][ 0 ] )
+ run.killOnos( main, killList, switch, link, '0' )
+ run.pingAll( main, caseTitle, dumpflows=False )
+ run.recoverOnos( main, killList, switch, link, '{}'.format( numNodes ) )
+ run.checkFlows( main, minFlowCount=minFlow, tag=caseTitle )
+ run.pingAll( main, caseTitle )
+ # TODO Dynamic config of hosts in subnet
+ # TODO Dynamic config of host not in subnet
+ # TODO Dynamic config of vlan xconnect
+ # TODO Vrouter integration
+ # TODO Mcast integration
+
+ except Exception as e:
+ main.log.exception( "Error in runTest" )
+ main.skipCase( result="FAIL", msg=e )
if hasattr( main, 'Mininet1' ):
run.cleanup( main )
else: