Skip to content

rebase with dev #1014

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 2 commits into from
Dec 6, 2016
Merged

rebase with dev #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b0f0b6
resolved conflicts
udeshrl Dec 5, 2016
ba525af
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Dec 5, 2016
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
4 changes: 0 additions & 4 deletions server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) {
var self = this;
var domainName = launchParams.domainName;
logger.debug("launchParams------------->", JSON.stringify(launchParams));
callback({
message: "db-error"
});
return;
VMImage.getImageById(self.imageId, function (err, anImage) {
if (err) {
logger.error(err);
Expand Down
109 changes: 60 additions & 49 deletions server/app/routes/v1.0/routes_blueprints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ var fs = require('fs');
var blueprintService = require('_pr/services/blueprintService.js');
var auditTrailService = require('_pr/services/auditTrailService');

module.exports.setRoutes = function(app, sessionVerificationFunc) {
module.exports.setRoutes = function (app, sessionVerificationFunc) {
app.all('/blueprints/*', sessionVerificationFunc);

app.get('/blueprints', function(req, res) {
app.get('/blueprints', function (req, res) {
var queryObj = {
serviceDeliveryCheck: req.query.serviceDeliveryCheck === "true" ? true : false,
actionStatus: req.query.actionStatus
}
blueprintService.getAllServiceDeliveryBlueprint(queryObj, function(err, data) {
blueprintService.getAllServiceDeliveryBlueprint(queryObj, function (err, data) {
if (err) {
return res.status(500).send(err);
} else {
return res.status(200).send(data);
}
})
});
app.delete('/blueprints/serviceDelivery/:blueprintId', function(req, res) {
blueprintService.deleteServiceDeliveryBlueprint(req.params.blueprintId, function(err, data) {
app.delete('/blueprints/serviceDelivery/:blueprintId', function (req, res) {
blueprintService.deleteServiceDeliveryBlueprint(req.params.blueprintId, function (err, data) {
if (err) {
logger.error("Failed to delete ", err);
res.send(500, errorResponses.db.error);
Expand All @@ -54,15 +54,15 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {


// This post() Not in use
app.post('/blueprints', function(req, res) {
app.post('/blueprints', function (req, res) {
logger.debug("Enter post() for /blueprints");
//validating if user has permission to save a blueprint
logger.debug('Verifying User permission set');
var user = req.session.user;
var category = 'blueprints';
var permissionto = 'create';
var blueprintType = req.body.blueprintData.blueprintType;
usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
if (!err) {
logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
if (data == false) {
Expand Down Expand Up @@ -154,7 +154,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
return;
}

Blueprints.createNew(blueprintData, function(err, data) {
Blueprints.createNew(blueprintData, function (err, data) {
if (err) {
logger.error('error occured while saving blueorint', err);
res.send(500, {
Expand All @@ -167,9 +167,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
logger.debug("Exit post() for /blueprints");
});
});
app.get('/blueprints/:blueprintId', function(req, res) {
app.get('/blueprints/:blueprintId', function (req, res) {

blueprintService.getById(req.params.blueprintId, function(err, blueprint) {
blueprintService.getById(req.params.blueprintId, function (err, blueprint) {
if (err == 404) {
res.status(404).send({
message: "Blueprint not found."
Expand All @@ -186,8 +186,8 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
});

});
app.get('/blueprints/:blueprintId/blueprintInfo', function(req, res) {
Blueprints.getBlueprintInfoById(req.params.blueprintId, function(err, blueprintInfo) {
app.get('/blueprints/:blueprintId/blueprintInfo', function (req, res) {
Blueprints.getBlueprintInfoById(req.params.blueprintId, function (err, blueprintInfo) {
if (err) {
res.status(500).send({
code: 500,
Expand All @@ -199,7 +199,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
});

});
app.post('/blueprints/:blueprintId/update', function(req, res) {
app.post('/blueprints/:blueprintId/update', function (req, res) {
logger.debug("Enter /blueprints/%s/update", req.params.blueprintId);

if (req.session.user.rolename === 'Consumer') {
Expand All @@ -215,13 +215,13 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
//blueprintUpdateData.runlist.splice(0, 0, 'recipe[ohai]');


Blueprints.getById(req.params.blueprintId, function(err, blueprint) {
Blueprints.getById(req.params.blueprintId, function (err, blueprint) {
if (err) {
logger.error("Failed to get blueprint versions ", err);
res.send(500, errorResponses.db.error);
return;
}
blueprint.update(blueprintUpdateData, function(err, updatedBlueprint) {
blueprint.update(blueprintUpdateData, function (err, updatedBlueprint) {
if (err) {
logger.error("Failed to update blueprint ", err);
res.send(500, errorResponses.db.error);
Expand All @@ -242,10 +242,10 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {

}); // end app.post('/blueprints/:blueprintId/update' )

app.get('/blueprints/:blueprintId/versions/:version', function(req, res) {
app.get('/blueprints/:blueprintId/versions/:version', function (req, res) {
logger.debug("Enter /blueprints/%s/versions/%s", req.params.blueprintId, req.params.version);

Blueprints.getById(req.params.blueprintId, function(err, blueprint) {
Blueprints.getById(req.params.blueprintId, function (err, blueprint) {
if (err) {
logger.error("Failed to get blueprint versions ", err);
res.send(500, errorResponses.db.error);
Expand All @@ -261,10 +261,10 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {

});

app.get('/blueprints/:blueprintId', function(req, res) {
app.get('/blueprints/:blueprintId', function (req, res) {
logger.debug("Enter /blueprints/%s/versions/%s", req.params.blueprintId, req.params.version);

Blueprints.getById(req.params.blueprintId, function(err, blueprint) {
Blueprints.getById(req.params.blueprintId, function (err, blueprint) {
if (err) {
logger.error("Failed to get blueprint versions ", err);
res.send(500, errorResponses.db.error);
Expand All @@ -278,9 +278,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {

});

app.delete('/blueprints/:blueprintId', function(req, res) {
app.delete('/blueprints/:blueprintId', function (req, res) {
logger.debug("Enter /blueprints/delete/%s", req.params.blueprintId);
Blueprints.removeById(req.params.blueprintId, function(err, data) {
Blueprints.removeById(req.params.blueprintId, function (err, data) {
if (err) {
logger.error("Failed to delete blueprint ", err);
res.send(500, errorResponses.db.error);
Expand All @@ -292,11 +292,11 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
});
});

app.delete('/blueprints', function(req, res) {
app.delete('/blueprints', function (req, res) {
var blueprintIds = req.body.blueprints;
logger.debug("Enter /blueprints/delete/%s", req.body.blueprints);
if (blueprintIds.length > 0)
Blueprints.removeByIds(blueprintIds, function(err, data) {
Blueprints.removeByIds(blueprintIds, function (err, data) {
if (err) {
logger.error("Failed to delete blueprint ", err);
res.send(500, errorResponses.db.error);
Expand All @@ -308,7 +308,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
});
});

app.post('/blueprints/copy', function(req, res) {
app.post('/blueprints/copy', function (req, res) {
var orgid = req.body.orgid;
var buid = req.body.buid;
var projid = req.body.projid;
Expand All @@ -318,7 +318,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
res.send(500, 'Would require a ORG, BU and Project to copy');
return;
} else {
Blueprints.copyByIds(bluepirntIds, orgid, buid, projid, function(err, data) {
Blueprints.copyByIds(bluepirntIds, orgid, buid, projid, function (err, data) {
res.status('200').send(data);
return;
});
Expand All @@ -327,9 +327,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
});

//for testing
app.get('/blueprints/azure/tryssh/:ip', function(req, res) {
app.get('/blueprints/azure/tryssh/:ip', function (req, res) {
var azureCloud = new AzureCloud();
azureCloud.trysshoninstance('Windows', req.params["ip"], 'testing', 'testing', function(err, data) {
azureCloud.trysshoninstance('Windows', req.params["ip"], 'testing', 'testing', function (err, data) {
logger.debug('Output:', data);
if (!err) {
logger.debug('about to send response');
Expand All @@ -346,7 +346,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
});


app.get('/blueprints/:blueprintId/launch', function(req, res) {
app.get('/blueprints/:blueprintId/launch', function (req, res) {
logger.debug("Enter /blueprints/%s/launch -- ", req.params.blueprintId);
//verifying if the user has permission
logger.debug('Verifying User permission set for execute.');
Expand All @@ -359,7 +359,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
var user = req.session.user;
var category = 'blueprints';
var permissionto = 'execute';
usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
if (!err) {
logger.debug('Returned from haspermission : launch ' + data + ' , Condition State : ' + (data == false));
if (data == false) {
Expand All @@ -368,7 +368,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
return;
} else {

Blueprints.getById(req.params.blueprintId, function(err, blueprint) {
Blueprints.getById(req.params.blueprintId, function (err, blueprint) {
if (err) {
logger.error('Failed to getBlueprint. Error = ', err);
res.send(500, errorResponses.db.error);
Expand All @@ -382,6 +382,17 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
}
var stackName = null;
var domainName = null;
var blueprintLaunchCount = 0;
if (blueprint.executionCount) {
blueprintLaunchCount = blueprint.executionCount + 1;
} else {
blueprintLaunchCount = 1;
}
Blueprints.updateBlueprintExecutionCount(blueprint._id, blueprintLaunchCount, function (err, data) {
if (err) {
logger.error("Error while updating Blueprint Execution Count");
}
});
if (blueprint.blueprintType === 'aws_cf' || blueprint.blueprintType === 'azure_arm') {
stackName = req.query.stackName;
if (!stackName) {
Expand All @@ -400,20 +411,20 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
return;
}
}
var monitorId = null;
if(req.query.monitorId){
monitorId = req.query.monitorId;
}
var launchParams = {
envId: req.query.envId,
ver: req.query.version,
stackName: stackName,
domainName: domainName,
sessionUser: req.session.user.cn,
tagServer: req.query.tagServer,
monitorId: monitorId,
auditTrailId: null
var monitorId = null;
if (req.query.monitorId) {
monitorId = req.query.monitorId;
}

var launchParams = {
envId: req.query.envId,
ver: req.query.version,
stackName: stackName,
domainName: domainName,
sessionUser: req.session.user.cn,
tagServer: req.query.tagServer,
monitorId: monitorId,
auditTrailId: null
};
if (blueprint.serviceDeliveryCheck === true) {
var actionObj = {
Expand All @@ -433,12 +444,12 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
nodeIdsWithActionLog: []
};
blueprint.envId = req.query.envId;
auditTrailService.insertAuditTrail(blueprint, auditTrailObj, actionObj, function(err, data) {
auditTrailService.insertAuditTrail(blueprint, auditTrailObj, actionObj, function (err, data) {
if (err) {
logger.error(err);
}
launchParams.auditTrailId = data._id;
blueprint.launch(launchParams, function(err, launchData) {
blueprint.launch(launchParams, function (err, launchData) {
if (err) {
res.status(500).send({
message: "Server Behaved Unexpectedly"
Expand All @@ -449,7 +460,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
});
});
} else {
blueprint.launch(launchParams, function(err, launchData) {
blueprint.launch(launchParams, function (err, launchData) {
if (err) {
res.status(500).send({
message: "Server Behaved Unexpectedly"
Expand Down Expand Up @@ -550,7 +561,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
**/


app.get('/blueprints/organization/:orgId/businessgroup/:bgId/project/:projectId', function(req, res) {
app.get('/blueprints/organization/:orgId/businessgroup/:bgId/project/:projectId', function (req, res) {
var orgId = req.params.orgId;
var bgId = req.params.bgId;
var projectId = req.params.projectId;
Expand All @@ -565,7 +576,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
jsonData['bgId'] = bgId;
jsonData['projectId'] = projectId;

Blueprints.getBlueprintsByOrgBgProject(jsonData, function(err, blueprints) {
Blueprints.getBlueprintsByOrgBgProject(jsonData, function (err, blueprints) {
if (err) {
res.status(500).send({
code: 500,
Expand Down
Loading