X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fbase%2Fsrc%2Ffiles%2Finstall%2Fservers%2Fpdp%2Fbin%2Fxacml.pdp.properties;h=7750047f7c498167a44708a796a93c7facfdf69d;hb=fc5c07705edc4dcb7083b39116a43844bb6a1490;hp=860107ff9bcaec3c2a534f7aa87f4d7ca7af6074;hpb=91d04c64771832a0b8815ffbe1f0f9920320d94d;p=policy%2Fengine.git

diff --git a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
index 860107ff9..7750047f7 100644
--- a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
@@ -34,7 +34,10 @@ xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluati
 xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
 xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
 # NOT USED SEE BELOW xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
-
+# creteUpdate Policy Implementation Class details. 
+createUpdatePolicy.impl.className=org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
+# AAF Implementation class details
+aafClient.impl.className=org.openecomp.policy.utils.AAFPolicyClientImpl
 #
 # AT&T RESTful PDP Implementation Factories
 #
@@ -44,13 +47,13 @@ xacml.att.policyFinderFactory=org.openecomp.policy.pdp.rest.XACMLPdpPolicyFinder
 # When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
 # into one PolicySet and use the given Policy Algorithm.
 #
-xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-deny-overrides
+xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-permit-overrides
 #
 # PDP RESTful API properties
 # 
-# Set this to the address where the XACML-PAP-REST servlet is running
+# Set this to the address or list of addresses where the XACML-PAP-REST servlet is running
 # http://localhost:9090/pap/
-xacml.rest.pap.url=${{REST_PAP_URL}}
+xacml.rest.pap.urls=${{REST_PAP_URL}}
 #if multiple paps exist, the xacml.rest.pap.url can be removed and they can be defined like this:
 #xacml.rest.pap.urls=http://localhost:9090/pap/,http://localhost:9091/pap/
 #
@@ -62,10 +65,16 @@ xacml.rest.pdp.id=${{REST_PDP_ID}}
 # Give the JMX port number used for the PDP
 xacml.jmx.port=${{TOMCAT_JMX_PORT}}
 #
-# Notifcation type: websocket or ueb
-#
-xacml.notification.type=websocket,UEB
-xacml.ueb.cluster=${{UEB_CLUSTER}}
+# Notification Properties
+# Notifcation type: websocket, ueb or dmaap... if left blank websocket is the default
+NOTIFICATION_TYPE=${{PDP_NOTIFICATION_TYPE}}
+NOTIFICATION_SERVERS=${{PDP_UEB_CLUSTER}}
+NOTIFICATION_TOPIC=${{PDP_UEB_TOPIC}}
+NOTIFICATION_DELAY=${{PDP_UEB_DELAY}}
+UEB_API_KEY=${{PDP_UEB_API_KEY}}
+UEB_API_SECRET=${{PDP_UEB_API_SECRET}}
+DMAAP_AAF_LOGIN=${{PDP_DMAAP_AAF_LOGIN}}
+DMAAP_AAF_PASSWORD=${{PDP_DMAAP_AAF_PASSWORD}}
 #
 # Set the directory where the PDP holds its Policy Cache and PIP Configuration
 #
@@ -123,3 +132,9 @@ javax.persistence.jdbc.user=${{JDBC_USER}}
 javax.persistence.jdbc.password=${{JDBC_PASSWORD}}
 # Environment should be Set either DEV, TEST or PROD
 ENVIRONMENT=${{ENVIRONMENT}}
+xacml.rest.pep.idfile = client.properties
+
+#AAF Policy Name space
+#Required only, when we use AAF
+policy.aaf.namespace = ${{POLICY_AAF_NAMESPACE}}
+policy.aaf.resource = ${{POLICY_AAF_RESOURCE}}