Fix old SegmentRouting tests
Change-Id: I1556ae785e106345c9398677c9c968cb9ebfea9e
diff --git a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.params b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.params
index a5d4811..ea3112c 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.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/SRSwitchFailure/SRSwitchFailure.py b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.py
index d0d79c8..1d013a0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.py
@@ -58,7 +58,7 @@
run.killSwitch( main, switch, switches='3', links='4' )
run.pingAll( main, "CASE1_Failure" )
run.recoverSwitch( main, switch, switches='4', links='8' )
- run.checkFlows( main, minFlowCount=116 )
+ 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
@@ -95,7 +95,7 @@
time.sleep( main.switchSleep )
run.pingAll( main, "CASE2_Failure" )
run.recoverSwitch( main, switch, switches='8', links='32' )
- run.checkFlows( main, minFlowCount=350 )
+ 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
@@ -128,10 +128,10 @@
# switch failure
switch = main.params[ 'kill' ][ 'switch' ]
run.killSwitch( main, switch, switches='3', links='4' )
- run.pingAll( main, "CASE3_Failure" )
+ run.pingAll( main, "CASE4_Failure" )
run.recoverSwitch( main, switch, switches='4', links='8' )
- run.checkFlows( main, minFlowCount=116 )
- run.pingAll( main, "CASE3_Recovery" )
+ run.checkFlows( main, minFlowCount=116, tag="CASE4_Recovery" )
+ run.pingAll( main, "CASE4_Recovery" )
# TODO Dynamic config of hosts in subnet
# TODO Dynamic config of host not in subnet
# TODO Dynamic config of vlan xconnect
@@ -165,10 +165,10 @@
switch = main.params[ 'kill' ][ 'switch' ]
run.killSwitch( main, switch, switches='7', links='24' )
time.sleep( main.switchSleep )
- run.pingAll( main, "CASE4_Failure" )
+ run.pingAll( main, "CASE5_Failure" )
run.recoverSwitch( main, switch, switches='8', links='32' )
- run.checkFlows( main, minFlowCount=350 )
- run.pingAll( main, "CASE4_Recovery" )
+ run.checkFlows( main, minFlowCount=350, tag="CASE5_Recovery" )
+ run.pingAll( main, "CASE5_Recovery" )
# TODO Dynamic config of hosts in subnet
# TODO Dynamic config of host not in subnet
# TODO preconfigured xconnect
diff --git a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.topo b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.topo
index ee6ce56..67a973e 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRSwitchFailure/SRSwitchFailure.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 for True.
+ <diff_clihost></diff_clihost> # if it has different host other than localhost for CLI. True or empty. OC# will be used for True.
<karaf_username></karaf_username>
<karaf_password></karaf_password>
<web_user></web_user>