From 7fd58e9a2427a215daa6b543e901534e83d3c246 Mon Sep 17 00:00:00 2001 From: rb7147 Date: Tue, 4 Sep 2018 14:16:04 -0400 Subject: XACML Platform Enhancements To Support Raw Policy Creation from GUI and API. GetDecision on combining algorithim with Policy Set. Issue-ID: POLICY-902 Change-Id: Ie3189f8ded2e03366bc7d65d15b95b88c89b0acd Signed-off-by: rb7147 --- .../src/main/java/org/onap/policy/api/PolicyParameters.java | 11 ++++++++++- .../src/main/java/org/onap/policy/api/RuleProvider.java | 8 ++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'PolicyEngineAPI/src') diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyParameters.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyParameters.java index 2a8175f00..fb166d401 100644 --- a/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyParameters.java +++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/PolicyParameters.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * PolicyEngineAPI * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,6 +58,7 @@ public class PolicyParameters { private String riskLevel = "5"; private String riskType = "default"; private String extendedOption; + private String rawXacmlPolicy; /** * Sets Config Policy Parameters. @@ -575,6 +576,14 @@ public class PolicyParameters { public void setTreatments(Map treatments) { this.treatments = treatments; } + + public String getRawXacmlPolicy() { + return rawXacmlPolicy; + } + + public void setRawXacmlPolicy(String rawXacmlPolicy) { + this.rawXacmlPolicy = rawXacmlPolicy; + } @Override public String toString() { diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/api/RuleProvider.java b/PolicyEngineAPI/src/main/java/org/onap/policy/api/RuleProvider.java index 913f32517..24d0bcd2c 100644 --- a/PolicyEngineAPI/src/main/java/org/onap/policy/api/RuleProvider.java +++ b/PolicyEngineAPI/src/main/java/org/onap/policy/api/RuleProvider.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * PolicyEngineAPI * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,7 +48,11 @@ public enum RuleProvider { /** * Indicates Guard BLACKLIST YAML */ - RAINY_DAY("Rainy_Day"); + RAINY_DAY("Rainy_Day"), + /** + * Indicates Raw + */ + RAW("Raw"); private final String name; -- cgit 1.2.3-korg