From d4d818a06152578eee71119425e06374d51964b1 Mon Sep 17 00:00:00 2001 From: ManasaBM1 Date: Mon, 30 Sep 2024 11:16:42 +0530 Subject: [PATCH 1/4] update-clinet fix --- server/basicServices/basicServices/BasicServicesService.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/basicServices/basicServices/BasicServicesService.js b/server/basicServices/basicServices/BasicServicesService.js index 4a0ddee1..14dfff69 100644 --- a/server/basicServices/basicServices/BasicServicesService.js +++ b/server/basicServices/basicServices/BasicServicesService.js @@ -871,6 +871,7 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, currentReleaseNumber, newReleaseFwName); +if((currentApplicationName == futureApplicationName || currentApplicationName !== futureApplicationName) && currentReleaseNumber !== futureReleaseNumber){ if (httpClientUuidOfFutureApplication) { let tcpClientUuidOfFutureApplication = await LogicalTerminationPoint.getServerLtpListAsync(httpClientUuidOfFutureApplication); let existingIpAddressOfFutureApplication = await tcpClientInterface.getRemoteAddressAsync(tcpClientUuidOfFutureApplication[0]); @@ -947,7 +948,7 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, ltpConfigurationList.push(httpClientUuidOfCurrentApplication); } } - +} /**************************************************************************************** * Prepare attributes to automate forwarding-construct ****************************************************************************************/ From 871340bd81ba8664511578f2a904615acdb11341 Mon Sep 17 00:00:00 2001 From: ManasaBM1 Date: Thu, 3 Oct 2024 12:14:44 +0530 Subject: [PATCH 2/4] re-formting a issue --- server/basicServices/basicServices/BasicServicesService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/basicServices/basicServices/BasicServicesService.js b/server/basicServices/basicServices/BasicServicesService.js index 14dfff69..05b887f6 100644 --- a/server/basicServices/basicServices/BasicServicesService.js +++ b/server/basicServices/basicServices/BasicServicesService.js @@ -871,7 +871,7 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, currentReleaseNumber, newReleaseFwName); -if((currentApplicationName == futureApplicationName || currentApplicationName !== futureApplicationName) && currentReleaseNumber !== futureReleaseNumber){ +if(currentReleaseNumber !== futureReleaseNumber){ if (httpClientUuidOfFutureApplication) { let tcpClientUuidOfFutureApplication = await LogicalTerminationPoint.getServerLtpListAsync(httpClientUuidOfFutureApplication); let existingIpAddressOfFutureApplication = await tcpClientInterface.getRemoteAddressAsync(tcpClientUuidOfFutureApplication[0]); From dea90fe94b62ad8d74785251b1f8ffb8762d988e Mon Sep 17 00:00:00 2001 From: ManasaBM1 Date: Thu, 3 Oct 2024 14:14:56 +0530 Subject: [PATCH 3/4] fix the issue1020 --- .../basicServices/basicServices/BasicServicesService.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/basicServices/basicServices/BasicServicesService.js b/server/basicServices/basicServices/BasicServicesService.js index 05b887f6..c3c14b18 100644 --- a/server/basicServices/basicServices/BasicServicesService.js +++ b/server/basicServices/basicServices/BasicServicesService.js @@ -871,7 +871,7 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, currentReleaseNumber, newReleaseFwName); -if(currentReleaseNumber !== futureReleaseNumber){ + if (httpClientUuidOfFutureApplication) { let tcpClientUuidOfFutureApplication = await LogicalTerminationPoint.getServerLtpListAsync(httpClientUuidOfFutureApplication); let existingIpAddressOfFutureApplication = await tcpClientInterface.getRemoteAddressAsync(tcpClientUuidOfFutureApplication[0]); @@ -902,10 +902,11 @@ if(currentReleaseNumber !== futureReleaseNumber){ ltpConfigurationList.push(tcpClientUuidOfFutureApplication[0]); } - if (httpClientUuidOfCurrentApplication) { + if (httpClientUuidOfCurrentApplication !== httpClientUuidOfFutureApplication) { let updateUuidList = await transferOperationClientFromOldToNewRelease(httpClientUuidOfCurrentApplication, httpClientUuidOfFutureApplication) ltpConfigurationList = ltpConfigurationList.concat(updateUuidList); - } + + } } else if (httpClientUuidOfCurrentApplication) { let tcpClientUuidOfCurrentApplication = await LogicalTerminationPoint.getServerLtpListAsync(httpClientUuidOfCurrentApplication); let existingIpAddressOfCurrentApplication = await tcpClientInterface.getRemoteAddressAsync(tcpClientUuidOfCurrentApplication[0]); @@ -948,7 +949,7 @@ if(currentReleaseNumber !== futureReleaseNumber){ ltpConfigurationList.push(httpClientUuidOfCurrentApplication); } } -} + /**************************************************************************************** * Prepare attributes to automate forwarding-construct ****************************************************************************************/ From 67ffd3c335febe21b6c6155c3f2a4054f2d3cffb Mon Sep 17 00:00:00 2001 From: ManasaBM1 Date: Thu, 3 Oct 2024 14:55:48 +0530 Subject: [PATCH 4/4] check the httpClientUuidOfCurrentApplication is present --- server/basicServices/basicServices/BasicServicesService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/basicServices/basicServices/BasicServicesService.js b/server/basicServices/basicServices/BasicServicesService.js index c3c14b18..edd613c3 100644 --- a/server/basicServices/basicServices/BasicServicesService.js +++ b/server/basicServices/basicServices/BasicServicesService.js @@ -902,7 +902,7 @@ exports.updateClient = async function (body, user, xCorrelator, traceIndicator, ltpConfigurationList.push(tcpClientUuidOfFutureApplication[0]); } - if (httpClientUuidOfCurrentApplication !== httpClientUuidOfFutureApplication) { + if (httpClientUuidOfCurrentApplication && (httpClientUuidOfCurrentApplication !== httpClientUuidOfFutureApplication)) { let updateUuidList = await transferOperationClientFromOldToNewRelease(httpClientUuidOfCurrentApplication, httpClientUuidOfFutureApplication) ltpConfigurationList = ltpConfigurationList.concat(updateUuidList);