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/SRDynamic/dependencies/SRDynamicFuncs.py b/TestON/tests/USECASE/SegmentRouting/SRDynamic/dependencies/SRDynamicFuncs.py
index e4390de..3071651 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamic/dependencies/SRDynamicFuncs.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamic/dependencies/SRDynamicFuncs.py
@@ -34,42 +34,46 @@
self.topo[ '4x4' ] = ( 4, 4, '--leaf=4 --spine=4', '4x4 Leaf-spine' )
def runTest( self, main, caseNum, numNodes, Topo, minBeforeFlow, minAfterFlow, killOnosAndDeleteCfg ):
- if not hasattr( main, 'apps' ):
- run.initTest( main )
+ try:
+ if not hasattr( main, 'apps' ):
+ run.initTest( main )
- description = "Bridging and Routing sanity test with " + \
- self.topo[ Topo ][ 3 ] + \
- "and {} nodes.".format( numNodes ) + \
- ( "\nAlso, killing the first Onos and removing the host cfg." if killOnosAndDeleteCfg else "" )
- main.case( description )
+ description = "Bridging and Routing sanity test with " + \
+ self.topo[ Topo ][ 3 ] + \
+ "and {} nodes.".format( numNodes ) + \
+ ( "\nAlso, killing the first Onos and removing the host cfg." if killOnosAndDeleteCfg else "" )
+ main.case( description )
- main.cfgName = Topo
- main.Cluster.setRunningNode( numNodes )
- run.installOnos( main )
- run.loadJson( main )
- run.loadChart( main )
- run.startMininet( main, 'cord_fabric.py',
- args=self.topo[ Topo ][ 2 ] )
- # pre-configured routing and bridging test
- run.checkFlows( main, minFlowCount=minBeforeFlow )
- run.pingAll( main, dumpflows=False )
- run.addHostCfg( main )
- run.checkFlows( main, minFlowCount=minAfterFlow, dumpflows=False )
- run.pingAll( main )
- if killOnosAndDeleteCfg:
- switch = self.topo[ Topo ][ 0 ] + self.topo[ Topo ][ 1 ]
- link = ( self.topo[ Topo ][ 0 ] + self.topo[ Topo ][ 1 ] ) * self.topo[ Topo ][ 0 ]
- self.killAndDelete( main, caseNum, numNodes, minBeforeFlow, switch, link )
- # 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
- if hasattr( main, 'Mininet1' ):
- run.cleanup( main )
- else:
- # TODO: disconnect TestON from the physical network
- pass
+ main.cfgName = Topo
+ main.Cluster.setRunningNode( numNodes )
+ run.installOnos( main )
+ run.loadJson( main )
+ run.loadChart( main )
+ run.startMininet( main, 'cord_fabric.py',
+ args=self.topo[ Topo ][ 2 ] )
+ # pre-configured routing and bridging test
+ run.checkFlows( main, minFlowCount=minBeforeFlow )
+ run.pingAll( main, dumpflows=False )
+ run.addHostCfg( main )
+ run.checkFlows( main, minFlowCount=minAfterFlow, dumpflows=False )
+ run.pingAll( main )
+ if killOnosAndDeleteCfg:
+ switch = self.topo[ Topo ][ 0 ] + self.topo[ Topo ][ 1 ]
+ link = ( self.topo[ Topo ][ 0 ] + self.topo[ Topo ][ 1 ] ) * self.topo[ Topo ][ 0 ]
+ self.killAndDelete( main, caseNum, numNodes, minBeforeFlow, switch, link )
+ # 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
+ if hasattr( main, 'Mininet1' ):
+ run.cleanup( main )
+ else:
+ # TODO: disconnect TestON from the physical network
+ pass
+ except Exception as e:
+ main.log.exception( "Error in runTest" )
+ main.skipCase( result="FAIL", msg=e )
def killAndDelete( self, main, caseNum, numNodes, minBeforeFlow, switch, link ):
run.killOnos( main, [ 0 ], '{}'.format( switch ), '{}'.format( link ), '{}'.format( numNodes - 1 ) )