From b9ae793fe73dbfbd8d9021d4d13dac9b805dbde8 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Fri, 22 Mar 2019 13:33:19 -0400 Subject: Add new policy types These are the models from Optimization team. Please note the new matchable field. I'm trying to get clarification on what that field means. Added also a single file for all the optimization policies. Note, I think some of them may not be right. The hpa one did not render correct. But I can fix that later. Fixed capacity policy which had indentation wrong and VNFPolicy missing type. Added some guard examples. Fixed Decision Response to support fields for all the decisions. Issue-ID: POLICY-1273 Change-Id: Ib0c06cb203f6355e3050f7d8a7a51a0c1437a8a4 Signed-off-by: Pamela Dragosh --- .../org/onap/policy/models/decisions/concepts/DecisionRequest.java | 3 +++ .../org/onap/policy/models/decisions/concepts/DecisionResponse.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'models-decisions/src') diff --git a/models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionRequest.java b/models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionRequest.java index 94c9c9585..1ba7f4362 100644 --- a/models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionRequest.java +++ b/models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionRequest.java @@ -43,6 +43,9 @@ public class DecisionRequest { @SerializedName("ONAPInstance") private String onapInstance; + @SerializedName("requestId") + private String requestId; + @SerializedName("action") private String action; diff --git a/models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionResponse.java b/models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionResponse.java index b265fe4fb..b4f288685 100644 --- a/models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionResponse.java +++ b/models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionResponse.java @@ -33,7 +33,8 @@ import lombok.Data; */ @Data public class DecisionResponse { - - private String errorMessage; + private String status; + private Map advice; + private Map obligations; private List> policies; } -- cgit 1.2.3-korg