diff options
Diffstat (limited to 'models/src')
5 files changed, 9 insertions, 2 deletions
diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantDefinition.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantDefinition.java index bf93c074e..336b309ce 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantDefinition.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantDefinition.java @@ -40,6 +40,8 @@ public class ParticipantDefinition { private ToscaConceptIdentifier participantId; + private ToscaConceptIdentifier participantType; + // List of ControlLoopElementDefinition values for a particular participant private List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>(); @@ -50,6 +52,7 @@ public class ParticipantDefinition { */ public ParticipantDefinition(final ParticipantDefinition participantDefinition) { this.participantId = participantDefinition.participantId; + this.participantType = participantDefinition.participantType; this.controlLoopElementDefinitionList = PfUtils.mapList( participantDefinition.controlLoopElementDefinitionList, ControlLoopElementDefinition::new); } diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ControlLoopAck.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ControlLoopAck.java index 8e3604916..cdbfea4e2 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ControlLoopAck.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ControlLoopAck.java @@ -42,6 +42,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; public class ControlLoopAck extends ParticipantAckMessage { private ToscaConceptIdentifier controlLoopId; + private Integer startPhase; // A map with ControlLoopElementID as its key, and a pair of result and message as value per // ControlLoopElement. diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ControlLoopStateChange.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ControlLoopStateChange.java index e6955b90b..e3b7049e1 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ControlLoopStateChange.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ControlLoopStateChange.java @@ -36,6 +36,7 @@ import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop public class ControlLoopStateChange extends ParticipantMessage { private ControlLoopOrderedState orderedState; private ControlLoopState currentState; + private Integer startPhase; /** * Constructor for instantiating ControlLoopStateChange class with message name. diff --git a/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java index 7c163870e..f34777a70 100644 --- a/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java +++ b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java @@ -59,7 +59,8 @@ class ParticipantStatusTest { ToscaConceptIdentifier id = new ToscaConceptIdentifier("id", "1.2.3"); orig.setControlLoopId(id); orig.setParticipantId(id); - orig.setParticipantType(id); + ToscaConceptIdentifier type = new ToscaConceptIdentifier("type", "2.3.4"); + orig.setParticipantType(type); orig.setMessageId(UUID.randomUUID()); orig.setState(ParticipantState.ACTIVE); orig.setHealthStatus(ParticipantHealthStatus.HEALTHY); @@ -70,6 +71,7 @@ class ParticipantStatusTest { ParticipantDefinition participantDefinitionUpdate = new ParticipantDefinition(); participantDefinitionUpdate.setParticipantId(id); + participantDefinitionUpdate.setParticipantType(type); ControlLoopElementDefinition clDefinition = getClElementDefinition(id); participantDefinitionUpdate.setControlLoopElementDefinitionList(List.of(clDefinition)); orig.setParticipantDefinitionUpdates(List.of(participantDefinitionUpdate)); diff --git a/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantUpdateTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantUpdateTest.java index 06141de2b..6fe8604cf 100644 --- a/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantUpdateTest.java +++ b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantUpdateTest.java @@ -67,7 +67,7 @@ class ParticipantUpdateTest { toscaNodeTemplate.setVersion("1.2.3"); ParticipantDefinition participantDefinitionUpdate = new ParticipantDefinition(); - participantDefinitionUpdate.setParticipantId(id); + participantDefinitionUpdate.setParticipantType(id); ControlLoopElementDefinition clDefinition = getClElementDefinition(id); participantDefinitionUpdate.setControlLoopElementDefinitionList(List.of(clDefinition)); orig.setParticipantDefinitionUpdates(List.of(participantDefinitionUpdate)); |