From 1df4475d60d9c6d46087f8284dd2e0697d59c071 Mon Sep 17 00:00:00 2001 From: Sirisha_Manchikanti Date: Mon, 6 Sep 2021 09:15:07 +0100 Subject: Fix parsing of type heirarchy for nodetypes Fixed an issue where a ControlLoopElement with type defined in node-types is not parsed. This commit also includes changes to save the state of a controlLoopElement coming from ControlLoopAck message into runtime database. Issue-ID: POLICY-3575 Signed-off-by: Sirisha_Manchikanti Change-Id: I1249cf2cabd4a499d80b401f94f7f42f08b350e3 --- .../models/controlloop/concepts/ControlLoopElementAck.java | 4 +++- .../models/messages/dmaap/participant/ParticipantAckMessage.java | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'models/src/main') diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementAck.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementAck.java index a5918fe94..61b90c9e9 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementAck.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementAck.java @@ -31,10 +31,12 @@ import lombok.ToString; @ToString public class ControlLoopElementAck { + // State of the controlLoopElement + private ControlLoopState state; + // Result: Success/Fail. private Boolean result; // Message indicating reason for failure private String message; - } diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantAckMessage.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantAckMessage.java index c6f5c61b9..8a1be69bd 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantAckMessage.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantAckMessage.java @@ -25,6 +25,7 @@ import lombok.Getter; import lombok.NonNull; import lombok.Setter; import lombok.ToString; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantState; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; /** @@ -56,6 +57,11 @@ public class ParticipantAckMessage { */ private ToscaConceptIdentifier participantId; + /** + * Participant State, or {@code null} for messages from participants. + */ + private ParticipantState state; + /** * Constructor for instantiating a participant ack message class. * @@ -77,6 +83,7 @@ public class ParticipantAckMessage { this.messageType = source.messageType; this.participantType = source.participantType; this.participantId = source.participantId; + this.state = source.state; } /** -- cgit 1.2.3-korg