Removing old implementation of participant restart

Particpant will be set as offline at deregister
No ac states will be altered at deregister

Issue-ID: POLICY-4742
Change-Id: Ifb297805ed4b97938b7f92855e30f978d474b648
Signed-off-by: saul.gill <saul.gill@est.tech>
(cherry picked from commit 059adbc2c51c79d97aeb19faac81f1128529e4f7)

diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java
index 25d72cb..597606e 100644 (file)
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java
+++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProvider.java
@@ -182,19 +182,4 @@ public class ParticipantProvider {
         return ProviderUtils.asEntityList(nodeTemplateStateRepository
             .findByParticipantId(participantId.toString()));
     }
-
-    /**
-     * Reset the Deploy and Lock states of all the ac elements associated with a participant.
-     *
-     * @param participantId the participant id associated with the automation composition elements
-     */
-    public void resetParticipantAcElementState(@NonNull final UUID participantId) {
-        var participantAcElementList = automationCompositionElementRepository
-            .findByParticipantId(participantId.toString());
-        participantAcElementList.forEach(e -> {
-            e.setDeployState(DeployState.UNDEPLOYED);
-            e.setLockState(LockState.NONE);
-        });
-        automationCompositionElementRepository.saveAll(participantAcElementList);
-    }
 }

diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java
index 968ad31..22523e2 100644 (file)
--- a/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java
+++ b/models/src/test/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantProviderTest.java
@@ -252,7 +252,6 @@ class ParticipantProviderTest {
         assertThrows(NullPointerException.class, () -> participantProvider.deleteParticipant(null));
         assertThrows(NullPointerException.class, () -> participantProvider.getAutomationCompositionElements(null));
         assertThrows(NullPointerException.class, () -> participantProvider.getAcNodeTemplateStates(null));
-        assertThrows(NullPointerException.class, () -> participantProvider.resetParticipantAcElementState(null));
     }
 
     @Test
@@ -287,8 +286,6 @@ class ParticipantProviderTest {
             assertThat(e.getLockState().equals(LockState.LOCKED));
         });
 
-        participantProvider.resetParticipantAcElementState(UUID.randomUUID());
-
         acElementList.get(0).stream().forEach(e -> {
             assertThat(e.getDeployState().equals(DeployState.UNDEPLOYED));
             assertThat(e.getLockState().equals(LockState.NONE));

diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java
index 564fa8d..6d43803 100644 (file)
--- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java
+++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java
@@ -86,7 +86,6 @@ public class SupervisionParticipantHandler {
             var participant = participantOpt.get();
             participant.setParticipantState(ParticipantState.OFF_LINE);
             participantProvider.updateParticipant(participant);
-            participantProvider.resetParticipantAcElementState(participant.getParticipantId());
         }
 
         participantDeregisterAckPublisher.send(participantDeregisterMsg.getMessageId());

diff --git a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java
index f00747c..e441bef 100644 (file)
--- a/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java
+++ b/runtime-acm/src/test/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandlerTest.java
@@ -61,7 +61,6 @@ class SupervisionParticipantHandlerTest {
         handler.handleParticipantMessage(participantDeregisterMessage);
 
         verify(participantProvider).updateParticipant(any());
-        verify(participantProvider).resetParticipantAcElementState(any());
         verify(participantDeregisterAckPublisher).send(participantDeregisterMessage.getMessageId());
     }