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 <jreich@research.att.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

13 files changed, 89 insertions, 81 deletions

diff --git a/controlloop/templates/template.demo.clc/pom.xml b/controlloop/templates/template.demo.clc/pom.xml
index 16e7e80f1..203d41027 100644
--- a/controlloop/templates/template.demo.clc/pom.xml
+++ b/controlloop/templates/template.demo.clc/pom.xml
@@ -109,6 +109,12 @@
     </dependency>
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>database</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
       <artifactId>guard</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelperEmbedded.java b/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelperEmbedded.java
index d51a862db..e0cd2c9c4 100644
--- a/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelperEmbedded.java
+++ b/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelperEmbedded.java
@@ -51,6 +51,7 @@ import org.json.JSONObject;
 import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil;
 import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
+import org.onap.policy.database.operationshistory.Dbao;
 import org.onap.policy.drools.system.PolicyEngine;
 import org.onap.policy.guard.PolicyGuardResponse;
 import org.onap.policy.guard.PolicyGuardXacmlRequestAttributes;
@@ -311,11 +312,11 @@ public class PolicyGuardXacmlHelperEmbedded {
             while (itAttr.hasNext()) {
                 Attribute currentAttr = itAttr.next();
                 String attributeId = currentAttr.getAttributeId().stringValue();
-                if ("urn:oasis:names:tc:xacml:1.0:request:request-id".equals(attributeId)) {
+                if ("urn:org:onap:guard:request:request-id".equals(attributeId)) {
                     Iterator<AttributeValue<?>> itValues = currentAttr.getValues().iterator();
                     reqIdFromXacmlResponse = UUID.fromString(itValues.next().getValue().toString());
                 }
-                if ("urn:oasis:names:tc:xacml:1.0:operation:operation-id".equals(attributeId)) {
+                if ("urn:org:onap:guard:operation:operation-id".equals(attributeId)) {
                     Iterator<AttributeValue<?>> itValues = currentAttr.getValues().iterator();
                     operationFromXacmlResponse = itValues.next().getValue().toString();
                 }
diff --git a/controlloop/templates/template.demo.clc/src/main/resources/coordination/prototype/firstBlocksSecond.xml b/controlloop/templates/template.demo.clc/src/main/resources/coordination/prototype/firstBlocksSecond.xml
index 54cda9575..0610ba9fc 100644
--- a/controlloop/templates/template.demo.clc/src/main/resources/coordination/prototype/firstBlocksSecond.xml
+++ b/controlloop/templates/template.demo.clc/src/main/resources/coordination/prototype/firstBlocksSecond.xml
@@ -22,9 +22,9 @@
 <!--
 # PIP Engine Definition
 #
-xacml.pip.engines=getstatus
-getstatus.classname=org.onap.policy.guard.PipEngineGetStatus
-getstatus.issuer=org:onap:policy:guard:getstatus
+xacml.pip.engines=get-operation-outcome
+get-operation-outcome.classname=org.onap.policy.database.operationshistory.GetOperationOutcomePip
+get-operation-outcome.issuer=urn:org:onap:xacml:guard:get-operation-outcome"
 -->
 
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" PolicyId="urn:com:att:xacml:policy:id:son:guard:UNIQUE_ID" Version="1" RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-unless-deny">
@@ -35,7 +35,7 @@ getstatus.issuer=org:onap:policy:guard:getstatus
         <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-regexp-match">
           <!-- value to be autofilled by yaml from a xacml template -->
           <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">CONTROL_LOOP_TWO</AttributeValue>
-          <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="urn:oasis:names:tc:xacml:1.0:clname:clname-id" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+          <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="urn:org:onap:guard:clname:clname-id" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
         </Match>
       </AllOf>
     </AnyOf>
@@ -54,7 +54,11 @@ getstatus.issuer=org:onap:policy:guard:getstatus
   <VariableDefinition VariableId="clc_status">
     <Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-one-and-only">
       <!-- to be autofilled by yaml from a xacml template -->
-      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="com:att:research:xacml:test:sql:resource:operations:status" DataType="http://www.w3.org/2001/XMLSchema#string" Issuer="org:onap:policy:guard:getstatus:clname:CONTROL_LOOP_ONE" MustBePresent="false"/>
+      <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource"
+			   AttributeId="urn:org:onap:guard:operation:operation-outcome"
+			   DataType="http://www.w3.org/2001/XMLSchema#string"
+			   Issuer="urn:org:onap:xacml:guard:get-operation-outcome:clname:CONTROL_LOOP_ONE"
+			   MustBePresent="false"/>
     </Apply>
   </VariableDefinition>
 </Policy>
diff --git a/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/SupportUtil.java b/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/SupportUtil.java
index a9f0a04e4..8a8dd894a 100644
--- a/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/SupportUtil.java
+++ b/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/SupportUtil.java
@@ -325,7 +325,7 @@ public final class SupportUtil {
      *  Set the operation history properties.
      */
     public static void setPuProp() {
-        System.setProperty(OPSHISTPUPROP, "TestOperationsHistoryPU");
+        System.setProperty(OPSHISTPUPROP, "OperationsHistoryPUTest");
     }
 
     /**
@@ -337,12 +337,12 @@ public final class SupportUtil {
         //
         // Connect to in-mem db
         //
-        EntityManagerFactory emf = Persistence.createEntityManagerFactory("TestOperationsHistoryPU");
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("OperationsHistoryPUTest");
         EntityManager em = emf.createEntityManager();
         //
         // Create query
         //
-        String sql = "select * from operationshistory10";
+        String sql = "select * from operationshistory";
         Query nq = em.createNativeQuery(sql);
         List<?> results = null;
         //
diff --git a/controlloop/templates/template.demo.clc/src/test/resources/META-INF/persistence.xml b/controlloop/templates/template.demo.clc/src/test/resources/META-INF/persistence.xml
index 808cef9b6..e1aa93f51 100644
--- a/controlloop/templates/template.demo.clc/src/test/resources/META-INF/persistence.xml
+++ b/controlloop/templates/template.demo.clc/src/test/resources/META-INF/persistence.xml
@@ -3,14 +3,14 @@
   ============LICENSE_START=======================================================

   drools-applications

   ================================================================================

-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.

+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.

   ================================================================================

   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.

@@ -18,31 +18,26 @@
   limitations under the License.

   ============LICENSE_END=========================================================

   -->

-<persistence version="2.1"

-    xmlns="http://xmlns.jcp.org/xml/ns/persistence"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">

+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">

 

     <!-- In-mem DB for junit -->

-    <persistence-unit name="TestOperationsHistoryPU"

+    <persistence-unit name="OperationsHistoryPUTest"

         transaction-type="RESOURCE_LOCAL">

         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>

-        <class>org.onap.policy.controlloop.eventmanager.OperationsHistoryDbEntry</class>

+

+	<class>org.onap.policy.database.operationshistory.Dbao</class>

+

         <properties>

-            <property name="eclipselink.ddl-generation"

-                value="create-tables" />

-            <property name="javax.persistence.jdbc.driver"

-                value="org.h2.Driver" />

-            <property name="javax.persistence.jdbc.url"

-                value="jdbc:h2:mem:test" />

-            <property name="javax.persistence.jdbc.user"

-                value="sa" />

-            <property name="javax.persistence.jdbc.password"

-                value="" />

-            <property name="eclipselink.logging.level"

-                value="CONFIG" />

+            <property name="eclipselink.ddl-generation" value="create-tables" />

+            <property name="eclipselink.logging.level" value="FINE" />

+	    <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>

+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />

+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE" />

+            <property name="javax.persistence.jdbc.user" value="policy" />

+            <property name="javax.persistence.jdbc.password" value="P01icY" />

+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>

+            <property name="javax.persistence.schema-generation.create-source" value="metadata"/>

         </properties>

     </persistence-unit>

 

-

 </persistence>

diff --git a/controlloop/templates/template.demo.clc/src/test/resources/properties/prototype/xacml_guard_clc.properties b/controlloop/templates/template.demo.clc/src/test/resources/properties/prototype/xacml_guard_clc.properties
index edc76517a..fa9568b5c 100644
--- a/controlloop/templates/template.demo.clc/src/test/resources/properties/prototype/xacml_guard_clc.properties
+++ b/controlloop/templates/template.demo.clc/src/test/resources/properties/prototype/xacml_guard_clc.properties
@@ -42,5 +42,6 @@ xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderF
 #
 
 # 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
 xacml.att.policyFinderFactory.combineRootPolicies=urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:permit-unless-deny
+
+get-operation-outcome.persistenceunit=OperationsHistoryPUTest
\ No newline at end of file
diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml
index 2471f9200..862fa2809 100644
--- a/controlloop/templates/template.demo/pom.xml
+++ b/controlloop/templates/template.demo/pom.xml
@@ -100,7 +100,7 @@
       <artifactId>sdnc</artifactId>
       <version>${policy.models.version}</version>
       <scope>provided</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
       <artifactId>events</artifactId>
@@ -109,6 +109,12 @@
     </dependency>
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>database</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
       <artifactId>guard</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
@@ -183,7 +189,7 @@
       <artifactId>actor.sdnc</artifactId>
       <version>${policy.models.version}</version>
       <scope>provided</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -214,4 +220,3 @@
     </dependency>
   </dependencies>
 </project>
-
diff --git a/controlloop/templates/template.demo/src/main/resources/blacklist_template.xml b/controlloop/templates/template.demo/src/main/resources/blacklist_template.xml
index 590b19d25..1563e4a7d 100644
--- a/controlloop/templates/template.demo/src/main/resources/blacklist_template.xml
+++ b/controlloop/templates/template.demo/src/main/resources/blacklist_template.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   drools-applications
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${clname}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:clname:clname-id"
+                        AttributeId="urn:org:onap:guard:clname:clname-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -45,7 +45,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:actor:actor-id"
+                        AttributeId="urn:org:onap:guard:actor:actor-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -55,7 +55,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${recipe}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:operation:operation-id"
+                        AttributeId="urn:org:onap:guard:operation:operation-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -86,7 +86,7 @@
                 FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-one-and-only">
                 <AttributeDesignator
                     Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource"
-                    AttributeId="urn:oasis:names:tc:xacml:1.0:target:target-id"
+                    AttributeId="urn:org:onap:guard:target:target-id"
                     DataType="http://www.w3.org/2001/XMLSchema#string"
                     MustBePresent="false" />
             </Apply>
diff --git a/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template.xml b/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template.xml
index 34aa1af69..d26432f86 100644
--- a/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template.xml
+++ b/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   drools-applications
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${clname}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:clname:clname-id"
+                        AttributeId="urn:org:onap:guard:clname:clname-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -46,7 +46,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:actor:actor-id"
+                        AttributeId="urn:org:onap:guard:actor:actor-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -56,7 +56,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${recipe}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:operation:operation-id"
+                        AttributeId="urn:org:onap:guard:operation:operation-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -67,7 +67,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${targets}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:target:target-id"
+                        AttributeId="urn:org:onap:guard:target:target-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
diff --git a/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template_old.xml b/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template_old.xml
index b41fdb3f2..e1e3451f3 100644
--- a/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template_old.xml
+++ b/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template_old.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   drools-applications
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:actor:actor-id"
+                        AttributeId="urn:org:onap:guard:actor:actor-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -42,7 +42,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${recipe}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:operation:operation-id"
+                        AttributeId="urn:org:onap:guard:operation:operation-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/SupportUtil.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/SupportUtil.java
index d5eb28e23..3091656c0 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/SupportUtil.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/SupportUtil.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * demo
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -341,7 +341,7 @@ public final class SupportUtil {
      *  Set the operation history properties.
      */
     public static void setPuProp() {
-        System.setProperty(OPSHISTPUPROP, "TestOperationsHistoryPU");
+        System.setProperty(OPSHISTPUPROP, "OperationsHistoryPUTest");
     }
 
     /**
diff --git a/controlloop/templates/template.demo/src/test/resources/META-INF/persistence.xml b/controlloop/templates/template.demo/src/test/resources/META-INF/persistence.xml
index 808cef9b6..b6d80e099 100644
--- a/controlloop/templates/template.demo/src/test/resources/META-INF/persistence.xml
+++ b/controlloop/templates/template.demo/src/test/resources/META-INF/persistence.xml
@@ -3,14 +3,14 @@
   ============LICENSE_START=======================================================

   drools-applications

   ================================================================================

-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.

+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.

   ================================================================================

   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.

@@ -18,31 +18,26 @@
   limitations under the License.

   ============LICENSE_END=========================================================

   -->

-<persistence version="2.1"

-    xmlns="http://xmlns.jcp.org/xml/ns/persistence"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">

+<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0">

 

     <!-- In-mem DB for junit -->

-    <persistence-unit name="TestOperationsHistoryPU"

+    <persistence-unit name="OperationsHistoryPUTest"

         transaction-type="RESOURCE_LOCAL">

         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>

-        <class>org.onap.policy.controlloop.eventmanager.OperationsHistoryDbEntry</class>

+

+        <class>org.onap.policy.database.operationshistory.Dbao</class>

+

         <properties>

-            <property name="eclipselink.ddl-generation"

-                value="create-tables" />

-            <property name="javax.persistence.jdbc.driver"

-                value="org.h2.Driver" />

-            <property name="javax.persistence.jdbc.url"

-                value="jdbc:h2:mem:test" />

-            <property name="javax.persistence.jdbc.user"

-                value="sa" />

-            <property name="javax.persistence.jdbc.password"

-                value="" />

-            <property name="eclipselink.logging.level"

-                value="CONFIG" />

+            <property name="eclipselink.ddl-generation" value="create-tables" />

+            <property name="eclipselink.logging.level" value="FINE" />

+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>

+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />

+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE" />

+            <property name="javax.persistence.jdbc.user" value="policy" />

+            <property name="javax.persistence.jdbc.password" value="P01icY" />

+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>

+            <property name="javax.persistence.schema-generation.create-source" value="metadata"/>

         </properties>

     </persistence-unit>

 

-

 </persistence>

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