From 85744c81b27a833db4a8089c90a4faeb98d8f349 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Wed, 11 Dec 2019 10:00:21 -0500 Subject: Add optimization subscriber request Adding support for a preliminary request to pull subscriber details. The returned decision adds scope attributes for the original request. Fixed some checkstyle issues due to new checkstyle requirements. Issue-ID: POLICY-2066 Change-Id: Ief02d896ce33e4864bb20e9185b0d0f5eb254bfd Signed-off-by: Pamela Dragosh --- .../pdp/xacml/application/common/ToscaDictionary.java | 16 ++++++++++++++++ .../common/std/StdMatchablePolicyRequest.java | 2 +- .../common/std/StdXacmlApplicationServiceProvider.java | 3 +-- 3 files changed, 18 insertions(+), 3 deletions(-) (limited to 'applications/common/src') diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java index 1a899971..c8dab3a8 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/ToscaDictionary.java @@ -105,6 +105,22 @@ public final class ToscaDictionary { public static final Identifier ID_ADVICE_GUARD_REQUESTID = new IdentifierImpl(ID_URN_ONAP, "guard:advice:request-id"); + /* + * These id's are specifically for optimization subscriber policies + */ + public static final Identifier ID_SUBJECT_OPTIMIZATION_SUBSCRIBER_NAME = + new IdentifierImpl(ID_URN_ONAP, "optimization:subscriber:name"); + + /* + * These ids are specifically for optimization advice + */ + public static final Identifier ID_ADVICE_OPTIMIZATION_SUBSCRIBER = + new IdentifierImpl(ID_URN_ONAP, "optimization:advice:subscriber"); + public static final Identifier ID_ADVICE_OPTIMIZATION_SUBSCRIBER_ROLE = + new IdentifierImpl(ID_URN_ONAP, "optimization:advice:subscriber:role"); + public static final Identifier ID_ADVICE_OPTIMIZATION_SUBSCRIBER_STATUS = + new IdentifierImpl(ID_URN_ONAP, "optimization:advice:subscriber:status"); + /* * Obligation specific ID's */ diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchablePolicyRequest.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchablePolicyRequest.java index b478e8c1..2d83b897 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchablePolicyRequest.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchablePolicyRequest.java @@ -163,7 +163,7 @@ public class StdMatchablePolicyRequest { return mutableRequest; } - private static StdMutableRequestAttributes addResources(StdMutableRequestAttributes attributes, + protected static StdMutableRequestAttributes addResources(StdMutableRequestAttributes attributes, Collection values, String id) throws DataTypeException { DataTypeFactory factory = getDataTypeFactory(); diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java index 5aea3457..e43e6519 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdXacmlApplicationServiceProvider.java @@ -121,8 +121,7 @@ public abstract class StdXacmlApplicationServiceProvider implements XacmlApplica // // Convert the policies first // - PolicyType xacmlPolicy = this.getTranslator(toscaPolicy.getType()) - .convertPolicy(toscaPolicy); + PolicyType xacmlPolicy = this.getTranslator(toscaPolicy.getType()).convertPolicy(toscaPolicy); if (xacmlPolicy == null) { throw new ToscaPolicyConversionException("Failed to convert policy"); } -- cgit 1.2.3-korg