Merge pull request #307 from openBackhaul/latta-siae/issue237

Latta siae/issue237

Author: latta-siae

server/controllers/IndividualServices.js

@@ -110,8 +110,7 @@ module.exports.readCurrentMacTableFromDevice = async function readCurrentMacTabl
   let startTime = process.hrtime();
   let responseCode = responseCodeEnum.code.OK;
   let responseBodyToDocument = {};
-
-  await IndividualServices.readCurrentMacTableFromDevice(body, user, originator, xCorrelator, traceIndicator, customerJourney, req.url)
+  await IndividualServices.readCurrentMacTableFromDevice(body, user, originator, xCorrelator, traceIndicator, customerJourney)
     .then(async function (responseBody) {
       responseBodyToDocument = responseBody;
       let responseHeader = await ResponseHeader.createResponseHeader(xCorrelator, startTime, req.url);

server/index.js

@@ -1,4 +1,5 @@
 const cp = require('./service/individualServices/CyclicProcessService/cyclicProcess');
+const logger = require('./service/LoggingService.js').getLogger();
 
 'use strict';
 
@@ -15,14 +16,14 @@ const { env } = require('process');
 // uncomment if you do not want to validate security e.g. operation-key, basic auth, etc
 //appCommons.openApiValidatorOptions.validateSecurity = false;
 if (process.env.DEBUG && process.env.DEBUG.toLowerCase() === "true") {
-    console.warn("Working in debug mode");
-    console.warn("Checking validation")
+    logger.warn("Working in debug mode");
+    logger.warn("Checking validation")
     appCommons.openApiValidatorOptions.validateSecurity = false;
     // appCommons.openApiValidatorOptions.validateResponses = false;
     // appCommons.openApiValidatorOptions.validateRequests = false;
-    console.warn("Validate Security: " + appCommons.openApiValidatorOptions.validateSecurity);
-    console.warn("Validate Responses: " + appCommons.openApiValidatorOptions.validateResponses);
-    console.warn("Validate Requests: " + appCommons.openApiValidatorOptions.validateRequests);
+    logger.warn("Validate Security: " + appCommons.openApiValidatorOptions.validateSecurity);
+    logger.warn("Validate Responses: " + appCommons.openApiValidatorOptions.validateResponses);
+    logger.warn("Validate Requests: " + appCommons.openApiValidatorOptions.validateRequests);
 }
 
 // swaggerRouter configuration
@@ -39,19 +40,19 @@ appCommons.setupExpressApp(app);
 
 global.databasePath = './database/load.json'
 if (process.env.DEBUG && process.env.DEBUG.toLowerCase() === "true") {
-    console.warn("Working in debug mode");
+    logger.warn("Working in debug mode");
     global.databasePath = './server/database/load.json'
-    console.warn("Load data from: " + global.databasePath)
+    logger.warn("Load data from: " + global.databasePath)
 }
 
 prepareElasticsearch().catch(err => {
-    console.error(`Error preparing Elasticsearch : ${err}`);
+    logger.error(`Error preparing Elasticsearch : ${err}`);
 }).finally(
     () => {
         // Initialize the Swagger middleware
         http.createServer(app).listen(serverPort, function () {
-        console.log('Your server is listening on port %d (http://localhost:%d)', serverPort, serverPort);
-        console.log('Swagger-ui is available on http://localhost:%d/docs', serverPort);
+        logger.info('Your server is listening on port %d (http://localhost:%d)', serverPort, serverPort);
+        logger.info('Swagger-ui is available on http://localhost:%d/docs', serverPort);
         });
         appCommons.performApplicationRegistration();
 

server/package.json

@@ -18,6 +18,9 @@
     "oas3-tools": "^2.2.3",
     "onf-core-model-ap": "2.1.2",
     "onf-core-model-ap-bs": "2.1.2",
-    "openbackhaul-oas3-tools": "2.3.1-alpha.3"
+    "openbackhaul-oas3-tools": "2.3.1-alpha.3",
+    "pino": "^9.4.0",
+    "pino-pretty": "^11.2.2",
+    "pino-roll": "^2.2.0"
   }
 }

server/service/HttpClientService.js

@@ -1,9 +1,12 @@
 'use strict';
+
+// ONF Libs
 var fileOperation = require('onf-core-model-ap/applicationPattern/databaseDriver/JSONDriver');
-const prepareForwardingAutomation = require('./individualServices/PrepareForwardingAutomation');
 const ForwardingAutomationService = require('onf-core-model-ap/applicationPattern/onfModel/services/ForwardingConstructAutomationServices');
 const httpClientInterface = require('onf-core-model-ap/applicationPattern/onfModel/models/layerProtocols/HttpClientInterface');
 
+// Custom imports
+const prepareForwardingAutomation = require('./individualServices/PrepareForwardingAutomation');
 
 /**
  * Returns name of application to be addressed