summaryrefslogtreecommitdiffstats
path: root/models-decisions
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-03-22 13:33:19 -0400
committerPamela Dragosh <pdragosh@research.att.com>2019-03-25 08:09:55 -0400
commitb9ae793fe73dbfbd8d9021d4d13dac9b805dbde8 (patch)
tree1f87a40af23f6b82357ab642d96d477e98e364e2 /models-decisions
parentcc740771e3fdf02bc6e9e02f1d4f4d6cc39afcb0 (diff)
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 <pdragosh@research.att.com>
Diffstat (limited to 'models-decisions')
-rw-r--r--models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionRequest.java3
-rw-r--r--models-decisions/src/main/java/org/onap/policy/models/decisions/concepts/DecisionResponse.java5
2 files changed, 6 insertions, 2 deletions
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<String, Object> advice;
+ private Map<String, Object> obligations;
private List<Map<String, Object>> policies;
}