aboutsummaryrefslogtreecommitdiffstats
path: root/applications/monitoring/src/test/resources
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-04-11 11:26:42 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-11 11:26:42 +0000
commitf29c828ff0a1479393001e487d5f86a1c8d744ee (patch)
tree162743d2691936bea7cd3325a11fa262a56edfbb /applications/monitoring/src/test/resources
parent74ff8601429337ca0b0ad9039188bb09a5d4a640 (diff)
parenta9c7e7322eb09672c8dfba32503653d12e685543 (diff)
Merge "XACML PDP DmaaP Deploy/UnDeploy Function"
Diffstat (limited to 'applications/monitoring/src/test/resources')
-rw-r--r--applications/monitoring/src/test/resources/vDNS.policy.input.yaml7
-rw-r--r--applications/monitoring/src/test/resources/xacml.properties11
2 files changed, 12 insertions, 6 deletions
diff --git a/applications/monitoring/src/test/resources/vDNS.policy.input.yaml b/applications/monitoring/src/test/resources/vDNS.policy.input.yaml
index 763af75f..7d8120e5 100644
--- a/applications/monitoring/src/test/resources/vDNS.policy.input.yaml
+++ b/applications/monitoring/src/test/resources/vDNS.policy.input.yaml
@@ -1,7 +1,8 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
-policies:
- -
- onap.scaleout.tca:
+topology_template:
+ policies:
+ -
+ onap.scaleout.tca:
type: onap.policies.monitoring.cdap.tca.hi.lo.app
version: 1.0.0
metadata:
diff --git a/applications/monitoring/src/test/resources/xacml.properties b/applications/monitoring/src/test/resources/xacml.properties
index 36eac3cd..5ea247cf 100644
--- a/applications/monitoring/src/test/resources/xacml.properties
+++ b/applications/monitoring/src/test/resources/xacml.properties
@@ -19,8 +19,13 @@ xacml.att.functionDefinitionFactory=com.att.research.xacmlatt.pdp.std.StdFunctio
#
xacml.att.policyFinderFactory=org.onap.policy.pdp.xacml.application.common.OnapPolicyFinderFactory
-# Policies to load
#
-xacml.rootPolicies=monitoring
-monitoring.file=../../packages/policy-xacmlpdp-tarball/src/main/resources/apps/monitoring/RootMonitoringPolicy.xml
+# 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