diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-08-25 15:31:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-25 15:31:28 +0000 |
| commit | b01887963f4b015173d442ce5f53bb8c04e4c758 (patch) | |
| tree | a7f4af44ed03b35bf9d4a197fb707b56e1c57a5b /main | |
| parent | 26169c3db78c405f7b58e831c7391fc63ddb935d (diff) | |
| parent | f8d2c21bb589303febc11024f3cd667946f44459 (diff) | |
Merge "Add new Match application to XACML"
Diffstat (limited to 'main')
| -rw-r--r-- | main/pom.xml | 5 | ||||
| -rw-r--r-- | main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java | 4 | ||||
| -rw-r--r-- | main/src/test/resources/apps/match/xacml.properties | 31 |
3 files changed, 38 insertions, 2 deletions
diff --git a/main/pom.xml b/main/pom.xml index d16db20a..9382938e 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -94,6 +94,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.onap.policy.xacml-pdp.applications</groupId> + <artifactId>match</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.onap.policy.models</groupId> <artifactId>policy-models-pdp</artifactId> <version>${policy.models.version}</version> diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java index 668d875c..4670e785 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/XacmlPdpApplicationManagerTest.java @@ -142,10 +142,10 @@ public class XacmlPdpApplicationManagerTest { // assertThat(manager).isNotNull(); assertThat(manager.getPolicyCount()).isZero(); - assertThat(manager.getPolicyTypeCount()).isEqualTo(17); + assertThat(manager.getPolicyTypeCount()).isEqualTo(18); assertThat(manager.getToscaPolicies()).isEmpty(); assertThat(manager.getToscaPolicyIdentifiers()).isEmpty(); - assertThat(manager.getToscaPolicyTypeIdents()).hasSize(17); + assertThat(manager.getToscaPolicyTypeIdents()).hasSize(18); assertThat(manager.findNativeApplication()).isInstanceOf(NativePdpApplication.class); diff --git a/main/src/test/resources/apps/match/xacml.properties b/main/src/test/resources/apps/match/xacml.properties new file mode 100644 index 00000000..5ea247cf --- /dev/null +++ b/main/src/test/resources/apps/match/xacml.properties @@ -0,0 +1,31 @@ +# +# Properties that the embedded PDP engine uses to configure and load +# +# Standard API Factories +# +xacml.dataTypeFactory=com.att.research.xacml.std.StdDataTypeFactory +xacml.pdpEngineFactory=com.att.research.xacmlatt.pdp.ATTPDPEngineFactory +xacml.pepEngineFactory=com.att.research.xacml.std.pep.StdEngineFactory +xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory +xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFactory +# +# AT&T PDP Implementation Factories +# +xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory +xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory +xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctionDefinitionFactory +# +# ONAP PDP Implementation Factories +# +xacml.att.policyFinderFactory=org.onap.policy.pdp.xacml.application.common.OnapPolicyFinderFactory + +# +# Use a root combining algorithm +# +xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-permit-overrides + +# +# Policies to load +# +xacml.rootPolicies= +xacml.referencedPolicies=
\ No newline at end of file |