diff options
Diffstat (limited to 'applications/common')
8 files changed, 23 insertions, 97 deletions
diff --git a/applications/common/pom.xml b/applications/common/pom.xml index 2d29ded8..0142c4e0 100644 --- a/applications/common/pom.xml +++ b/applications/common/pom.xml @@ -58,6 +58,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> + <artifactId>guard</artifactId> + <version>${policy.models.version}</version> + </dependency> + <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>policy-endpoints</artifactId> <version>${policy.common.version}</version> diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPip.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPip.java index f2d79804..3d7270e1 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPip.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPip.java @@ -145,7 +145,7 @@ public class CountRecentOperationsPip extends StdOnapPip { // // We are expecting a single result // - return em.createQuery("select count(e) from Dbao e" + return em.createQuery("select count(e) from OperationsHistory e" + " where e.outcome<>'Failure_Guard'" + " and e.actor= ?1" + " and e.operation= ?2" diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/Dbao.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/Dbao.java deleted file mode 100644 index b4ee5594..00000000 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/Dbao.java +++ /dev/null @@ -1,79 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - * ================================================================================ - * Copyright (C) 2019-2020 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. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.pdp.xacml.application.common.operationshistory; - -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; -import lombok.Data; - -@Entity -@Table(name = "operationshistory", - indexes = {@Index(name = "operationshistory_clreqid_index", columnList = "closedLoopName,requestId"), - @Index(name = "operationshistory_target_index", columnList = "target,operation,actor")}) -@Data -public class Dbao implements Serializable { - - private static final long serialVersionUID = -551420180714993577L; - - @Id - @GeneratedValue - @Column(name = "id") - private Long id; - - @Column(name = "closedLoopName", length = 255) - private String closedLoopName; - - @Column(name = "requestId", length = 50) - private String requestId; - - @Column(name = "subrequestId", length = 50) - private String subrequestId; - - @Column(name = "actor", length = 50) - private String actor; - - @Column(name = "operation", length = 50) - private String operation; - - @Column(name = "target", length = 50) - private String target; - - @Column(name = "starttime") - private Date starttime; - - @Column(name = "outcome", length = 50) - private String outcome; - - @Column(name = "message", length = 255) - private String message; - - @Column(name = "endtime") - private Date endtime; - -} diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java index 60e26a2e..95595986 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java @@ -28,7 +28,6 @@ import com.att.research.xacml.std.pip.StdPIPResponse; import com.google.common.base.Strings; import java.util.Arrays; import java.util.Collection; - import javax.persistence.NoResultException; import org.onap.policy.pdp.xacml.application.common.ToscaDictionary; import org.onap.policy.pdp.xacml.application.common.std.StdOnapPip; @@ -117,7 +116,7 @@ public class GetOperationOutcomePip extends StdOnapPip { // We are expecting a single result // String result = em - .createQuery("select e.outcome from Dbao e" + " where e.closedLoopName= ?1" + .createQuery("select e.outcome from OperationsHistory e" + " where e.closedLoopName= ?1" + " order by e.starttime desc", String.class) .setParameter(1, clname).setMaxResults(1).getSingleResult(); diff --git a/applications/common/src/main/resources/persistence.xml b/applications/common/src/main/resources/persistence.xml index e3f4a2f6..a9dedccb 100644 --- a/applications/common/src/main/resources/persistence.xml +++ b/applications/common/src/main/resources/persistence.xml @@ -3,14 +3,14 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2019-2020 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. @@ -24,7 +24,7 @@ <persistence-unit name="OperationsHistoryPU" transaction-type="RESOURCE_LOCAL"> <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> - <class>org.onap.policy.pdp.xacml.application.common.operationshistory.Dbao</class> + <class>org.onap.policy.guard.OperationsHistory</class> <properties> <property name="javax.persistence.schema-generation.database.action" value="create" /> @@ -33,6 +33,6 @@ <property name="eclipselink.logging.level" value="INFO" /> </properties> </persistence-unit> - + </persistence> -
\ No newline at end of file + diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java index 29eb2a0c..badc5f9c 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java @@ -51,6 +51,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.onap.policy.guard.OperationsHistory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -216,7 +217,7 @@ public class CountRecentOperationsPipTest { // // create entry // - Dbao newEntry = createEntry("cl-foobar-1", "vnf-1", "SUCCESS"); + OperationsHistory newEntry = createEntry("cl-foobar-1", "vnf-1", "SUCCESS"); // // No entries yet // @@ -241,7 +242,7 @@ public class CountRecentOperationsPipTest { @Test public void testStringToChronoUnit() throws PIPException { // not configured yet - Dbao newEntry = createEntry("cl-foobar-1", "vnf-1", "SUCCESS"); + OperationsHistory newEntry = createEntry("cl-foobar-1", "vnf-1", "SUCCESS"); assertEquals(-1, getCount(newEntry)); // now configure it @@ -266,7 +267,7 @@ public class CountRecentOperationsPipTest { assertEquals(-1, getCount(newEntry)); } - private long getCount(Dbao newEntry) throws PIPException { + private long getCount(OperationsHistory newEntry) throws PIPException { responses = new LinkedList<>(Arrays.asList(resp1, resp2, resp3)); attributes = new LinkedList<>( Arrays.asList(newEntry.getActor(), newEntry.getOperation(), newEntry.getTarget())); @@ -279,11 +280,11 @@ public class CountRecentOperationsPipTest { return ((Number) value.getValue()).longValue(); } - private Dbao createEntry(String cl, String target, String outcome) { + private OperationsHistory createEntry(String cl, String target, String outcome) { // // Create entry // - Dbao newEntry = new Dbao(); + OperationsHistory newEntry = new OperationsHistory(); newEntry.setClosedLoopName(cl); newEntry.setTarget(target); newEntry.setOutcome(outcome); diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java index b5273e6d..dd961d8c 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java @@ -47,6 +47,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.onap.policy.guard.OperationsHistory; import org.onap.policy.pdp.xacml.application.common.ToscaDictionary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -234,7 +235,7 @@ public class GetOperationOutcomePipTest { // // Create entry // - Dbao newEntry = new Dbao(); + OperationsHistory newEntry = new OperationsHistory(); newEntry.setClosedLoopName(cl); newEntry.setTarget(target); newEntry.setOutcome(outcome); diff --git a/applications/common/src/test/resources/META-INF/persistence.xml b/applications/common/src/test/resources/META-INF/persistence.xml index d917c06b..a0f0d45d 100644 --- a/applications/common/src/test/resources/META-INF/persistence.xml +++ b/applications/common/src/test/resources/META-INF/persistence.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2019-2020 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. @@ -23,8 +23,7 @@ <persistence-unit name="PipEngineTest" transaction-type="RESOURCE_LOCAL"> <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> - - <class>org.onap.policy.pdp.xacml.application.common.operationshistory.Dbao</class> + <class>org.onap.policy.guard.OperationsHistory</class> <properties> <property name="eclipselink.ddl-generation" value="create-tables" /> |