[ONOS-7475] Refactoring SR tests
Change-Id: I10e51fcb8b416167e6a338e9030933162640af89
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
index abe305e..05222f0 100755
--- a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
@@ -13,6 +13,8 @@
</SCALE>
<DEPENDENCY>
+ <useCommonConf>True</useCommonConf>
+ <useCommonTopo>True</useCommonTopo>
<topology>cord_fabric.py</topology>
</DEPENDENCY>
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.py b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.py
index 0e2b135..a2fca03 100644
--- a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.py
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.py
@@ -36,30 +36,17 @@
Induce ONOS Failure
Pingall
"""
- description = "ONOS Failure test with 2x2 Leaf-spine "
- main.case( description )
- from tests.USECASE.SegmentRouting.dependencies.Testcaselib import \
- Testcaselib as run
- if not hasattr( main, 'apps' ):
- run.initTest( main )
- main.cfgName = '2x2'
- main.Cluster.setRunningNode( 3 )
- run.installOnos( main )
- run.startMininet( main, 'cord_fabric.py' )
- # pre-configured routing and bridging test
- run.checkFlows( main, minFlowCount=116 )
- run.pingAll( main )
- run.killOnos( main, [ 0 ], '4', '8', '2' )
- run.pingAll( main, 'CASE1_Failure' )
- run.recoverOnos( main, [ 0 ], '4', '8', '3' )
- run.checkFlows( main, minFlowCount=116, tag='CASE1_Recovery' )
- run.pingAll( main, 'CASE1_Recovery' )
- # 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
- run.cleanup( main )
+ try:
+ from tests.USECASE.SegmentRouting.SROnosFailure.dependencies.SROnosFailureFuncs import SROnosFailureFuncs
+ except ImportError:
+ main.log.error( "SRClusterRestartFuncs not found. Exiting the test" )
+ main.cleanAndExit()
+ try:
+ main.funcs
+ except ( NameError, AttributeError ):
+ main.funcs = SROnosFailureFuncs()
+ main.funcs.runTest( main, 1, 3,
+ '2x2', 116 )
def CASE2( self, main ):
"""
@@ -69,30 +56,17 @@
Induce ONOS Failure
Pingall
"""
- description = "ONOS Failure test with 4x4 Leaf-spine "
- main.case( description )
- from tests.USECASE.SegmentRouting.dependencies.Testcaselib import \
- Testcaselib as run
- if not hasattr( main, 'apps' ):
- run.initTest( main )
- main.cfgName = '4x4'
- main.Cluster.setRunningNode( 3 )
- run.installOnos( main )
- run.startMininet( main, 'cord_fabric.py', args="--leaf=4 --spine=4" )
- # pre-configured routing and bridging test
- run.checkFlows( main, minFlowCount=350 )
- run.pingAll( main, 'CASE2' )
- run.killOnos( main, [ 0 ], '8', '32', '2' )
- run.pingAll( main, 'CASE2_Failure' )
- run.recoverOnos( main, [ 0 ], '8', '32', '3' )
- run.checkFlows( main, minFlowCount=350, tag='CASE2_Recovery' )
- run.pingAll( main, 'CASE2_Recovery' )
- # 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
- run.cleanup( main )
+ try:
+ from tests.USECASE.SegmentRouting.SROnosFailure.dependencies.SROnosFailureFuncs import SROnosFailureFuncs
+ except ImportError:
+ main.log.error( "SRClusterRestartFuncs not found. Exiting the test" )
+ main.cleanAndExit()
+ try:
+ main.funcs
+ except ( NameError, AttributeError ):
+ main.funcs = SROnosFailureFuncs()
+ main.funcs.runTest( main, 2, 3,
+ '4x4', 350 )
def CASE3( self, main ):
"""
@@ -102,27 +76,14 @@
Induce ONOS Failure
Pingall
"""
- description = "ONOS Failure test with single switch "
- main.case( description )
- from tests.USECASE.SegmentRouting.dependencies.Testcaselib import \
- Testcaselib as run
- if not hasattr( main, 'apps' ):
- run.initTest( main )
- main.cfgName = '0x1'
- main.Cluster.setRunningNode( 3 )
- run.installOnos( main )
- run.startMininet( main, 'cord_fabric.py', args="--leaf=1 --spine=0" )
- # pre-configured routing and bridging test
- run.checkFlows( main, minFlowCount=15 )
- run.pingAll( main, 'CASE3' )
- run.killOnos( main, [ 0 ], '1', '0', '2' )
- run.pingAll( main, 'CASE3_Failure' )
- run.recoverOnos( main, [ 0 ], '1', '0', '3' )
- run.checkFlows( main, minFlowCount=15, tag='CASE3_Recovery' )
- run.pingAll( main, 'CASE3_Recovery' )
- # 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
- run.cleanup( main )
+ try:
+ from tests.USECASE.SegmentRouting.SROnosFailure.dependencies.SROnosFailureFuncs import SROnosFailureFuncs
+ except ImportError:
+ main.log.error( "SRClusterRestartFuncs not found. Exiting the test" )
+ main.cleanAndExit()
+ try:
+ main.funcs
+ except ( NameError, AttributeError ):
+ main.funcs = SROnosFailureFuncs()
+ main.funcs.runTest( main, 3, 3,
+ '0x1', 15 )
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/SROnosFailureFuncs.py b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/SROnosFailureFuncs.py
new file mode 100644
index 0000000..f130ff2
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/SROnosFailureFuncs.py
@@ -0,0 +1,68 @@
+"""
+Copyright 2017 Open Networking Foundation ( ONF )
+
+Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
+the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
+or the System Testing Guide page at <https://wiki.onosproject.org/x/WYQg>
+
+ TestON is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ ( at your option ) any later version.
+
+ TestON is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with TestON. If not, see <http://www.gnu.org/licenses/>.
+"""
+
+from tests.USECASE.SegmentRouting.dependencies.Testcaselib import Testcaselib as run
+
+class SROnosFailureFuncs():
+
+ def __init__( self ):
+ self.default = ''
+ self.topo = dict()
+ self.topo[ '0x1' ] = ( 0, 1, '--leaf=1 --spine=0', 'single switch' )
+ self.topo[ '2x2' ] = ( 2, 2, '', '2x2 Leaf-spine' )
+ self.topo[ '4x4' ] = ( 4, 4, '--leaf=4 --spine=4', '4x4 Leaf-spine' )
+
+ def runTest( self, main, caseNum, numNodes, Topo, minFlow, killList=[ 0 ] ):
+ description = "ONOS Failure test with " + self.topo[ Topo ][ 3 ]
+ 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, 'CASE{}'.format( caseNum ) )
+ 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, '{}'.format( numNodes - 1 ) )
+ run.pingAll( main, 'CASE{}_Failure'.format( caseNum ) )
+ run.recoverOnos( main, killList, switch, link, '{}'.format( numNodes ) )
+ run.checkFlows( main, minFlowCount=minFlow, tag='CASE{}_Recovery'.format( caseNum ) )
+ run.pingAll( main, 'CASE{}_Recovery'.format( caseNum ) )
+ # 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
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/__init__.py b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/__init__.py