From a9cc8a51269cb27dff98a24205961c29bea79ca4 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Wed, 1 Apr 2020 10:53:12 -0400 Subject: Fix optimization supported types To support 5G slicing use cases, we will support any policy type that derives from onap.policies.optimization Similar in functionality to monitoring Issue-ID: POLICY-2460 Change-Id: I48b071a64b917cea44eb64149539875ba33e2ef5 Signed-off-by: Pamela Dragosh --- .../application/optimization/OptimizationPdpApplication.java | 10 +++++----- .../optimization/OptimizationPdpApplicationTest.java | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'applications') diff --git a/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java b/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java index 5a8978f7..8d337e47 100644 --- a/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java +++ b/applications/optimization/src/main/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplication.java @@ -63,6 +63,7 @@ public class OptimizationPdpApplication extends StdXacmlApplicationServiceProvid public static final String POLICYTYPE_QUERY = "onap.policies.optimization.service.QueryPolicy"; public static final String POLICYTYPE_VIMFIT = "onap.policies.optimization.resource.Vim_fit"; public static final String POLICYTYPE_VNF = "onap.policies.optimization.resource.VnfPolicy"; + public static final String ONAP_OPTIMIZATION_DERIVED_POLICY_TYPE = "onap.policies.optimization."; private OptimizationPdpApplicationTranslator translator = new OptimizationPdpApplicationTranslator(); private List supportedPolicyTypes = new ArrayList<>(); @@ -114,10 +115,6 @@ public class OptimizationPdpApplication extends StdXacmlApplicationServiceProvid @Override public boolean canSupportPolicyType(ToscaPolicyTypeIdentifier policyTypeId) { - // - // For the time being, restrict this if the version isn't known. - // Could be too difficult to support changing of versions dynamically. - // // // For the time being, restrict this if the version isn't known. // Could be too difficult to support changing of versions dynamically. @@ -128,7 +125,10 @@ public class OptimizationPdpApplication extends StdXacmlApplicationServiceProvid return true; } } - return false; + // + // Support derived types + // + return policyTypeId.getName().startsWith(ONAP_OPTIMIZATION_DERIVED_POLICY_TYPE); } @Override diff --git a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java index 85541f18..031ef33c 100644 --- a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java +++ b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java @@ -187,6 +187,8 @@ public class OptimizationPdpApplicationTest { "onap.policies.optimization.resource.AffinityPolicy", "1.0.0"))).isTrue(); assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier( "onap.policies.optimization.service.SubscriberPolicy", "1.0.0"))).isTrue(); + assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier( + "onap.policies.optimization.service.CustomUseCase", "1.0.0"))).isTrue(); assertThat(service.canSupportPolicyType(new ToscaPolicyTypeIdentifier( "onap.foobar", "1.0.0"))).isFalse(); } -- cgit 1.2.3-korg