From fc5c07705edc4dcb7083b39116a43844bb6a1490 Mon Sep 17 00:00:00 2001 From: Ravindra Bakkamanthala Date: Mon, 5 Jun 2017 22:42:02 -0400 Subject: Fixed the Policy API issues and Bugfixes Change-Id: I6e8b54442421b6ebd0ff88426fc6e5f3a36b0690 Signed-off-by: Ravindra Bakkamanthala --- .../servers/console/bin/xacml.admin.properties | 4 + .../pap/bin/Decision_GuardPolicyTemplate.xml | 99 ---------------------- .../install/servers/pap/bin/xacml.pap.properties | 2 + ....Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt | 2 +- ....Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt | 2 +- .../install/servers/pdp/bin/xacml.pdp.properties | 1 + 6 files changed, 9 insertions(+), 101 deletions(-) delete mode 100644 packages/base/src/files/install/servers/pap/bin/Decision_GuardPolicyTemplate.xml (limited to 'packages/base/src/files/install/servers') diff --git a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties index dbbcc59fb..7c2d1d270 100644 --- a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties +++ b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties @@ -41,6 +41,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 xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory +# +# Policy Adapter Implementation class +# +policyAdapter.impl.className = org.openecomp.policy.admin.PolicyAdapter # # This is an extremely simple policy to demonstrate authorization diff --git a/packages/base/src/files/install/servers/pap/bin/Decision_GuardPolicyTemplate.xml b/packages/base/src/files/install/servers/pap/bin/Decision_GuardPolicyTemplate.xml deleted file mode 100644 index 6701a0848..000000000 --- a/packages/base/src/files/install/servers/pap/bin/Decision_GuardPolicyTemplate.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - ${description} - - - - - ${PolicyName} - - - - - - ${ECOMPName} - - - - ${actor} - - - - ${recipe} - - - - - - - - - - - DECIDE - - - - - - - - - - - - - ${guardActiveStart} - ${guardActiveEnd} - - - - - - - ${limit} - - - - - - - - - - DECIDE - - - - - - - - - - - - - - ${guardActiveStart} - ${guardActiveEnd} - - - - - - - ${limit} - - - - - - - - Denied! - - - - - \ No newline at end of file diff --git a/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties b/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties index 143aeabce..3e30bde80 100644 --- a/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties +++ b/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties @@ -110,6 +110,8 @@ xacml.rest.pap.autopush.flag=false xacml.rest.pap.autopush.file=autopush.properties #Patter to identify if a attribute is ready. Currently just a place holder xacm.xcor.required.pattern=1,1 +#the number of times an incoming policy update notification will be tried to be processed (or until it succeeds) +xacml.rest.pap.incomingnotification.tries=4 #***Properties for IntegrityMonitor integration defined in XACMLRestProperties.java*** #The name of the PAP. Must be unique across the system diff --git a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt index 25b53d0ca..955afbd0f 100755 --- a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt +++ b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt @@ -1124,7 +1124,7 @@ rule "BRMSParamvFWDemoPolicy.MSO.RESPONSE" } end -rule "Params" +rule "com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.Params" salience 1000 when then diff --git a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt index e640d007d..90ae05aa3 100755 --- a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt +++ b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt @@ -1124,7 +1124,7 @@ rule "BRMSParamvLBDemoPolicy.MSO.RESPONSE" } end -rule "Params" +rule "com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.Params" salience 1000 when then 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 3b0431958..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 @@ -132,6 +132,7 @@ 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 -- cgit 1.2.3-korg