unit tests coverage 68% and more info in audit

* refactored the unit test - simpler dh server initialization
* new unit tests for the dcae-deployments
* new unit tests for healthcheck - info
* new server_instance_uuid - unique per deployment-handler instance
      for logging and info
* dragging req object over the stack to show req data in logging
      and audit and metrics
* new feature variable collection of policies per component in DCAE

Change-Id: I8388d7e5e11e3a6c871cf3d507bd8a07b09add29
Issue-ID: DCAEGEN2-249
Signed-off-by: Alex Shatov <alexs@att.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/lib/promise_request.js b/lib/promise_request.js
index 0572ac4..975f12d 100644
--- a/lib/promise_request.js
+++ b/lib/promise_request.js
@@ -1,5 +1,5 @@
 /*
-Copyright(c) 2017 AT&T Intellectual Property. All rights reserved.
+Copyright(c) 2018 AT&T Intellectual Property. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,11 +31,11 @@ const url = require('url');
 const querystring = require('querystring');
 const logger = require('./logging').getLogger();
 
-exports.doRequest = function(options, body, targetEntity, mainReq) {
-	
+exports.doRequest = function(mainReq, options, body, targetEntity) {
+
 	/* Defense:  for now, some callers don't provide mainReq */
 	mainReq = mainReq || {};
-	
+
     var opInfo = {"startTime":new Date(), "targetEntity": targetEntity};
 
     return new Promise(function(resolve, reject) {
@@ -56,10 +56,12 @@ exports.doRequest = function(options, body, targetEntity, mainReq) {
             options.hostname = parsed.hostname;
             options.port = parsed.port;
             options.path = parsed.path;
+            opInfo.targetService = options.method + " " + options.uri;
             if (options.qs) {
-                options.path += ('?' + querystring.stringify(options.qs));
+                const qry = ('?' + querystring.stringify(options.qs));
+                options.path += qry;
+                opInfo.targetService += qry;
             }
-            opInfo.targetService = options.method + " " + options.uri;
         }
 
         try {