Fix old SegmentRouting tests
Change-Id: I1556ae785e106345c9398677c9c968cb9ebfea9e
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.params b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.params
index fba7e9f..fceb91a 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.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/SRDynamic/SRDynamic.py b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.py
index 1af681c..6a228f3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.py
@@ -54,7 +54,7 @@
run.pingAll( main, dumpflows=False, )
run.addHostCfg( main )
run.checkFlows( main, minFlowCount=140, dumpflows=False )
- run.pingAll( main, "CASE1" )
+ run.pingAll( main )
run.cleanup( main )
def CASE2( self, main ):
@@ -79,7 +79,7 @@
run.pingAll( main, dumpflows=False )
run.addHostCfg( main )
run.checkFlows( main, minFlowCount=380, dumpflows=False )
- run.pingAll( main, 'CASE2' )
+ run.pingAll( main )
run.cleanup( main )
def CASE3( self, main ):
@@ -104,7 +104,7 @@
run.pingAll( main, dumpflows=False )
run.addHostCfg( main )
run.checkFlows( main, minFlowCount=18, dumpflows=False )
- run.pingAll( main, 'CASE3' )
+ run.pingAll( main )
run.cleanup( main )
def CASE4( self, main ):
@@ -129,7 +129,7 @@
run.pingAll( main, dumpflows=False )
run.addHostCfg( main )
run.checkFlows( main, minFlowCount=140, dumpflows=False )
- run.pingAll( main, "CASE4" )
+ run.pingAll( main )
run.killOnos( main, [ 0 ], '4', '8', '2' )
run.delHostCfg( main )
run.checkFlows( main, minFlowCount=116, dumpflows=False )
@@ -158,7 +158,7 @@
run.pingAll( main, dumpflows=False )
run.addHostCfg( main )
run.checkFlows( main, minFlowCount=380, dumpflows=False )
- run.pingAll( main, 'CASE5' )
+ run.pingAll( main )
run.killOnos( main, [ 0 ], '8', '32', '2' )
run.delHostCfg( main )
run.checkFlows( main, minFlowCount=350, dumpflows=False )
@@ -187,7 +187,7 @@
run.pingAll( main, dumpflows=False )
run.addHostCfg( main )
run.checkFlows( main, minFlowCount=20, dumpflows=False )
- run.pingAll( main, 'CASE6' )
+ run.pingAll( main )
run.killOnos( main, [ 0 ], '1', '0', '2' )
run.delHostCfg( main )
run.checkFlows( main, minFlowCount=15, dumpflows=False )
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.topo b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.topo
index f6661f8..5c4cc02 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamic/SRDynamic.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>