[ONOS-7260]: Adding error/exception handling to the R Scripts.
Change-Id: Id12e1effb9041079b57242ae35a64caaa47ef19b
diff --git a/TestON/JenkinsFile/scripts/SCPFscaleTopo.R b/TestON/JenkinsFile/scripts/SCPFscaleTopo.R
index fdb39e4..e69a383 100644
--- a/TestON/JenkinsFile/scripts/SCPFscaleTopo.R
+++ b/TestON/JenkinsFile/scripts/SCPFscaleTopo.R
@@ -65,7 +65,7 @@
"<directory-to-save-graphs>",
sep=" ") )
- q() # basically exit(), but in R
+ quit( status = 1 ) # basically exit(), but in R
}
# -----------------
@@ -126,9 +126,21 @@
# ------------
print( "Sorting data." )
-avgs <- c( fileData[ 'last_role_request_to_last_topology' ],
- fileData[ 'last_connection_to_last_role_request' ],
- fileData[ 'first_connection_to_last_connection' ] )
+
+requiredColumns <- c( "last_role_request_to_last_topology", "last_connection_to_last_role_request", "first_connection_to_last_connection" )
+
+tryCatch( avgs <- c( fileData[ requiredColumns] ),
+ error = function( e ) {
+ print( "[ERROR] One or more expected columns are missing from the data. Please check that the data and SQL command are valid, then try again." )
+ print( "Required columns: " )
+ print( requiredColumns )
+ print( "Actual columns: " )
+ print( names( fileData ) )
+ print( "Error dump:" )
+ print( e )
+ quit( status = 1 )
+ }
+ )
# --------------------
# Construct Data Frame
@@ -238,9 +250,16 @@
print( paste( "Saving bar chart to", outputFile ) )
-ggsave( outputFile,
- width = imageWidth,
- height = imageHeight,
- dpi = imageDPI )
+tryCatch( ggsave( outputFile,
+ width = imageWidth,
+ height = imageHeight,
+ dpi = imageDPI ),
+ error = function( e ){
+ print( "[ERROR] There was a problem saving the graph due to a graph formatting exception. Error dump:" )
+ print( e )
+ quit( status = 1 )
+ }
+ )
print( paste( "[SUCCESS] Successfully wrote bar chart out to", outputFile ) )
+quit( status = 0 )