diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2018-03-26 21:39:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-26 21:39:45 +0000 |
| commit | a65d684a684105c39a64181bbd44f1debb80fb06 (patch) | |
| tree | 57311bb28988a777b990fc2776bfc5dc53a0fc35 /PolicyEngineAPI | |
| parent | cc7dca9a21765dca0ba336f27659a3852f6a15d9 (diff) | |
| parent | b6d9063e06ab8cdf2d97fc75810792659344e4a8 (diff) | |
Merge "New Optimization Policy"
Diffstat (limited to 'PolicyEngineAPI')
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") ; |