Merge "[ONOS-7216] Creating a test for onos-form-cluster functionality"
diff --git a/TestON/JenkinsFile/scripts/SCPFIntentInstallWithdrawRerouteLat.R b/TestON/JenkinsFile/scripts/SCPFIntentInstallWithdrawRerouteLat.R
index 4a406cb..6c1a220 100644
--- a/TestON/JenkinsFile/scripts/SCPFIntentInstallWithdrawRerouteLat.R
+++ b/TestON/JenkinsFile/scripts/SCPFIntentInstallWithdrawRerouteLat.R
@@ -94,7 +94,7 @@
if ( args[ old_flow ] == "y" ){
errBarOutputFile <- paste( errBarOutputFile, "_OldFlow", sep="" )
chartTitle <- paste( chartTitle,
- "With Old Flow",
+ "With Eventually Consistent Flow Rule Store",
sep="\n" )
}
errBarOutputFile <- paste( errBarOutputFile,
diff --git a/TestON/JenkinsFile/scripts/SCPFLineGraph.R b/TestON/JenkinsFile/scripts/SCPFLineGraph.R
index 93b3060..3f78953 100644
--- a/TestON/JenkinsFile/scripts/SCPFLineGraph.R
+++ b/TestON/JenkinsFile/scripts/SCPFLineGraph.R
@@ -90,7 +90,7 @@
# Title of graph based on command line args.
title <- args[ graph_title ]
-title <- paste( title, if( args[ old_flow ] == "y" ) "\nWith Old Flow" else "" )
+title <- paste( title, if( args[ old_flow ] == "y" ) "\nWith Eventually Consistent Flow Rule Store" else "" )
print( "Creating graph filename." )
diff --git a/TestON/JenkinsFile/scripts/SCPFbatchFlowResp.R b/TestON/JenkinsFile/scripts/SCPFbatchFlowResp.R
index 19e4a1f..a2166c1 100644
--- a/TestON/JenkinsFile/scripts/SCPFbatchFlowResp.R
+++ b/TestON/JenkinsFile/scripts/SCPFbatchFlowResp.R
@@ -95,11 +95,11 @@
postChartTitle <- paste( "Single Bench Flow Latency - Post\n",
"Last 3 Builds",
- if( args[ old_flow ] == "y" ) " With Old Flow" else "",
+ if( args[ old_flow ] == "y" ) "\nWith Eventually Consistent Flow Rule Store" else "",
sep = "" )
delChartTitle <- paste( "Single Bench Flow Latency - Del\n",
"Last 3 Builds",
- if( args[ old_flow ] == "y" ) " With Old Flow" else "",
+ if( args[ old_flow ] == "y" ) "\nWith Eventually Consistent Flow Rule Store" else "",
sep = "" )
# ------------------
diff --git a/TestON/JenkinsFile/scripts/SCPFflowTp1g.R b/TestON/JenkinsFile/scripts/SCPFflowTp1g.R
index 140d5f8..9123085 100644
--- a/TestON/JenkinsFile/scripts/SCPFflowTp1g.R
+++ b/TestON/JenkinsFile/scripts/SCPFflowTp1g.R
@@ -104,7 +104,7 @@
}
if ( args[ old_flow ] == 'y' ){
fileOldFlowModifier <- "_OldFlow"
- chartTitle <- paste( chartTitle, "With Old Flow", sep="\n" )
+ chartTitle <- paste( chartTitle, "With Eventually Consistent Flow Rule Store", sep="\n" )
}
errBarOutputFile <- paste( args[ save_directory ],
args[ test_name ],
diff --git a/TestON/JenkinsFile/scripts/SCPFintentEventTp.R b/TestON/JenkinsFile/scripts/SCPFintentEventTp.R
index c7578f5..e9540f2 100644
--- a/TestON/JenkinsFile/scripts/SCPFintentEventTp.R
+++ b/TestON/JenkinsFile/scripts/SCPFintentEventTp.R
@@ -105,7 +105,7 @@
}
if ( args[ old_flow ] == 'y' ){
fileOldFlowModifier <- "_OldFlow"
- chartTitle <- paste( chartTitle, "With Old Flow", sep="\n" )
+ chartTitle <- paste( chartTitle, "With Eventually Consistent Flow Rule Store", sep="\n" )
}
errBarOutputFile <- paste( args[ save_directory ],
diff --git a/TestON/JenkinsFile/scripts/SCPFscalingMaxIntents.R b/TestON/JenkinsFile/scripts/SCPFscalingMaxIntents.R
index 130e2dd..aed27e5 100644
--- a/TestON/JenkinsFile/scripts/SCPFscalingMaxIntents.R
+++ b/TestON/JenkinsFile/scripts/SCPFscalingMaxIntents.R
@@ -89,7 +89,7 @@
fileOldFlowModifier <- ""
if ( args[ old_flow ] == 'y' ){
fileOldFlowModifier <- "_OldFlow"
- chartTitle <- paste( chartTitle, "With Old Flow", sep="\n" )
+ chartTitle <- paste( chartTitle, "With Eventually Consistent Flow Rule Store", sep="\n" )
}
outputFile <- paste( args[ save_directory ],
diff --git a/TestON/JenkinsFile/scripts/testCaseGraphGenerator.R b/TestON/JenkinsFile/scripts/testCaseGraphGenerator.R
index f8ec145..fb70d9c 100644
--- a/TestON/JenkinsFile/scripts/testCaseGraphGenerator.R
+++ b/TestON/JenkinsFile/scripts/testCaseGraphGenerator.R
@@ -236,7 +236,7 @@
theme_set( theme_grey( base_size = 26 ) ) # set the default text size of the graph.
xScaleConfig <- scale_x_continuous( breaks = dataFrame$iterative,
- label = dataFrame$Build )
+ label = dataFrame$build )
yScaleConfig <- scale_y_continuous( breaks = seq( 0, max( dataFrame$Tests ),
by = ceiling( max( dataFrame$Tests ) / 10 ) ) )