Fix old SegmentRouting tests
Change-Id: I1556ae785e106345c9398677c9c968cb9ebfea9e
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
index 23057dd..abe305e 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
@@ -18,7 +18,7 @@
<ENV>
<cellName>productionCell</cellName>
- <cellApps>drivers,segmentrouting,openflow-base,netcfghostprovider,netcfglinksprovider</cellApps>
+ <cellApps>drivers,segmentrouting,openflow,netcfghostprovider,netcfglinksprovider</cellApps>
</ENV>
<GIT>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.py b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.py
index ce3020c..0e8844a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.py
@@ -48,11 +48,11 @@
run.startMininet( main, 'cord_fabric.py' )
# pre-configured routing and bridging test
run.checkFlows( main, minFlowCount=116 )
- run.pingAll( main, "CASE1" )
+ run.pingAll( main )
run.killOnos( main, [ 0, 1, 2 ], '4', '8', '0' )
run.pingAll( main, 'CASE1_Failure', dumpflows=False )
run.recoverOnos( main, [ 0, 1, 2 ], '4', '8', '3' )
- run.checkFlows( main, minFlowCount=116 )
+ run.checkFlows( main, minFlowCount=116, tag='CASE1_Failure' )
run.pingAll( main, 'CASE1_Failure' )
# TODO Dynamic config of hosts in subnet
# TODO Dynamic config of host not in subnet
@@ -81,11 +81,11 @@
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.pingAll( main )
run.killOnos( main, [ 0, 1, 2 ], '8', '32', '0' )
run.pingAll( main, 'CASE2_Failure', dumpflows=False )
run.recoverOnos( main, [ 0, 1, 2 ], '8', '32', '3' )
- run.checkFlows( main, minFlowCount=350 )
+ run.checkFlows( main, minFlowCount=350, tag='CASE2_Failure' )
run.pingAll( main, 'CASE3_Recovery' )
# TODO Dynamic config of hosts in subnet
# TODO Dynamic config of host not in subnet
@@ -114,11 +114,11 @@
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.pingAll( main )
run.killOnos( main, [ 0, 1, 2 ], '1', '0', '0' )
run.pingAll( main, 'CASE3_Failure', dumpflows=False )
run.recoverOnos( main, [ 0, 1, 2 ], '1', '0', '3' )
- run.checkFlows( main, minFlowCount=15 )
+ run.checkFlows( main, minFlowCount=15, tag='CASE3_Failure' )
run.pingAll( main, 'CASE3_Failure' )
# TODO Dynamic config of hosts in subnet
# TODO Dynamic config of host not in subnet
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.topo b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.topo
index f6661f8..5c4cc02 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.topo
@@ -9,7 +9,7 @@
<connect_order>1</connect_order>
<COMPONENTS>
<cluster_name></cluster_name> # Used as a prefix for cluster components. Defaults to 'ONOS'
- <diff_clihost>True</diff_clihost> # if it has different host other than localhost for CLI. True or empty. OC# will be used if True.
+ <diff_clihost></diff_clihost> # if it has different host other than localhost for CLI. True or empty. OC# will be used if True.
<karaf_username></karaf_username>
<karaf_password></karaf_password>
<web_user></web_user>