aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2023-02-16 14:25:15 +0000
committerGerrit Code Review <gerrit@onap.org>2023-02-16 14:25:15 +0000
commit2f2a2f3e09096c2028973899a34246c15f01a089 (patch)
tree8ca0bd9e43f6fa5c62778c03cbc62a61ea90e1a7
parent99697800ef2c8a37d92130aa9555c017cd2e1402 (diff)
parente0c967a0e0827c3791bb60fe3fc7787c6f1743ea (diff)
Merge "Add undeploy on deregister (participant-side)"
-rw-r--r--participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java1
-rw-r--r--participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandler.java28
-rw-r--r--participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/DummyAcElementListener.java40
-rw-r--r--participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/ParticipantHandlerTest.java24
4 files changed, 93 insertions, 0 deletions
diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java
index 2d845d4c8..d76700171 100644
--- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java
@@ -333,6 +333,7 @@ public class AutomationCompositionHandler {
for (var element : participantDeploy.getAcElementList()) {
var acElement = new AutomationCompositionElement();
acElement.setId(element.getId());
+ acElement.setParticipantId(participantDeploy.getParticipantId());
acElement.setDefinition(element.getDefinition());
acElement.setDeployState(DeployState.DEPLOYING);
acElement.setLockState(LockState.NONE);
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 719c428be..bf9fbbcd2 100644
--- 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
@@ -31,6 +31,7 @@ import java.util.UUID;
import lombok.Getter;
import org.onap.policy.clamp.acm.participant.intermediary.comm.ParticipantMessagePublisher;
import org.onap.policy.clamp.acm.participant.intermediary.parameters.ParticipantParameters;
+import org.onap.policy.clamp.models.acm.concepts.AutomationComposition;
import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionElementDefinition;
import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionInfo;
import org.onap.policy.clamp.models.acm.concepts.ParticipantDefinition;
@@ -48,6 +49,7 @@ import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantRe
import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantRegisterAck;
import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantStatus;
import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantStatusReq;
+import org.onap.policy.models.base.PfModelException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -171,9 +173,35 @@ public class ParticipantHandler {
var participantDeregister = new ParticipantDeregister();
participantDeregister.setParticipantId(participantId);
+ undeployInstancesOnParticipant();
publisher.sendParticipantDeregister(participantDeregister);
}
+ private void undeployInstancesOnParticipant() {
+ automationCompositionHandler.getAutomationCompositionMap().values().forEach(ac ->
+ undeployInstanceOnParticipant(ac)
+ );
+ }
+
+ private void undeployInstanceOnParticipant(AutomationComposition automationComposition) {
+ automationComposition.getElements().values().forEach(element -> {
+ if (element.getParticipantId().equals(participantId)) {
+ undeployInstanceElementsOnParticipant(automationComposition.getInstanceId(), element.getId());
+ }
+ });
+ }
+
+ private void undeployInstanceElementsOnParticipant(UUID instanceId, UUID elementId) {
+ var acElementListeners = automationCompositionHandler.getListeners();
+ for (var acElementListener : acElementListeners) {
+ try {
+ acElementListener.undeploy(instanceId, elementId);
+ } catch (PfModelException e) {
+ LOGGER.debug("Automation composition element update failed {}", instanceId);
+ }
+ }
+ }
+
/**
* Handle a participantDeregister Ack message.
*
diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/DummyAcElementListener.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/DummyAcElementListener.java
new file mode 100644
index 000000000..b88ea03e5
--- /dev/null
+++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/acm/participant/intermediary/handler/DummyAcElementListener.java
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.clamp.acm.participant.intermediary.handler;
+
+import java.util.Map;
+import java.util.UUID;
+import org.onap.policy.clamp.acm.participant.intermediary.api.AutomationCompositionElementListener;
+import org.onap.policy.clamp.models.acm.concepts.AcElementDeploy;
+import org.onap.policy.models.base.PfModelException;
+
+public class DummyAcElementListener implements AutomationCompositionElementListener {
+ @Override
+ public void undeploy(UUID automationCompositionId, UUID automationCompositionElementId) throws PfModelException {
+
+ }
+
+ @Override
+ public void deploy(UUID automationCompositionId, AcElementDeploy element, Map<String, Object> properties)
+ throws PfModelException {
+
+ }
+}
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 7349ab9c0..3fed5bb56 100644
--- 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
@@ -28,6 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.time.Instant;
import java.util.List;
@@ -37,11 +38,13 @@ import org.onap.policy.clamp.acm.participant.intermediary.comm.ParticipantMessag
import org.onap.policy.clamp.acm.participant.intermediary.main.parameters.CommonTestData;
import org.onap.policy.clamp.models.acm.concepts.ParticipantDefinition;
import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantAckMessage;
+import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantDeregister;
import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessage;
import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantMessageType;
import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantPrime;
import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantRegisterAck;
import org.onap.policy.common.utils.coder.CoderException;
+import org.onap.policy.models.base.PfModelException;
class ParticipantHandlerTest {
@@ -131,4 +134,25 @@ class ParticipantHandlerTest {
participantHandler.handleParticipantRegisterAck(new ParticipantRegisterAck());
verify(publisher).sendParticipantStatus(any());
}
+
+ @Test
+ void testSendParticipantDeregister() throws PfModelException {
+ var commonTestData = new CommonTestData();
+ var automationCompositionMap = commonTestData.getTestAutomationCompositionMap();
+ var automationCompositionHandler = mock(AutomationCompositionHandler.class);
+ var listener = mock(DummyAcElementListener.class);
+
+ when(automationCompositionHandler.getListeners()).thenReturn(List.of(listener));
+ automationCompositionMap.values().iterator().next().getElements().values().iterator().next()
+ .setParticipantId(CommonTestData.getParticipantId());
+ when(automationCompositionHandler.getAutomationCompositionMap()).thenReturn(automationCompositionMap);
+
+ var publisher = mock(ParticipantMessagePublisher.class);
+ var parameters = CommonTestData.getParticipantParameters();
+ var participantHandler = new ParticipantHandler(parameters, publisher, automationCompositionHandler);
+
+ participantHandler.sendParticipantDeregister();
+ verify(publisher).sendParticipantDeregister(any(ParticipantDeregister.class));
+ verify(listener).undeploy(any(), any());
+ }
}