diff --git a/server/applicationPattern/applicationPattern/services/ExecutionAndTraceService.js b/server/applicationPattern/applicationPattern/services/ExecutionAndTraceService.js index 029d0480..b89ecd80 100644 --- a/server/applicationPattern/applicationPattern/services/ExecutionAndTraceService.js +++ b/server/applicationPattern/applicationPattern/services/ExecutionAndTraceService.js @@ -62,7 +62,7 @@ exports.recordServiceRequestFromClient = async function (serverApplicationName, * @param {number} responseCode response code of the rest call execution
* @param {object} requestBody request body
* @param {object} responseBody response body
- * @param {String} execTime time taken to execute this request + * @param {Number} execTime time taken to execute this request * @returns {Promise} returns true if the operation is successful. Promise is never rejected.
*/ exports.recordServiceRequest = async function (xCorrelator, traceIndicator, userName, originator, diff --git a/server/applicationPattern/package.json b/server/applicationPattern/package.json index a4c55513..5a04e07a 100644 --- a/server/applicationPattern/package.json +++ b/server/applicationPattern/package.json @@ -1,6 +1,6 @@ { "name": "onf-core-model-ap", - "version": "2.1.1-alpha.7", + "version": "2.1.1-beta.1", "description": "onf core model application pattern", "main": "index.js", "scripts": { diff --git a/server/basicServices/basicServices/BasicServicesService.js b/server/basicServices/basicServices/BasicServicesService.js index 54bef601..14a833d8 100644 --- a/server/basicServices/basicServices/BasicServicesService.js +++ b/server/basicServices/basicServices/BasicServicesService.js @@ -874,9 +874,9 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, if (httpClientUuidOfFutureApplication) { let tcpClientUuidOfFutureApplication = await LogicalTerminationPoint.getServerLtpListAsync(httpClientUuidOfFutureApplication); - let existingIpAddressOfFutureApplication = await tcpClientInterface.getRemoteAddressAsync(tcpClientUuidOfFutureApplication); - let existingProtocolOfFutureApplication = await tcpClientInterface.getRemoteProtocolAsync(tcpClientUuidOfFutureApplication); - let existingPortOfFutureApplication = await tcpClientInterface.getRemotePortAsync(tcpClientUuidOfFutureApplication); + let existingIpAddressOfFutureApplication = await tcpClientInterface.getRemoteAddressAsync(tcpClientUuidOfFutureApplication[0]); + let existingProtocolOfFutureApplication = await tcpClientInterface.getRemoteProtocolAsync(tcpClientUuidOfFutureApplication[0]); + let existingPortOfFutureApplication = await tcpClientInterface.getRemotePortAsync(tcpClientUuidOfFutureApplication[0]); let isIpAddressOfFutureApplicationUpdated = false; let isProtocolOfFutureApplicationUpdated = false; @@ -884,22 +884,22 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, if (JSON.stringify(futureAddress) != JSON.stringify(existingIpAddressOfFutureApplication)) { isIpAddressOfFutureApplicationUpdated = await tcpClientInterface.setRemoteAddressAsync( - tcpClientUuidOfFutureApplication, + tcpClientUuidOfFutureApplication[0], futureAddress); } if (futureProtocol != existingProtocolOfFutureApplication) { isProtocolOfFutureApplicationUpdated = await tcpClientInterface.setRemoteProtocolAsync( - tcpClientUuidOfFutureApplication, + tcpClientUuidOfFutureApplication[0], futureProtocol); } if (futurePort != existingPortOfFutureApplication) { isPortOfFutureApplicationUpdated = await tcpClientInterface.setRemotePortAsync( - tcpClientUuidOfFutureApplication, + tcpClientUuidOfFutureApplication[0], futurePort); } if (isIpAddressOfFutureApplicationUpdated || isProtocolOfFutureApplicationUpdated || isPortOfFutureApplicationUpdated) { - ltpConfigurationList.push(tcpClientUuidOfFutureApplication); + ltpConfigurationList.push(tcpClientUuidOfFutureApplication[0]); } if (httpClientUuidOfCurrentApplication) { @@ -908,9 +908,9 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, } } else if (httpClientUuidOfCurrentApplication) { let tcpClientUuidOfCurrentApplication = await LogicalTerminationPoint.getServerLtpListAsync(httpClientUuidOfCurrentApplication); - let existingIpAddressOfCurrentApplication = await tcpClientInterface.getRemoteAddressAsync(tcpClientUuidOfCurrentApplication); - let existingProtocolOfCurrentApplication = await tcpClientInterface.getRemoteProtocolAsync(tcpClientUuidOfCurrentApplication); - let existingPortOfCurrentApplication = await tcpClientInterface.getRemotePortAsync(tcpClientUuidOfCurrentApplication); + let existingIpAddressOfCurrentApplication = await tcpClientInterface.getRemoteAddressAsync(tcpClientUuidOfCurrentApplication[0]); + let existingProtocolOfCurrentApplication = await tcpClientInterface.getRemoteProtocolAsync(tcpClientUuidOfCurrentApplication[0]); + let existingPortOfCurrentApplication = await tcpClientInterface.getRemotePortAsync(tcpClientUuidOfCurrentApplication[0]); let isIpAddressOfCurrentApplicationUpdated = false; let isProtocolOfCurrentApplicationUpdated = false; @@ -918,17 +918,17 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, if (JSON.stringify(futureAddress) != JSON.stringify(existingIpAddressOfCurrentApplication)) { isIpAddressOfCurrentApplicationUpdated = await tcpClientInterface.setRemoteAddressAsync( - tcpClientUuidOfCurrentApplication, + tcpClientUuidOfCurrentApplication[0], futureAddress); } if (futureProtocol != existingProtocolOfCurrentApplication) { isProtocolOfCurrentApplicationUpdated = await tcpClientInterface.setRemoteProtocolAsync( - tcpClientUuidOfCurrentApplication, + tcpClientUuidOfCurrentApplication[0], futureProtocol); } if (futurePort != existingPortOfCurrentApplication) { isPortOfCurrentApplicationUpdated = await tcpClientInterface.setRemotePortAsync( - tcpClientUuidOfCurrentApplication, + tcpClientUuidOfCurrentApplication[0], futurePort); } @@ -941,7 +941,7 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, futureReleaseNumber); if (isIpAddressOfCurrentApplicationUpdated || isProtocolOfCurrentApplicationUpdated || isPortOfCurrentApplicationUpdated) { - ltpConfigurationList.push(tcpClientUuidOfCurrentApplication); + ltpConfigurationList.push(tcpClientUuidOfCurrentApplication[0]); } if (isApplicationNameUpdated || isReleaseNumberUpdated) { diff --git a/server/basicServices/package.json b/server/basicServices/package.json index da33e5dd..258c0078 100644 --- a/server/basicServices/package.json +++ b/server/basicServices/package.json @@ -1,6 +1,6 @@ { "name": "onf-core-model-ap-bs", - "version": "2.1.1-alpha.7", + "version": "2.1.1-beta.1", "description": "onf core model application pattern", "main": "index.js", "scripts": { @@ -14,7 +14,7 @@ "js-yaml": "^3.3.0", "moment": "^2.29.1", "node-statsd": "^0.1.1", - "onf-core-model-ap": "2.1.1-alpha.7", + "onf-core-model-ap": "2.1.1-beta.1", "openbackhaul-oas3-tools": "2.3.1-alpha.3", "randexp": "^0.5.3", "response-time": "^2.3.2"