Add composition outProperties support in Deprime

Issue-ID: POLICY-4784
Change-Id: I8d97d1cebc92c29b4b6842ad31f653664c09b0bf
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
(cherry picked from commit ea5f81815a19d0b902e3c80f15d1b17c122bce76)

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionOutHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionOutHandler.java
index bd5f142..6373ab5 100755 (executable)
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionOutHandler.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionOutHandler.java
@@ -224,5 +224,8 @@ public class AutomationCompositionOutHandler {
         participantPrimeAck.setState(ParticipantState.ON_LINE);
         publisher.sendParticipantPrimeAck(participantPrimeAck);
         cacheProvider.getMsgIdentification().remove(compositionId);
+        if (AcTypeState.COMMISSIONED.equals(state) && StateChangeResult.NO_ERROR.equals(stateChangeResult)) {
+            cacheProvider.removeElementDefinition(compositionId);
+        }
     }
 }

diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandler.java
index c78c7bb..8f69fd5 100644 (file)
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandler.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandler.java
@@ -192,7 +192,6 @@ public class ParticipantHandler {
                     participantPrimeMsg.getCompositionId(), list);
         } else {
             // deprime
-            cacheProvider.removeElementDefinition(participantPrimeMsg.getCompositionId());
             automationCompositionHandler.deprime(participantPrimeMsg.getMessageId(),
                     participantPrimeMsg.getCompositionId());
         }

diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionOutHandlerTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionOutHandlerTest.java
index 36c0c4b..4f2ee83 100755 (executable)
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionOutHandlerTest.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionOutHandlerTest.java
@@ -166,13 +166,28 @@ class AutomationCompositionOutHandlerTest {
     }
 
     @Test
-    void updateCompositionStateTest() {
+    void updateCompositionStatePrimedTest() {
         var cacheProvider = mock(CacheProvider.class);
         when(cacheProvider.getParticipantId()).thenReturn(UUID.randomUUID());
         var publisher = mock(ParticipantMessagePublisher.class);
         var acOutHandler = new AutomationCompositionOutHandler(publisher, cacheProvider);
-        acOutHandler.updateCompositionState(UUID.randomUUID(), AcTypeState.PRIMED, StateChangeResult.NO_ERROR,
+        var compositionId = UUID.randomUUID();
+        acOutHandler.updateCompositionState(compositionId, AcTypeState.PRIMED, StateChangeResult.NO_ERROR,
                 "Primed");
         verify(publisher).sendParticipantPrimeAck(any(ParticipantPrimeAck.class));
+        verify(cacheProvider, times(0)).removeElementDefinition(compositionId);
+    }
+
+    @Test
+    void updateCompositionStateDeprimingTest() {
+        var cacheProvider = mock(CacheProvider.class);
+        when(cacheProvider.getParticipantId()).thenReturn(UUID.randomUUID());
+        var publisher = mock(ParticipantMessagePublisher.class);
+        var acOutHandler = new AutomationCompositionOutHandler(publisher, cacheProvider);
+        var compositionId = UUID.randomUUID();
+        acOutHandler.updateCompositionState(compositionId, AcTypeState.COMMISSIONED, StateChangeResult.NO_ERROR,
+                "Deprimed");
+        verify(publisher).sendParticipantPrimeAck(any(ParticipantPrimeAck.class));
+        verify(cacheProvider).removeElementDefinition(compositionId);
     }
 }

diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java
index 68cffe3..2f1eb22 100644 (file)
--- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java
@@ -208,7 +208,6 @@ class ParticipantHandlerTest {
         var messageId = UUID.randomUUID();
         participantPrime.setMessageId(messageId);
         participantHandler.handleParticipantPrime(participantPrime);
-        verify(cacheProvider).removeElementDefinition(compositionId);
         verify(acHandler).deprime(messageId, compositionId);
     }