From b6d9063e06ab8cdf2d97fc75810792659344e4a8 Mon Sep 17 00:00:00 2001 From: Michael Mokry Date: Fri, 16 Mar 2018 20:50:41 -0500 Subject: 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 --- .../src/main/java/org/onap/policy/api/AttributeType.java | 4 ++++ .../src/main/java/org/onap/policy/api/DictionaryType.java | 4 ++++ .../src/main/java/org/onap/policy/api/ImportParameters.java | 3 ++- .../src/main/java/org/onap/policy/api/PolicyConfigType.java | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) (limited to 'PolicyEngineAPI/src/main') 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 @@ -41,6 +41,10 @@ public enum AttributeType { * Indicates Attributes required to create MicroService policy. */ MICROSERVICE("microService"), + /** + * Indicates Attributes required to create Optimization policy. + */ + OPTIMIZATION("optimization"), /** * Indicates Attributes required to create settings for Decision Policy. */ 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 @@ -51,6 +51,10 @@ public enum DictionaryType { * Indicates DCAE Micro Service Policy Dictionaries. */ MicroService("MicroService"), + /** + * Indicates Optimization Policy Dictionaries + */ + Optimization("Optimization"), /** * Indicates Descriptive Scope Dictionaries */ 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") ; -- cgit 1.2.3-korg