Working on uploading karaf logs to the Jenkins
Change-Id: Icdc5398cb5fc0eff73e778fa772a7cfdba91f93f
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py b/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py
index f54de7c..814667c 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py
@@ -50,6 +50,7 @@
( description, topo[ topology ][ 3 ], onosNodes, 's' if onosNodes > 1 else '' ) )
main.cfgName = 'CASE%01d%01d' % ( test_idx / 10, ( ( test_idx - 1 ) % 10 ) % 4 + 1 )
+ main.resultFileName = 'CASE%02d' % test_idx
main.Cluster.setRunningNode( onosNodes )
run.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
mininet_args = ' --spine=%d --leaf=%d' % ( topo[ topology ][ 0 ], topo[ topology ][ 1 ] )
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index 2e0ae48..d6dd287 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -231,11 +231,11 @@
main.ONOSbench.dumpONOSCmd( main.Cluster.active( 0 ).ipAddress,
"flows",
main.logdir,
- "flowsBefore" + main.cfgName )
+ "flowsBefore" + main.resultFileName )
main.ONOSbench.dumpONOSCmd( main.Cluster.active( 0 ).ipAddress,
"groups",
main.logdir,
- "groupsBefore" + main.cfgName )
+ "groupsBefore" + main.resultFileName )
@staticmethod
def checkFlowsByDpid( main, dpid, minFlowCount, sleep=10 ):
@@ -408,7 +408,7 @@
main.utils.mininetCleanup( main.Mininet1 )
- main.utils.copyKarafLog( main.cfgName )
+ main.utils.copyKarafLog( main.resultFileName + "_" )
for ctrl in main.Cluster.active():
main.ONOSbench.onosStop( ctrl.ipAddress )