diff options
| author |   Lukasz Rajewski <lukasz.rajewski@orange.com> | 2022-03-15 15:45:19 +0100 |
|---|---|---|
| committer | Lukasz Rajewski <lukasz.rajewski@orange.com> | 2022-03-15 16:08:27 +0100 |
| commit | 8f9596d529df852ec97eef15c22c62b4a3acae8e (patch) | |
| tree | 856e1fa2ef018f857defeb7ac9f56e80f5c70d70 /so-cnf-adapter-application/src/main/java | |
| parent | 712020637d67ec6ea205dc65926cf66eb1a1073c (diff) | |
Improved update of AAI for instance delete
Notify subscription must be removed before the deletion
of the instance
Issue-ID: SO-3845
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I92d780f941600b9c764a7b2bbc0aac434464e54e
Diffstat (limited to 'so-cnf-adapter-application/src/main/java')
2 files changed, 3 insertions, 3 deletions
diff --git a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java index df674f8..afce775 100644 --- a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/rest/CnfAdapterRest.java @@ -183,7 +183,7 @@ public class CnfAdapterRest { logger.info("Processing aai delete"); AaiCallbackResponse callbackResponse = new AaiCallbackResponse(); try { - synchronizationService.deleteSubscriptionIfExists(aaiRequest); + synchronizationService.deleteSubscriptionIfExists(aaiRequest.getInstanceId()); aaiService.aaiDelete(aaiRequest); callbackResponse.setCompletionStatus(AaiCallbackResponse.CompletionStatus.COMPLETED); } catch (Exception e) { @@ -306,6 +306,7 @@ public class CnfAdapterRest { logger.warn("Undefined instance ID delete attempt. Skipping delete"); return ""; } + synchronizationService.deleteSubscriptionIfExists(instanceID); return cnfAdapterService.deleteInstanceByInstanceId(instanceID); } diff --git a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/synchrornization/SynchronizationService.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/synchrornization/SynchronizationService.java index c4e5968..5397e2a 100644 --- a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/synchrornization/SynchronizationService.java +++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/synchrornization/SynchronizationService.java @@ -99,9 +99,8 @@ public class SynchronizationService { logger.debug("createSubscriptionIfNotExists- END"); } - public void deleteSubscriptionIfExists(AaiRequest aaiRequest) throws BadResponseException { + public void deleteSubscriptionIfExists(String instanceId) throws BadResponseException { logger.debug("deleteSubscriptionIfExists - START"); - String instanceId = aaiRequest.getInstanceId(); String subscriptionName = getSubscriptionName(instanceId); if (isSubscriptionActive(subscriptionName)) { |