V2.1.1 impl ro develop

server/controllers/IndividualServices.js

@@ -22,7 +22,10 @@ module.exports.bequeathYourDataAndDie = async function bequeathYourDataAndDie(re
       responseCode = sentResp.code;
       responseBodyToDocument = sentResp.body;
     });
-  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument);
+  let execTime = await restResponseHeader.executionTimeInMilliseconds(startTime);
+  if (!execTime) execTime = 0;
+  else execTime = Math.round(execTime);
+  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument, execTime);
 };
 
 module.exports.disregardApplication = async function disregardApplication (req, res, next, body, user, originator, xCorrelator, traceIndicator, customerJourney) {
@@ -41,7 +44,10 @@ module.exports.disregardApplication = async function disregardApplication (req,
       responseCode = sentResp.code;
       responseBodyToDocument = sentResp.body;
     });
-  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument);
+  let execTime = await restResponseHeader.executionTimeInMilliseconds(startTime);
+  if (!execTime) execTime = 0;
+  else execTime = Math.round(execTime);
+  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument, execTime);
 };
 
 module.exports.listApplications = async function listApplications (req, res, next, user, originator, xCorrelator, traceIndicator, customerJourney) {
@@ -60,7 +66,10 @@ module.exports.listApplications = async function listApplications (req, res, nex
       responseCode = sentResp.code;
       responseBodyToDocument = sentResp.body;
     });
-  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument);
+  let execTime = await restResponseHeader.executionTimeInMilliseconds(startTime);
+  if (!execTime) execTime = 0;
+  else execTime = Math.round(execTime);
+  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument, execTime);
 };
 
 module.exports.listRecords = async function listRecords (req, res, next, body, user, originator, xCorrelator, traceIndicator, customerJourney) {
@@ -79,7 +88,10 @@ module.exports.listRecords = async function listRecords (req, res, next, body, u
       responseCode = sentResp.code;
       responseBodyToDocument = sentResp.body;
     });
-  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument);
+  let execTime = await restResponseHeader.executionTimeInMilliseconds(startTime);
+  if (!execTime) execTime = 0;
+  else execTime = Math.round(execTime);
+  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument, execTime);
 };
 
 module.exports.listRecordsOfFlow = async function listRecordsOfFlow (req, res, next, body, user, originator, xCorrelator, traceIndicator, customerJourney) {
@@ -98,7 +110,10 @@ module.exports.listRecordsOfFlow = async function listRecordsOfFlow (req, res, n
       responseCode = sentResp.code;
       responseBodyToDocument = sentResp.body;
     });
-  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument);
+  let execTime = await restResponseHeader.executionTimeInMilliseconds(startTime);
+  if (!execTime) execTime = 0;
+  else execTime = Math.round(execTime);
+  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument, execTime);
 };
 
 module.exports.listRecordsOfUnsuccessful = async function listRecordsOfUnsuccessful (req, res, next, body, user, originator, xCorrelator, traceIndicator, customerJourney) {
@@ -117,7 +132,10 @@ module.exports.listRecordsOfUnsuccessful = async function listRecordsOfUnsuccess
       responseCode = sentResp.code;
       responseBodyToDocument = sentResp.body;
     });
-  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument);
+  let execTime = await restResponseHeader.executionTimeInMilliseconds(startTime);
+  if (!execTime) execTime = 0;
+  else execTime = Math.round(execTime);
+  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument, execTime);
 };
 
 module.exports.recordServiceRequest = async function recordServiceRequest (req, res, next, body, user, originator, xCorrelator, traceIndicator, customerJourney) {
@@ -139,7 +157,7 @@ module.exports.recordServiceRequest = async function recordServiceRequest (req,
 
 module.exports.regardApplication = async function regardApplication (req, res, next, body, user, originator, xCorrelator, traceIndicator, customerJourney) {
   let startTime = process.hrtime();
-  let responseCode = responseCodeEnum.code.NO_CONTENT;
+  let responseCode = responseCodeEnum.code.OK;
   let responseBodyToDocument = {};
   await IndividualServices.regardApplication(body, user, originator, xCorrelator, traceIndicator, customerJourney, req.url)
     .then(async function (responseBody) {
@@ -153,5 +171,8 @@ module.exports.regardApplication = async function regardApplication (req, res, n
       responseCode = sentResp.code;
       responseBodyToDocument = sentResp.body;
     });
-  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument);
+  let execTime = await restResponseHeader.executionTimeInMilliseconds(startTime);
+  if (!execTime) execTime = 0;
+  else execTime = Math.round(execTime);
+  executionAndTraceService.recordServiceRequest(xCorrelator, traceIndicator, user, originator, req.url, responseCode, req.body, responseBodyToDocument, execTime);
 };

server/controllers/IntegerProfile.js

@@ -1,74 +1,97 @@
 'use strict';
 
-var utils = require('../utils/writer.js');
 var IntegerProfile = require('../service/IntegerProfileService');
+var responseBuilder = require('onf-core-model-ap/applicationPattern/rest/server/ResponseBuilder');
+var responseCodeEnum = require('onf-core-model-ap/applicationPattern/rest/server/ResponseCode');
+var oamLogService = require('onf-core-model-ap/applicationPattern/services/OamLogService');
 
-module.exports.getIntegerProfileIntegerName = function getIntegerProfileIntegerName (req, res, next, uuid) {
-  IntegerProfile.getIntegerProfileIntegerName(uuid)
+module.exports.getIntegerProfileIntegerName = async function getIntegerProfileIntegerName (req, res, next, uuid) {
+  let responseCode = responseCodeEnum.code.OK;
+  await IntegerProfile.getIntegerProfileIntegerName(req.url)
     .then(function (response) {
-      utils.writeJson(res, response);
+      responseBuilder.buildResponse(res, responseCode, response);
     })
     .catch(function (response) {
-      utils.writeJson(res, response);
+      let sentResp = responseBuilder.buildResponse(res, undefined, response);
+      responseCode = sentResp.code;
     });
+  oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method);
 };
 
-module.exports.getIntegerProfileIntegerValue = function getIntegerProfileIntegerValue (req, res, next, uuid) {
-  IntegerProfile.getIntegerProfileIntegerValue(uuid)
+module.exports.getIntegerProfileIntegerValue = async function getIntegerProfileIntegerValue (req, res, next, uuid) {
+  let responseCode = responseCodeEnum.code.OK;
+  await IntegerProfile.getIntegerProfileIntegerValue(req.url)
     .then(function (response) {
-      utils.writeJson(res, response);
+      responseBuilder.buildResponse(res, responseCode, response);
     })
     .catch(function (response) {
-      utils.writeJson(res, response);
+      let sentResp = responseBuilder.buildResponse(res, undefined, response);
+      responseCode = sentResp.code;
     });
+  oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method);
 };
 
-module.exports.getIntegerProfileMaximum = function getIntegerProfileMaximum (req, res, next, uuid) {
-  IntegerProfile.getIntegerProfileMaximum(uuid)
+module.exports.getIntegerProfileMaximum = async function getIntegerProfileMaximum (req, res, next, uuid) {
+  let responseCode = responseCodeEnum.code.OK;
+  await IntegerProfile.getIntegerProfileMaximum(req.url)
     .then(function (response) {
-      utils.writeJson(res, response);
+      responseBuilder.buildResponse(res, responseCode, response);
     })
     .catch(function (response) {
-      utils.writeJson(res, response);
+      let sentResp = responseBuilder.buildResponse(res, undefined, response);
+      responseCode = sentResp.code;
     });
+  oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method);
 };
 
-module.exports.getIntegerProfileMinimum = function getIntegerProfileMinimum (req, res, next, uuid) {
-  IntegerProfile.getIntegerProfileMinimum(uuid)
+module.exports.getIntegerProfileMinimum = async function getIntegerProfileMinimum (req, res, next, uuid) {
+  let responseCode = responseCodeEnum.code.OK;
+  await IntegerProfile.getIntegerProfileMinimum(req.url)
     .then(function (response) {
-      utils.writeJson(res, response);
+      responseBuilder.buildResponse(res, responseCode, response);
     })
     .catch(function (response) {
-      utils.writeJson(res, response);
+      let sentResp = responseBuilder.buildResponse(res, undefined, response);
+      responseCode = sentResp.code;
     });
+  oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method);
 };
 
-module.exports.getIntegerProfilePurpose = function getIntegerProfilePurpose (req, res, next, uuid) {
-  IntegerProfile.getIntegerProfilePurpose(uuid)
+module.exports.getIntegerProfilePurpose = async function getIntegerProfilePurpose (req, res, next, uuid) {
+  let responseCode = responseCodeEnum.code.OK;
+  await IntegerProfile.getIntegerProfilePurpose(req.url)
     .then(function (response) {
-      utils.writeJson(res, response);
+      responseBuilder.buildResponse(res, responseCode, response);
     })
     .catch(function (response) {
-      utils.writeJson(res, response);
+      let sentResp = responseBuilder.buildResponse(res, undefined, response);
+      responseCode = sentResp.code;
     });
+  oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method);
 };
 
-module.exports.getIntegerProfileUnit = function getIntegerProfileUnit (req, res, next, uuid) {
-  IntegerProfile.getIntegerProfileUnit(uuid)
+module.exports.getIntegerProfileUnit = async function getIntegerProfileUnit (req, res, next, uuid) {
+  let responseCode = responseCodeEnum.code.OK;
+  await IntegerProfile.getIntegerProfileUnit(req.url)
     .then(function (response) {
-      utils.writeJson(res, response);
+      responseBuilder.buildResponse(res, responseCode, response);
     })
     .catch(function (response) {
-      utils.writeJson(res, response);
+      let sentResp = responseBuilder.buildResponse(res, undefined, response);
+      responseCode = sentResp.code;
     });
+  oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method);
 };
 
-module.exports.putIntegerProfileIntegerValue = function putIntegerProfileIntegerValue (req, res, next, body, uuid) {
-  IntegerProfile.putIntegerProfileIntegerValue(body, uuid)
+module.exports.putIntegerProfileIntegerValue = async function putIntegerProfileIntegerValue (req, res, next, body, uuid) {
+  let responseCode = responseCodeEnum.code.NO_CONTENT;
+  await IntegerProfile.putIntegerProfileIntegerValue(req.url, body, uuid)
     .then(function (response) {
-      utils.writeJson(res, response);
+      responseBuilder.buildResponse(res, responseCode, response);
     })
     .catch(function (response) {
-      utils.writeJson(res, response);
+      let sentResp = responseBuilder.buildResponse(res, undefined, response);
+      responseCode = sentResp.code;
     });
-};
+  oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method);
+};

server/database/config.json

@@ -219,6 +219,25 @@
                         }
                     }
                 },
+                {
+                    "uuid": "eatl-2-1-0-response-p-009",
+                    "profile-name": "response-profile-1-0:PROFILE_NAME_TYPE_GENERIC_RESPONSE_PROFILE",
+                    "response-profile-1-0:response-profile-pac": {
+                        "response-profile-capability": {
+                            "operation-name": "/v1/inform-about-release-history-in-generic-representation",
+                            "field-name": {
+                                "field-name-reference": "/core-model-1-4:control-construct/logical-termination-point=eatl-2-1-0-http-s-000/layer-protocol=0/http-server-interface-1-0:http-server-interface-pac/http-server-interface-capability/release-list=2/release-number"
+                            },
+                            "description": "List of release numbers and changes",
+                            "datatype": "string"
+                        },
+                        "response-profile-configuration": {
+                            "value": {
+                                "value-reference": "/core-model-1-4:control-construct/logical-termination-point=eatl-2-1-0-http-s-000/layer-protocol=0/http-server-interface-1-0:http-server-interface-pac/http-server-interface-capability/release-list=2/changes"
+                            }
+                        }
+                    }
+                },
                 {
                     "uuid": "eatl-2-1-0-integer-p-000",
                     "profile-name": "integer-profile-1-0:PROFILE_NAME_TYPE_INTEGER_PROFILE",
@@ -231,7 +250,7 @@
                             "maximum": 5000
                         },
                         "integer-profile-configuration": {
-                            "integer-value": 500
+                            "integer-value": 5000
                         }
                     }
                 },
@@ -1203,7 +1222,7 @@
                         "http-client-interface-1-0:http-client-interface-pac": {
                             "http-client-interface-configuration": {
                                 "application-name": "NewRelease",
-                                "release-number": "2.1.0"
+                                "release-number": "2.1.1"
                             }
                         }
                     }
@@ -1374,7 +1393,7 @@
                         "http-client-interface-1-0:http-client-interface-pac": {
                             "http-client-interface-configuration": {
                                 "application-name": "RegistryOffice",
-                                "release-number": "2.1.0"
+                                "release-number": "2.1.1"
                             }
                         }
                     }
@@ -1410,7 +1429,7 @@
                 "ltp-direction": "core-model-1-4:TERMINATION_DIRECTION_SINK",
                 "client-ltp": [],
                 "server-ltp": [
-                    "eatl-2-1-0-http-c-eatl-2-0-1-000"
+                    "eatl-2-1-0-http-c-tar-2-1-0-000"
                 ],
                 "layer-protocol": [
                     {
@@ -1445,7 +1464,7 @@
                         "http-client-interface-1-0:http-client-interface-pac": {
                             "http-client-interface-configuration": {
                                 "application-name": "TypeApprovalRegister",
-                                "release-number": "2.1.0"
+                                "release-number": "2.1.1"
                             }
                         }
                     }
@@ -1542,7 +1561,7 @@
                         "http-client-interface-1-0:http-client-interface-pac": {
                             "http-client-interface-configuration": {
                                 "application-name": "ExecutionAndTraceLog",
-                                "release-number": "2.0.1"
+                                "release-number": "2.1.1"
                             }
                         }
                     }
@@ -1638,7 +1657,7 @@
                         "http-client-interface-1-0:http-client-interface-pac": {
                             "http-client-interface-configuration": {
                                 "application-name": "OamLog",
-                                "release-number": "2.0.1"
+                                "release-number": "2.1.1"
                             }
                         }
                     }
@@ -1734,7 +1753,7 @@
                         "http-client-interface-1-0:http-client-interface-pac": {
                             "http-client-interface-configuration": {
                                 "application-name": "AdministratorAdministration",
-                                "release-number": "2.0.1"
+                                "release-number": "2.1.1"
                             }
                         }
                     }
@@ -1980,7 +1999,7 @@
                         "http-client-interface-1-0:http-client-interface-pac": {
                             "http-client-interface-configuration": {
                                 "application-name": "ApplicationLayerTopology",
-                                "release-number": "2.1.0"
+                                "release-number": "2.1.1"
                             }
                         }
                     }
@@ -2051,7 +2070,7 @@
                         "http-client-interface-1-0:http-client-interface-pac": {
                             "http-client-interface-configuration": {
                                 "application-name": "OperationKeyManagement",
-                                "release-number": "2.1.0"
+                                "release-number": "2.1.1"
                             }
                         }
                     }

server/dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:18
 
 # set nodejs to production mode
 ENV NODE_ENV production

server/index.js

@@ -37,4 +37,5 @@ prepareElasticsearch(false).catch(err => {
     });
     appCommons.performApplicationRegistration();
 }
-);
+);
+