From d9c9c50fe88a9a4f30b242e9c6bc64c090dc7cdb Mon Sep 17 00:00:00 2001 From: ManasaBM Date: Thu, 14 Sep 2023 10:28:26 +0200 Subject: [PATCH 1/3] Resolve delete-ltp-and-dependents forwarding is not being sent when application is disregarded. Fixes #290 --- server/service/IndividualServicesService.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/server/service/IndividualServicesService.js b/server/service/IndividualServicesService.js index 38460be..6720295 100644 --- a/server/service/IndividualServicesService.js +++ b/server/service/IndividualServicesService.js @@ -155,15 +155,10 @@ exports.disregardApplication = async function (body, user, originator, xCorrelat } const operationClientUuid = await operationClientInterface.getOperationClientUuidAsync(httpClientUuid, UPDATE_OPERATION_KEY_OPERATION); - await LogicalTerminationPointService.deleteApplicationLtpsAsync(httpClientUuid); - - const cyclicOperationInput = new ForwardingConstructConfigurationInput(FC_CYCLIC_OPERATION_CAUSES_OPERATION_KEY_UPDATES, operationClientUuid); - const linkUpdateNotificationInput = new ForwardingConstructConfigurationInput(FC_LINK_UPDATE_NOTIFICATION_CAUSES_OPERATION_KEY_UPDATES, operationClientUuid); - const forwardingConfigurationInputList = [cyclicOperationInput, linkUpdateNotificationInput]; - const forwardingConstructConfigurationStatus = await forwardingConfigurationService.unConfigureForwardingConstructAsync(operationServerName, forwardingConfigurationInputList); + let logicalTerminationPointConfigurationStatus= await LogicalTerminationPointService.deleteApplicationLtpsAsync(httpClientUuid); let applicationLayerTopologyForwardingInputList = prepareALTForwardingAutomation.getALTUnConfigureForwardingAutomationInputAsync( - forwardingConstructConfigurationStatus + logicalTerminationPointConfigurationStatus ); forwardingAutomationService.automateForwardingConstructAsync( From 14a95f99537f4da510765c2cdbc556040ef2c146 Mon Sep 17 00:00:00 2001 From: ManasaBM Date: Tue, 10 Oct 2023 08:06:50 +0200 Subject: [PATCH 2/3] Removing the operationClientUuid --- server/service/IndividualServicesService.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/service/IndividualServicesService.js b/server/service/IndividualServicesService.js index 6720295..bef2b04 100644 --- a/server/service/IndividualServicesService.js +++ b/server/service/IndividualServicesService.js @@ -153,8 +153,7 @@ exports.disregardApplication = async function (body, user, originator, xCorrelat if (!httpClientUuid) { return; } - const operationClientUuid = await operationClientInterface.getOperationClientUuidAsync(httpClientUuid, UPDATE_OPERATION_KEY_OPERATION); - + let logicalTerminationPointConfigurationStatus= await LogicalTerminationPointService.deleteApplicationLtpsAsync(httpClientUuid); let applicationLayerTopologyForwardingInputList = prepareALTForwardingAutomation.getALTUnConfigureForwardingAutomationInputAsync( From e998d8c6a7937273b5ed6ecf335a100e66025ea4 Mon Sep 17 00:00:00 2001 From: ManasaBM Date: Tue, 10 Oct 2023 08:12:03 +0200 Subject: [PATCH 3/3] removing unused variables --- server/service/IndividualServicesService.js | 1 - 1 file changed, 1 deletion(-) diff --git a/server/service/IndividualServicesService.js b/server/service/IndividualServicesService.js index bef2b04..133d225 100644 --- a/server/service/IndividualServicesService.js +++ b/server/service/IndividualServicesService.js @@ -11,7 +11,6 @@ const forwardingConfigurationService = require('onf-core-model-ap/applicationPat const LogicalTerminationPoint = require('onf-core-model-ap/applicationPattern/onfModel/models/LogicalTerminationPoint'); const tcpClientInterface = require('onf-core-model-ap/applicationPattern/onfModel/models/layerProtocols/TcpClientInterface'); const httpClientInterface = require('onf-core-model-ap/applicationPattern/onfModel/models/layerProtocols/HttpClientInterface'); -const operationClientInterface = require('onf-core-model-ap/applicationPattern/onfModel/models/layerProtocols/OperationClientInterface'); const onfAttributeFormatter = require('onf-core-model-ap/applicationPattern/onfModel/utility/OnfAttributeFormatter'); const ConfigurationStatus = require('onf-core-model-ap/applicationPattern/onfModel/services/models/ConfigurationStatus'); const LogicalTerminationPointConfigurationStatus = require('onf-core-model-ap/applicationPattern/onfModel/services/models/logicalTerminationPoint/ConfigurationStatus');