From 85751a7d52cc6efbea69c08f71f550ae32c61043 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Tue, 27 Jun 2023 16:40:31 +0100 Subject: Add restart publisher to support participant restart scenario in ACM Issue-ID: POLICY-4743 Change-Id: Iecb8b4f5f5bf9be788d3507354f267f73d8c53d8 Signed-off-by: FrancescoFioraEst --- .../comm/AcElementPropertiesPublisher.java | 13 +-- .../comm/AutomationCompositionDeployPublisher.java | 9 +- .../comm/ParticipantRestartPublisher.java | 103 +++++++++++++++++++++ 3 files changed, 107 insertions(+), 18 deletions(-) create mode 100644 runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantRestartPublisher.java (limited to 'runtime-acm/src') diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AcElementPropertiesPublisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AcElementPropertiesPublisher.java index c5f33ad97..78a9e8a72 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AcElementPropertiesPublisher.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AcElementPropertiesPublisher.java @@ -27,15 +27,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.function.UnaryOperator; import lombok.AllArgsConstructor; import org.onap.policy.clamp.models.acm.concepts.AcElementDeploy; import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; import org.onap.policy.clamp.models.acm.concepts.ParticipantDeploy; import org.onap.policy.clamp.models.acm.messages.dmaap.participant.PropertiesUpdate; import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder; -import org.onap.policy.models.base.PfUtils; -import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; +import org.onap.policy.clamp.models.acm.utils.AcmUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -47,7 +45,7 @@ import org.springframework.stereotype.Component; @AllArgsConstructor public class AcElementPropertiesPublisher extends AbstractParticipantPublisher { - private static final Logger LOGGER = LoggerFactory.getLogger(AutomationCompositionDeployPublisher.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AcElementPropertiesPublisher.class); /** * Send ACElementPropertiesUpdate to Participant. @@ -59,12 +57,7 @@ public class AcElementPropertiesPublisher extends AbstractParticipantPublisher

> map = new HashMap<>(); for (var element : automationComposition.getElements().values()) { - var acElementDeploy = new AcElementDeploy(); - acElementDeploy.setId(element.getId()); - acElementDeploy.setDefinition(new ToscaConceptIdentifier(element.getDefinition())); - acElementDeploy.setOrderedState(DeployOrder.UPDATE); - acElementDeploy.setProperties(PfUtils.mapMap(element.getProperties(), UnaryOperator.identity())); - + var acElementDeploy = AcmUtils.createAcElementDeploy(element, DeployOrder.UPDATE); map.putIfAbsent(element.getParticipantId(), new ArrayList<>()); map.get(element.getParticipantId()).add(acElementDeploy); } diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AutomationCompositionDeployPublisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AutomationCompositionDeployPublisher.java index 2628f030d..fbb6e14c5 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AutomationCompositionDeployPublisher.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/AutomationCompositionDeployPublisher.java @@ -29,7 +29,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.function.UnaryOperator; import lombok.AllArgsConstructor; import org.onap.policy.clamp.models.acm.concepts.AcElementDeploy; import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; @@ -37,8 +36,6 @@ import org.onap.policy.clamp.models.acm.concepts.ParticipantDeploy; import org.onap.policy.clamp.models.acm.messages.dmaap.participant.AutomationCompositionDeploy; import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder; import org.onap.policy.clamp.models.acm.utils.AcmUtils; -import org.onap.policy.models.base.PfUtils; -import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,11 +64,7 @@ public class AutomationCompositionDeployPublisher extends AbstractParticipantPub var toscaServiceTemplateFragment = AcmUtils.getToscaServiceTemplateFragment(toscaServiceTemplate); Map> map = new HashMap<>(); for (var element : automationComposition.getElements().values()) { - var acElementDeploy = new AcElementDeploy(); - acElementDeploy.setId(element.getId()); - acElementDeploy.setDefinition(new ToscaConceptIdentifier(element.getDefinition())); - acElementDeploy.setOrderedState(DeployOrder.DEPLOY); - acElementDeploy.setProperties(PfUtils.mapMap(element.getProperties(), UnaryOperator.identity())); + var acElementDeploy = AcmUtils.createAcElementDeploy(element, DeployOrder.DEPLOY); acElementDeploy.setToscaServiceTemplateFragment(toscaServiceTemplateFragment); map.putIfAbsent(element.getParticipantId(), new ArrayList<>()); diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantRestartPublisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantRestartPublisher.java new file mode 100644 index 000000000..cb00c8e4d --- /dev/null +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantRestartPublisher.java @@ -0,0 +1,103 @@ +/*- + * ============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.runtime.supervision.comm; + +import io.micrometer.core.annotation.Timed; +import java.time.Instant; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; +import lombok.AllArgsConstructor; +import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; +import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionDefinition; +import org.onap.policy.clamp.models.acm.concepts.ParticipantDefinition; +import org.onap.policy.clamp.models.acm.concepts.ParticipantRestartAc; +import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantRestart; +import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder; +import org.onap.policy.clamp.models.acm.utils.AcmUtils; +import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; +import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +@Component +@AllArgsConstructor +public class ParticipantRestartPublisher extends AbstractParticipantPublisher { + + private static final Logger LOGGER = LoggerFactory.getLogger(ParticipantRestartPublisher.class); + + /** + * Send Restart to Participant. + * + */ + @Timed(value = "publisher.participant_restart", description = "Participant Restart published") + public void send(UUID participantId, AutomationCompositionDefinition acmDefinition, + List automationCompositions) { + + var message = new ParticipantRestart(); + message.setParticipantId(participantId); + message.setCompositionId(acmDefinition.getCompositionId()); + message.setMessageId(UUID.randomUUID()); + message.setTimestamp(Instant.now()); + message.setParticipantDefinitionUpdates(prepareParticipantRestarting(participantId, acmDefinition)); + + for (var automationComposition : automationCompositions) { + var restartAc = new ParticipantRestartAc(); + restartAc.setAutomationCompositionId(automationComposition.getInstanceId()); + restartAc.setDeployState(automationComposition.getDeployState()); + restartAc.setLockState(automationComposition.getLockState()); + for (var element : automationComposition.getElements().values()) { + if (participantId.equals(element.getParticipantId())) { + var acElementDeploy = AcmUtils.createAcElementDeploy(element, DeployOrder.RESTARTING); + acElementDeploy.setToscaServiceTemplateFragment(acmDefinition.getServiceTemplate()); + restartAc.getAcElementList().add(acElementDeploy); + } + } + message.getAutocompositionList().add(restartAc); + } + + LOGGER.debug("Participant Restart sent {}", message); + super.send(message); + } + + private List prepareParticipantRestarting(UUID participantId, + AutomationCompositionDefinition acmDefinition) { + var acElements = AcmUtils.extractAcElementsFromServiceTemplate(acmDefinition.getServiceTemplate()); + + // list of entry entry filtered by participantId + List> elementList = new ArrayList<>(); + Map supportedElementMap = new HashMap<>(); + for (var elementEntry : acElements) { + var elementState = acmDefinition.getElementStateMap().get(elementEntry.getKey()); + if (participantId.equals(elementState.getParticipantId())) { + var type = new ToscaConceptIdentifier(elementEntry.getValue().getType(), + elementEntry.getValue().getTypeVersion()); + supportedElementMap.put(type, participantId); + elementList.add(elementEntry); + } + } + return AcmUtils.prepareParticipantPriming(elementList, supportedElementMap); + } +} -- cgit 1.2.3-korg