Skip to content

CAT-2615 Fixed #1109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 4, 2017
Merged

CAT-2615 Fixed #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84d1212
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 4, 2017
e67e0ab
BOTs Scheduler Issue
Durgesh1988 Jan 4, 2017
9e52b1a
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 4, 2017
6d5a939
CAT-2615 Fixed
Durgesh1988 Jan 4, 2017
a05812f
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions server/app/routes/v1.0/routes_d4dMasters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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");
Expand Down
15 changes: 11 additions & 4 deletions server/app/services/botsService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,[]);
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion server/app/services/schedulerService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down