diff options
3 files changed, 33 insertions, 1 deletions
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java index d3f1786c7..eab04e22e 100644 --- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java +++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java @@ -20,23 +20,46 @@ package org.onap.policy.controlloop; +import com.google.gson.annotations.SerializedName; + import java.io.Serializable; import java.util.UUID; public abstract class ControlLoopEvent implements Serializable { private static final long serialVersionUID = 2391252138583119195L; - + + @SerializedName("closedLoopControlName") private String closedLoopControlName; + + @SerializedName("version") private String version = "1.0.2"; + + @SerializedName("requestID") private UUID requestId; + + @SerializedName("closedLoopEventClient") private String closedLoopEventClient; + + @SerializedName("target_type") private ControlLoopTargetType targetType; + + @SerializedName("target") private String target; + + @SerializedName("from") private String from; + + @SerializedName("policyScope") private String policyScope; + + @SerializedName("policyName") private String policyName; + + @SerializedName("policyVersion") private String policyVersion; + + @SerializedName("closedLoopEventStatus") private ControlLoopEventStatus closedLoopEventStatus; public ControlLoopEvent() { diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java index ec4fc47dd..b5ae50ac8 100644 --- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java +++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java @@ -29,8 +29,13 @@ import java.util.Map; public class VirtualControlLoopEvent extends ControlLoopEvent { private static final long serialVersionUID = -5752405682246066226L; + + @SerializedName("closedLoopAlarmStart") private Instant closedLoopAlarmStart; + + @SerializedName("closedLoopAlarmEnd") private Instant closedLoopAlarmEnd; + @SerializedName("AAI") private Map<String, String> aai = new HashMap<>(); diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java index acb81f8ba..71a901505 100644 --- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java +++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java @@ -32,7 +32,11 @@ public class VirtualControlLoopNotification extends ControlLoopNotification { @SerializedName("AAI") private Map<String, String> aai = new HashMap<>(); + + @SerializedName("closedLoopAlarmStart") private Instant closedLoopAlarmStart; + + @SerializedName("closedLoopAlarmEnd") private Instant closedLoopAlarmEnd; public VirtualControlLoopNotification() {} |