From a7a144ba512654bd93b0856b1e9eb5c886060c21 Mon Sep 17 00:00:00 2001 From: Joshua Reich Date: Wed, 10 Apr 2019 13:38:59 -0700 Subject: Cleanup PIP/Database-related code. Ensure database schema/naming consistent across repos. Ensure PIP implementation consistent across repos. Cleanup unused imports and made sure licenses are ok. Issue-ID: POLICY-1471 Change-Id: I20a325fe3e66e6ae400e603ec366315aea716993 Signed-off-by: Joshua Reich Signed-off-by: Pamela Dragosh --- .../src/test/resources/xacml/xacml_guard.properties | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'controlloop/templates/template.demo/src/test/resources/xacml/xacml_guard.properties') diff --git a/controlloop/templates/template.demo/src/test/resources/xacml/xacml_guard.properties b/controlloop/templates/template.demo/src/test/resources/xacml/xacml_guard.properties index 0486f9581..175b9d3d2 100644 --- a/controlloop/templates/template.demo/src/test/resources/xacml/xacml_guard.properties +++ b/controlloop/templates/template.demo/src/test/resources/xacml/xacml_guard.properties @@ -7,9 +7,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -48,8 +48,7 @@ xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderF # the embedded PDP uses. # -# In case we have multiple applicable Guard policies, we will deny if any of them denies. -#xacml.att.policyFinderFactory.combineRootPolicies=urn:com:att:xacml:3.0:policy-combining-algorithm:combined-deny-overrides +# In case we have multiple applicable Guard policies, we will deny if any of them denies. xacml.att.policyFinderFactory.combineRootPolicies=urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:permit-unless-deny @@ -65,7 +64,9 @@ p5.file=src/test/resources/xacml/autogenerated_blacklist.xml # PIP Engine Definition # -xacml.pip.engines=historydb -historydb.classname=org.onap.policy.guard.PipEngineGetHistory -historydb.issuer=com:att:research:xacml:guard:historydb - +xacml.pip.engines=count-recent-operations +count-recent-operations.classname=org.onap.policy.pdp.xacml.application.common.operationshistory.CountRecentOperationsPip +count-recent-operations.issuer=urn:org:onap:xacml:guard:count-recent-operations +count-recent-operations.name=CountRecentOperations +count-recent-operations.description=Returns operation counts based on time window +count-recent-operations.persistenceunit=OperationsHistoryPUTest -- cgit 1.2.3-korg