From e67e0abab8f1067d6725227695198879abfb6c19 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 16:26:44 +0530 Subject: [PATCH 1/2] BOTs Scheduler Issue --- server/app/services/botsService.js | 15 +++++++++++---- server/app/services/schedulerService.js | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 5677b1069..a3dfaf218 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -327,7 +327,10 @@ botsService.getPerticularBotsHistory = function getPerticularBotsHistory(botId,h botsService.executeBots = function executeBots(botId,reqBody,callback){ async.waterfall([ function(next){ - if(reqBody.paramOptions.scriptParams){ + if(typeof reqBody !== 'undefined' && reqBody !== null + && reqBody.paramOptions + && reqBody.paramOptions.scriptParams + && reqBody.paramOptions.scriptParams !== null){ encryptedParam(reqBody.paramOptions.scriptParams,next); }else{ next(null,[]); @@ -362,9 +365,13 @@ botsService.executeBots = function executeBots(botId,reqBody,callback){ function(bots,next){ if(bots.length > 0){ if(bots[0].botLinkedCategory === 'Task'){ - taskService.executeTask(botId,reqBody.userName ? reqBody.userName : 'system',reqBody.hostProtocol ? reqBody.hostProtocol : 'undefined', - reqBody.choiceParam ? reqBody.choiceParam : 'undefined',reqBody.appData ? reqBody.appData : 'undefined',reqBody.paramOptions ? reqBody.paramOptions : 'undefined', - reqBody.tagServer ? reqBody.tagServer : 'undefined', callback); + if(typeof reqBody === 'undefined') { + taskService.executeTask(botId, 'system', 'undefined', 'undefined', 'undefined', 'undefined', 'undefined', callback); + }else{ + taskService.executeTask(botId, reqBody.userName ? reqBody.userName : 'system', reqBody.hostProtocol ? reqBody.hostProtocol : 'undefined', + reqBody.choiceParam ? reqBody.choiceParam : 'undefined', reqBody.appData ? reqBody.appData : 'undefined', reqBody.paramOptions ? reqBody.paramOptions : 'undefined', + reqBody.tagServer ? reqBody.tagServer : 'undefined', callback); + } }else{ blueprintService.launch(botId,reqBody,callback) } diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index c3aecfbde..393c5f0a5 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -159,7 +159,7 @@ schedulerService.executeScheduledBots = function executeScheduledBots(bots,callb logger.error("Error in updating cron job Ids. "+err); } }) - botsService.executeBots(bots.botId,bots.botConfig,function(err, historyData) { + botsService.executeBots(bots.botId,bots.runTimeParams,function(err, historyData) { if (err) { logger.error("Failed to execute Bots.", err); return; From 6d5a939f09a632c859a293f5baf1309a0d680570 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 4 Jan 2017 16:39:13 +0530 Subject: [PATCH 2/2] CAT-2615 Fixed --- .../dashboard/design/services/blueprintCreateServices.js | 2 +- server/app/routes/v1.0/routes_d4dMasters.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js b/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js index d09acea38..e9f3595b8 100755 --- a/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js +++ b/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js @@ -294,7 +294,7 @@ //listing down docker templates blueprintServices.getDockerTemplates = function(dockerTemplate,repoName) { var params = { - url: '/d4dmasters/getdockertags/' + encodeURIComponent(dockerTemplate) + '/' + repoName, + url: '/d4dmasters/getdockertags?repopath='+encodeURIComponent(dockerTemplate)+'&dockerreponame=' + repoName, inlineLoader:true }; return genericServices.promiseGet(params); diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 3940c0647..0faf7e75b 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -159,12 +159,12 @@ module.exports.setRoutes = function (app, sessionVerification) { }); }); //d4dmasters/getdockertags/centos/null - app.get('/d4dmasters/getdockertags/:repopath/:dockerreponame', function (req, res) { - logger.debug("Enter get() for /d4dmasters/getdockertags/%s/%s", req.params.repopath, req.params.dockerreponame); + app.get('/d4dmasters/getdockertags', function (req, res) { + logger.debug("Enter get() for /d4dmasters/getdockertags/%s/%s", req.query.repopath, req.query.dockerreponame); //fetch the username and password from //Need to populate dockerrowid in template card. - done logger.debug('hit getdockertags'); - configmgmtDao.getMasterRow(18, 'dockerreponame', req.params.dockerreponame, function (err, data) { + configmgmtDao.getMasterRow(18, 'dockerreponame', req.query.dockerreponame, function (err, data) { if (!err) { logger.debug('data rcvd:' + data == ''); logger.debug(data); @@ -188,7 +188,7 @@ module.exports.setRoutes = function (app, sessionVerification) { // Tried with http rest call but api did not working from docker side, so commenting and keeping old code: Gobinda - var dockerUrl = 'https://registry.hub.docker.com/v1/repositories/' + req.params.repopath.replace(/\$\$/g, '/') + '/tags'; + var dockerUrl = 'https://registry.hub.docker.com/v1/repositories/' + req.query.repopath.replace(/\$\$/g, '/') + '/tags'; //https://index.docker.io/v1/repositories/ logger.debug('dockerurl:' + dockerUrl); client.registerMethod("jsonMethod", dockerUrl, "GET");