var platform;\r
var req,res;\r
var preloadVersion; // 1607, 1610, etc...\r
+var proc_error = false;\r
+var filename;\r
\r
puts = helpers.puts;\r
putd = helpers.putd;\r
\r
network.go = function(lreq,lres,cb,dir) {\r
puts("Processing NETWORK workbook");\r
+ proc_error = false;\r
req = lreq;\r
res = lres;\r
callback = cb;\r
helpers.readCsv(indir, newFileName, gotGeneral);\r
}\r
else {\r
- callback(csvFilename + ' file is missing from upload.');\r
+ puts('general file is missing from upload.');\r
+ proc_error=true;\r
}\r
}\r
\r
if (err) {\r
puts("\nError!");\r
putd(err);\r
- callback('General.csv file is missing from upload.');\r
- return;\r
+ proc_error=true;\r
+ callback('General.csv file is missing from upload.');\r
+ return;\r
}\r
csvGeneral = jsonObj;\r
puts("\nRead this: ");\r
helpers.readCsv(indir, newFileName, gotSubnets);\r
}\r
else {\r
+ puts('subnets file is missing from upload.');\r
+ proc_error=true;\r
callback(csvFilename + ' file is missing from upload.');\r
+ return;\r
}\r
}\r
\r
if (err) {\r
puts("\nError!");\r
putd(err);\r
+ proc_error=true;\r
callback('Subnets.csv file is missing from upload.');\r
return;\r
}\r
helpers.readCsv(indir, newFileName, gotVpnBindings);\r
}\r
else {\r
+ puts('vnp-bindings file is missing from upload.');\r
+ proc_error=true;\r
callback(csvFilename + ' file is missing from upload.');\r
+ return;\r
}\r
}\r
\r
if (err) {\r
puts("\nError!");\r
putd(err);\r
+ proc_error=true;\r
callback('VPN-Bindings.csv file is missing from upload.');\r
return;\r
}\r
helpers.readCsv(indir, newFileName, gotPolicies);\r
}\r
else {\r
+ puts('policies file is missing from upload.');\r
+ proc_error=true;\r
callback(csvFilename + ' file is missing from upload.');\r
+ return;\r
}\r
}\r
\r
if (err) {\r
puts("\nError!");\r
putd(err);\r
+ proc_error=true;\r
callback('Policies.csv file is missing from upload.');\r
return;\r
}\r
helpers.readCsv(indir, newFileName, gotNetRoutes);\r
}\r
else {\r
+ puts('network-routes file is missing from upload.');\r
+ proc_error=true;\r
callback(csvFilename + ' file is missing from upload.');\r
+ return;\r
}\r
}\r
\r
if (err) {\r
puts("\nError!");\r
putd(err);\r
+ proc_error=true;\r
callback('Network-Routes.csv file is missing from upload.');\r
return;\r
}\r
processPolicies();\r
processNetRoutes();\r
assembleJson();\r
+ outputJson();\r
+\r
+ puts('proc_error=');\r
+ putd(proc_error);\r
+ if ( proc_error ){\r
+ puts('callback with failure');\r
+ callback('Error was encountered processing upload.');\r
+ return;\r
+ }\r
+ else\r
+ {\r
+ puts('callback with success');\r
+ callback(null, finalJson, filename);\r
+ return;\r
+ }\r
}\r
\r
// ASSEMBLE AND OUTPUT RESULTS\r
\r
finalJson = {"input": networkInput};\r
\r
- outputJson();\r
+ //outputJson();\r
}\r
\r
function outputJson() {\r
puts(JSON.stringify(finalJson,null,2));\r
puts("\n");\r
puts("\n");\r
- var unixTime, fullpath_filename, filename;\r
+ var unixTime, fullpath_filename;\r
unixTime = moment().unix();\r
if (platform=='portal') {\r
fullpath_filename = process.cwd() + "/uploads/" + unixTime + ".net_worksheet.json";\r
filename = "output.json." + unixTime;\r
}\r
helpers.writeOutput(req, fullpath_filename, JSON.stringify(finalJson,null,2), callback);\r
- callback(null, finalJson, filename);\r
+ //callback(null, finalJson, filename);\r
}\r
\r
\r
\r
if ( (preloadVersion!='1607') && (preloadVersion!='1610') ) {\r
puts("\nError - incorrect version of preload worksheet.");\r
- callback('Error - incorrect version of preload worksheet.');\r
+ proc_error=true;\r
+ //callback('Error - incorrect version of preload worksheet.');\r
+ return;\r
}\r
\r
rawJson['network-name'] = getParam(csvGeneral, 'field2', 'network-name', 'field3');\r