summaryrefslogtreecommitdiffstats
path: root/PolicyEngineAPI/src
diff options
context:
space:
mode:
authorMichael Mokry <mm117s@att.com>2018-03-16 20:50:41 -0500
committerMichael Mokry <mm117s@att.com>2018-03-26 09:43:24 -0500
commitb6d9063e06ab8cdf2d97fc75810792659344e4a8 (patch)
tree189c47e59cef6650ba0d39bbee31dcdaaa3ddbc7 /PolicyEngineAPI/src
parentc8bed1e392b935ec50aaeeb5fb82d25a9568b790 (diff)
New Optimization Policy
This is the new Optimization Policy to support the Integration of the OOF Policy Model into the Policy Platform. Added changes from Frank Wang to fix the following issues with existing Model Parser: 1. TOSCA Rendering issues 2. Matching Attributes support 3. ImportModelAPI to support TOSCA model upload via REST API Running local Sonar tonight to start fixing Sonar issues Added changes per review comments and fixed Sonar issues Change-Id: Ia8ce09c28a718ce4460475e76a750caef774bd6b Issue-ID: POLICY-622 Signed-off-by: Michael Mokry <mm117s@att.com>
Diffstat (limited to 'PolicyEngineAPI/src')
-rw-r--r--PolicyEngineAPI/src/main/java/org/onap/policy/api/AttributeType.java4
-rw-r--r--PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryType.java4
-rw-r--r--PolicyEngineAPI/src/main/java/org/onap/policy/api/ImportParameters.java3
-rw-r--r--PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigType.java6
4 files changed, 15 insertions, 2 deletions
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/api/AttributeType.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/AttributeType.java
index 0a4621902..bb6b08d7a 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/api/AttributeType.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/AttributeType.java
@@ -42,6 +42,10 @@ public enum AttributeType {
*/
MICROSERVICE("microService"),
/**
+ * Indicates Attributes required to create Optimization policy.
+ */
+ OPTIMIZATION("optimization"),
+ /**
* Indicates Attributes required to create settings for Decision Policy.
*/
SETTINGS("settings"),
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryType.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryType.java
index 56b73221f..e0f0264e2 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryType.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/DictionaryType.java
@@ -52,6 +52,10 @@ public enum DictionaryType {
*/
MicroService("MicroService"),
/**
+ * Indicates Optimization Policy Dictionaries
+ */
+ Optimization("Optimization"),
+ /**
* Indicates Descriptive Scope Dictionaries
*/
DescriptiveScope("DescriptiveScope"),
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/api/ImportParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/ImportParameters.java
index 3914864bf..51398f32d 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/api/ImportParameters.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/ImportParameters.java
@@ -39,7 +39,8 @@ public class ImportParameters {
public enum IMPORT_TYPE {
MICROSERVICE,
- BRMSPARAM
+ BRMSPARAM,
+ OPTIMIZATION
}
/**
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigType.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigType.java
index 2fb5d96db..21861da00 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigType.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyConfigType.java
@@ -58,8 +58,12 @@ public enum PolicyConfigType{
*/
MicroService("MS"),
/**
- * Indicates Custom Extended Policy type.
+ * Indicates OOF Optimization Policy.
*/
+ Optimization("Optimization"),
+ /**
+ * Indicates Custom Extended Policy type.
+ */
Extended("EXTENDED")
;