diff options
author | Alex Shatov <alexs@att.com> | 2018-12-06 10:16:43 -0500 |
---|---|---|
committer | Alex Shatov <alexs@att.com> | 2018-12-06 10:16:43 -0500 |
commit | ca00a932eae5e706f01519612fce1015c9ff9d58 (patch) | |
tree | 796210ad1dfb8e4e717c06264f01fb64faa0fda6 /lib/policy.js | |
parent | 84d5646b3f0250079c386ed2e1eb9fd7d551004e (diff) |
3.1.0/5.1.0 - check for finished deployment
- external version 3.1.0
- internal version 5.1.0 for code change - no API change
- check for finished deployment creation - success or failure
- stop querying cloudify manager on failed deployment creation
- use optional $CONSUL_URL to get url of consul
- improved info used for audit and logging and responses
- added more unit tests
unit test coverage summary
Statements : 80.99% ( 946/1168 )
Branches : 58.22% ( 294/505 )
Functions : 81.28% ( 165/203 )
Lines : 81.53% ( 936/1148 )
Change-Id: I831cd0db0d2e148e6da4c9190495aacf72e2d39c
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-929
Diffstat (limited to 'lib/policy.js')
-rw-r--r-- | lib/policy.js | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/lib/policy.js b/lib/policy.js index d6a701f..098a4a4 100644 --- a/lib/policy.js +++ b/lib/policy.js @@ -222,7 +222,7 @@ function update_policies(req, res) { * retrieve the unique set of policies and policy-filters from cloudify */ function get_policies_from_cloudify(req, res, next) { - logger.info(req.dcaeReqId, "getPoliciesFromCloudify " + req.originalUrl); + logger.info(req.dcaeReqId, "get_policies_from_cloudify " + req.originalUrl); const response = {"requestID": req.dcaeReqId}; response.started = new Date(); response.server_instance_uuid = process.mainModule.exports.config.server_instance_uuid; @@ -263,13 +263,16 @@ function get_policies_from_cloudify(req, res, next) { .then(function(result) { response.ended = new Date(); response.status = result.status; - response.message = result.message; - logger.info(req.dcaeReqId, result.message); - if (result.status !== 200) { - logger.error(createError(result.message, result.status, "api", 502, 'cloudify-manager'), req); + response.message = result.message + + " deployed policies[" + Object.keys(response.policies).length + + "] policy_filters[" + Object.keys(response.policy_filters).length + "]"; + logger.info(req.dcaeReqId, "response status " + response.status + + " body: " + JSON.stringify(response)); + if (response.status !== 200) { + logger.error(createError(response.message, response.status, "api", 502, 'cloudify-manager'), req); } - res.status(result.status).json(response); - logger.audit(req, result.status, result.message); + res.status(response.status).json(response); + logger.audit(req, response.status, response.message); }); } @@ -335,13 +338,20 @@ function getComponentPoliciesFromCloudify(req, res, next) { .then(function(result) { response.ended = new Date(); response.status = result.status; - response.message = result.message; - logger.info(req.dcaeReqId, result.message); - if (result.status !== 200) { - logger.error(createError(result.message, result.status, "api", 502, 'cloudify-manager'), req); + response.message = result.message + response.message = result.message + + " collected[" + response.node_instance_ids.length + + "] node_instance_ids[" + Object.keys(response.node_instance_ids).length + + "] component_policies[" + Object.keys(response.component_policies).length + + "] component_policy_filters[" + Object.keys(response.component_policy_filters).length + "]"; + + logger.info(req.dcaeReqId, "response status " + response.status + + " body: " + JSON.stringify(response)); + if (response.status !== 200) { + logger.error(createError(response.message, response.status, "api", 502, 'cloudify-manager'), req); } - res.status(result.status).json(response); - logger.audit(req, result.status, result.message); + res.status(response.status).json(response); + logger.audit(req, response.status, response.message); }); } |