aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common/guard/src/test
diff options
context:
space:
mode:
authorJoshua Reich <jreich@research.att.com>2019-04-10 13:38:59 -0700
committerPamela Dragosh <pdragosh@research.att.com>2019-04-11 07:28:52 -0400
commita7a144ba512654bd93b0856b1e9eb5c886060c21 (patch)
tree808acb95b4608c9e7e4e4501f4c4111e9563fa18 /controlloop/common/guard/src/test
parent92fc7744a4df901d1688b9fa8da899372ea76fd8 (diff)
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>
Diffstat (limited to 'controlloop/common/guard/src/test')
-rw-r--r--controlloop/common/guard/src/test/java/org/onap/policy/guard/PipEngineGetHistoryTest.java437
-rw-r--r--controlloop/common/guard/src/test/java/org/onap/policy/guard/PipEngineGetStatusTest.java251
-rw-r--r--controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java4
-rw-r--r--controlloop/common/guard/src/test/resources/META-INF/persistence.xml90
-rw-r--r--controlloop/common/guard/src/test/resources/blacklist_template.xml10
-rw-r--r--controlloop/common/guard/src/test/resources/frequency_limiter_template.xml10
6 files changed, 55 insertions, 747 deletions
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PipEngineGetHistoryTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PipEngineGetHistoryTest.java
deleted file mode 100644
index 288c6ca33..000000000
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PipEngineGetHistoryTest.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * guard
- * ================================================================================
- * Copyright (C) 2017-2018 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.guard;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.att.research.xacml.api.Attribute;
-import com.att.research.xacml.api.AttributeValue;
-import com.att.research.xacml.api.Identifier;
-import com.att.research.xacml.api.Status;
-import com.att.research.xacml.api.pip.PIPEngine;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.api.pip.PIPFinder;
-import com.att.research.xacml.api.pip.PIPRequest;
-import com.att.research.xacml.api.pip.PIPResponse;
-import com.att.research.xacml.std.IdentifierImpl;
-import com.att.research.xacml.std.StdAttribute;
-import com.att.research.xacml.std.StdAttributeValue;
-import com.att.research.xacml.std.StdStatus;
-import com.att.research.xacml.std.StdStatusCode;
-import com.att.research.xacml.std.pip.StdPIPRequest;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.finders.EngineFinder;
-import com.att.research.xacml.util.FactoryException;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.drools.system.PolicyEngine;
-
-public class PipEngineGetHistoryTest {
- static PipEngineGetHistory pegh;
- private static final String ISSUER = "issuerIntw:mid:end";
-
- private static EntityManagerFactory emf;
- private static EntityManager em;
-
- /**
- * Set up test class.
- */
- @BeforeClass
- public static void testPipEngineGetHistory() {
- pegh = null;
- try {
- pegh = new PipEngineGetHistory();
- } catch (Exception e) {
- fail("PipEngineGetHistory constructor failed");
- }
-
- // Set PU
- System.setProperty(Util.PU_KEY, Util.JUNITPU);
-
- // Enter dummy props to avoid nullPointerException
- PolicyEngine.manager.setEnvironmentProperty(Util.ONAP_KEY_URL, "a");
- PolicyEngine.manager.setEnvironmentProperty(Util.ONAP_KEY_USER, "b");
- PolicyEngine.manager.setEnvironmentProperty(Util.ONAP_KEY_PASS, "c");
-
- // Connect to in-mem db
- emf = Persistence.createEntityManagerFactory(Util.JUNITPU);
- em = emf.createEntityManager();
-
- // Create necessary table
- String sql = "CREATE TABLE `operationshistory10` (" + "`CLNAME` varchar(255)," + "`requestID` varchar(100),"
- + "`actor` varchar(50) ," + "`operation` varchar(50)," + "`target` varchar(50),"
- + "`starttime` timestamp," + "`outcome` varchar(50)," + "`message` varchar(255),"
- + "`subrequestId` varchar(100)," + "`endtime` timestamp" + ")";
- Query nq = em.createNativeQuery(sql);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
- }
-
- /**
- * Clean up test class.
- */
- @AfterClass
- public static void tearDown() {
- String sql = "DROP TABLE `operationshistory10`";
- Query nq = em.createNativeQuery(sql);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
- em.close();
- emf.close();
- }
-
- /**
- * Setup method.
- */
- @Before
- public void setUp() {
- // clear the table
- String sql = "DELETE FROM `operationshistory10`";
- Query nq = em.createNativeQuery(sql);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
- }
-
- @Test
- public void testAttributesRequired() {
- assertTrue(pegh.attributesRequired().isEmpty());
- }
-
- @Test
- public void testAttributesProvided() {
- assertTrue(pegh.attributesProvided().isEmpty());
- }
-
- @Test
- public void testGetAttributes() {
- StdPIPRequest mockPipRequest = mock(StdPIPRequest.class);
- EngineFinder mockPipFinder = mock(EngineFinder.class);
-
- // Test issuer null
- when(mockPipRequest.getIssuer()).thenReturn(null);
- try {
- assertEquals(StdPIPResponse.PIP_RESPONSE_EMPTY, pegh.getAttributes(mockPipRequest, mockPipFinder));
- } catch (Exception e) {
- fail("getAttributes failed");
- }
-
- // Test issuer not equal to our issuer
- pegh.setIssuer(ISSUER);
- when(mockPipRequest.getIssuer()).thenReturn("something else");
- try {
- assertEquals(StdPIPResponse.PIP_RESPONSE_EMPTY, pegh.getAttributes(mockPipRequest, mockPipFinder));
- } catch (Exception e) {
- fail("getAttributes failed");
- }
-
- // Test issuer equal to our issuer
- when(mockPipRequest.getIssuer()).thenReturn(ISSUER);
- try {
- assertNotNull(pegh.getAttributes(mockPipRequest, mockPipFinder));
- } catch (Exception e) {
- // Normal to catch exception
- }
- }
-
- @Test
- public void testGetCountFromDb() {
-
- // Use reflection to run getCountFromDB
- Method method = null;
- int count = -1;
- try {
- method = PipEngineGetHistory.class.getDeclaredMethod("getCountFromDb", String.class, String.class,
- String.class, String.class);
- method.setAccessible(true);
- count = (int) method.invoke(null, "actor", "op", "target", "1 MINUTE");
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | NoSuchMethodException e) {
- fail(e.getLocalizedMessage());
- }
- // No entries yet
- assertEquals(0, count);
-
- // Add an entry
- String addEntry = "insert into operationshistory10 (outcome, CLNAME, actor, operation, target, endtime)"
- + "values('success','testcl', 'actor', 'op', 'target', CURRENT_TIMESTAMP())";
- Query nq2 = em.createNativeQuery(addEntry);
- em.getTransaction().begin();
- nq2.executeUpdate();
- em.getTransaction().commit();
-
- try {
- count = (int) method.invoke(null, "actor", "op", "target", "1 MINUTE");
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- fail(e.getLocalizedMessage());
- }
- // Should count 1 entry now
- assertEquals(1, count);
- }
-
- @Test
- public void testConfigure() throws PIPException {
- PipEngineGetHistory pegh = new PipEngineGetHistory();
- pegh.configure("Dorothy", new Properties());
-
- pegh.setDescription(null);
- pegh.setIssuer(null);
- pegh.configure("Dorothy", new Properties());
- }
-
- @Test
- public void getAttributesTest() throws URISyntaxException, PIPException, FactoryException {
- PipEngineGetHistory pegh = new PipEngineGetHistory();
- pegh.setIssuer("Dorothy");
-
- Identifier identifierCategory = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow/category"));;
- Identifier identifierAttribute = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow/atrtribute"));;
- Identifier identifierDataType = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow/datatype"));;
- PIPRequest pipRequest = new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType,
- "Dorothy,tw:1000:SECOND");
-
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
-
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinderPipException()));
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinderResponseStatusNok()));
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinderResponseEmptyAttrs()));
- }
-
- @Test
- public void timeWindowTest() throws URISyntaxException, PIPException, FactoryException {
- PipEngineGetHistory pegh = new PipEngineGetHistory();
- pegh.setIssuer("Dorothy");
-
- Identifier identifierCategory = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow/category"));;
- Identifier identifierAttribute = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow/atrtribute"));;
- Identifier identifierDataType = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow/datatype"));;
-
- PIPRequest pipRequest =
- new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType, "Dorothy,tw:100:SECOND");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest =
- new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType, "Dorothy,tw:100:MINUTE");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest =
- new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType, "Dorothy,tw:100:HOUR");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest =
- new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType, "Dorothy,tw:100:DAY");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest =
- new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType, "Dorothy,tw:100:WEEK");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest =
- new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType, "Dorothy,tw:100:MONTH");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest = new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType,
- "Dorothy,tw:100:QUARTER");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest =
- new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType, "Dorothy,tw:100:YEAR");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest = new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType,
- "Dorothy,tw:100:FORTNIGHT");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- pipRequest = new StdPIPRequest(identifierCategory, identifierAttribute, identifierDataType,
- "Dorothy,tw:100:FORT NIGHT");
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinder()));
-
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinderPipException()));
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinderResponseStatusNok()));
- assertNotNull(pegh.getAttributes(pipRequest, new DummyPipFinderResponseEmptyAttrs()));
- }
-
- private class DummyPipFinder implements PIPFinder {
- @Override
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException {
- return null;
- }
-
- @Override
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
- throws PIPException {
- return null;
- }
-
- @Override
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException {
- try {
- List<Attribute> attributeList = new ArrayList<>();
- Identifier categoryIdIn = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow/category"));
- Identifier dataTypeIdIn = new IdentifierImpl(new URI("http://www.w3.org/2001/XMLSchema#string"));
-
- Identifier attributeIdIn0 = new IdentifierImpl(new URI(UUID.randomUUID().toString()));
- AttributeValue<String> valueIn0 = new StdAttributeValue<String>(dataTypeIdIn, "ActorDorothy");
- Attribute attribute0 = new StdAttribute(categoryIdIn, attributeIdIn0, valueIn0);
- attributeList.add(attribute0);
-
- Identifier attributeIdIn1 = new IdentifierImpl(new URI(UUID.randomUUID().toString()));
- AttributeValue<String> valueIn1 = new StdAttributeValue<String>(dataTypeIdIn, "OperationHomeFromOZ");
- Attribute attribute1 = new StdAttribute(categoryIdIn, attributeIdIn1, valueIn1);
- attributeList.add(attribute1);
-
- Identifier attributeIdIn2 = new IdentifierImpl(new URI(UUID.randomUUID().toString()));
- AttributeValue<String> valueIn2 = new StdAttributeValue<String>(dataTypeIdIn, "TargetWickedWitch");
- Attribute attribute2 = new StdAttribute(categoryIdIn, attributeIdIn2, valueIn2);
- attributeList.add(attribute2);
-
- return new StdPIPResponse(attributeList);
- } catch (Exception e) {
- return null;
- }
- }
-
- @Override
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
- throws PIPException {
- return null;
- }
-
- @Override
- public Collection<PIPEngine> getPIPEngines() {
- return null;
- }
- }
-
- private class DummyPipFinderPipException implements PIPFinder {
- @Override
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException {
- return null;
- }
-
- @Override
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
- throws PIPException {
- return null;
- }
-
- @Override
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException {
- throw new PIPException();
- }
-
- @Override
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
- throws PIPException {
- return null;
- }
-
- @Override
- public Collection<PIPEngine> getPIPEngines() {
- return null;
- }
- }
-
- private class DummyPipFinderResponseStatusNok implements PIPFinder {
- @Override
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException {
- return null;
- }
-
- @Override
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
- throws PIPException {
- return null;
- }
-
- @Override
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException {
- Status status = new StdStatus(StdStatusCode.STATUS_CODE_PROCESSING_ERROR, "Processing Error");
- return new StdPIPResponse(status);
- }
-
- @Override
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
- throws PIPException {
- return null;
- }
-
- @Override
- public Collection<PIPEngine> getPIPEngines() {
- return null;
- }
- }
-
- private class DummyPipFinderResponseEmptyAttrs implements PIPFinder {
- @Override
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException {
- return null;
- }
-
- @Override
- public PIPResponse getAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
- throws PIPException {
- return null;
- }
-
- @Override
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude) throws PIPException {
- List<Attribute> attributeList = new ArrayList<>();
- return new StdPIPResponse(attributeList);
- }
-
- @Override
- public PIPResponse getMatchingAttributes(PIPRequest pipRequest, PIPEngine exclude, PIPFinder pipFinderParent)
- throws PIPException {
- return null;
- }
-
- @Override
- public Collection<PIPEngine> getPIPEngines() {
- return null;
- }
- }
-}
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PipEngineGetStatusTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PipEngineGetStatusTest.java
deleted file mode 100644
index 5e99b0605..000000000
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PipEngineGetStatusTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * guard
- * ================================================================================
- * Copyright (C) 2018 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.guard;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.std.pip.StdPIPRequest;
-import com.att.research.xacml.std.pip.StdPIPResponse;
-import com.att.research.xacml.std.pip.finders.EngineFinder;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.drools.system.PolicyEngine;
-
-public class PipEngineGetStatusTest {
- static PipEngineGetStatus pegs;
- private static final String ISSUER = "issuer:clname:testclname";
-
- private static EntityManagerFactory emf;
- private static EntityManager em;
-
- /**
- * Set up test class.
- */
- @BeforeClass
- public static void testPipEngineGetStatus() {
- pegs = null;
- try {
- pegs = new PipEngineGetStatus();
- } catch (Exception e) {
- fail("PipEngineGetStatus constructor failed");
- }
-
- // Set PU
- System.setProperty(Util.PU_KEY, Util.JUNITPU);
-
- // Enter dummy props to avoid nullPointerException
- PolicyEngine.manager.setEnvironmentProperty(Util.ONAP_KEY_URL, "a");
- PolicyEngine.manager.setEnvironmentProperty(Util.ONAP_KEY_USER, "b");
- PolicyEngine.manager.setEnvironmentProperty(Util.ONAP_KEY_PASS, "c");
-
- // Connect to in-mem db
- emf = Persistence.createEntityManagerFactory(Util.JUNITPU);
- em = emf.createEntityManager();
-
- // Create necessary table
- String sql = "CREATE TABLE `operationshistory10` (" + "`CLNAME` varchar(255)," + "`requestID` varchar(100),"
- + "`actor` varchar(50) ," + "`operation` varchar(50)," + "`target` varchar(50),"
- + "`starttime` timestamp," + "`outcome` varchar(50)," + "`message` varchar(255),"
- + "`subrequestId` varchar(100)," + "`endtime` timestamp" + ")";
- Query nq = em.createNativeQuery(sql);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
- }
-
- /**
- * Clean up test class.
- */
- @AfterClass
- public static void tearDown() {
- String sql = "DROP TABLE `operationshistory10`";
- Query nq = em.createNativeQuery(sql);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
- em.close();
- emf.close();
- }
-
- /**
- * Setup method.
- */
- @Before
- public void setUp() {
- // clear the table
- String sql = "DELETE FROM `operationshistory10`";
- Query nq = em.createNativeQuery(sql);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
- }
-
- @Test
- public void testAttributesRequired() {
- assertTrue(pegs.attributesRequired().isEmpty());
- }
-
- @Test
- public void testAttributesProvided() {
- assertTrue(pegs.attributesProvided().isEmpty());
- }
-
- @Test
- public void testGetAttributes() {
- StdPIPRequest mockPipRequest = mock(StdPIPRequest.class);
- EngineFinder mockPipFinder = mock(EngineFinder.class);
-
- // Test issuer null
- when(mockPipRequest.getIssuer()).thenReturn(null);
- try {
- assertEquals(StdPIPResponse.PIP_RESPONSE_EMPTY, pegs.getAttributes(mockPipRequest, mockPipFinder));
- } catch (Exception e) {
- fail("getAttributes failed");
- }
-
- // Test issuer not equal to our issuer
- pegs.setIssuer(ISSUER);
- when(mockPipRequest.getIssuer()).thenReturn("something else");
- try {
- assertEquals(StdPIPResponse.PIP_RESPONSE_EMPTY, pegs.getAttributes(mockPipRequest, mockPipFinder));
- } catch (Exception e) {
- fail("getAttributes failed");
- }
-
- // Test issuer equal to our issuer
- when(mockPipRequest.getIssuer()).thenReturn(ISSUER);
- try {
- assertNotNull(pegs.getAttributes(mockPipRequest, mockPipFinder));
- } catch (Exception e) {
- // Normal to catch exception
- }
- }
-
- @Test
- public void testGetStatusFromDb() {
-
- // Use reflection to run getStatsFromDB
- Method method = null;
- String status = null;
- String addEntry;
- Query nq;
-
- // Add an entry
- addEntry = "insert into operationshistory10 (outcome, CLNAME, actor, operation, target, endtime)"
- + "values('1','testcl', 'actor', 'op', 'testtarget', CURRENT_TIMESTAMP())";
- nq = em.createNativeQuery(addEntry);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
-
- try {
- method = PipEngineGetStatus.class.getDeclaredMethod("getStatusFromDb", String.class, String.class);
- method.setAccessible(true);
- status = (String) method.invoke(null, "testcl", "testtarget");
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | NoSuchMethodException e) {
- fail(e.getLocalizedMessage());
- }
-
- // Status should be "success"
- assertEquals("1", status);
-
- // Add entries
- addEntry = "insert into operationshistory10 (outcome, CLNAME, actor, operation, target, endtime)"
- + "values('2','testcl', 'actor', 'op', 'testtarget', CURRENT_TIMESTAMP())";
- nq = em.createNativeQuery(addEntry);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
-
- addEntry = "insert into operationshistory10 (outcome, CLNAME, actor, operation, target, endtime)"
- + "values('3','testcl', 'actor', 'op', 'testtarget2', CURRENT_TIMESTAMP())";
- nq = em.createNativeQuery(addEntry);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
-
- addEntry = "insert into operationshistory10 (outcome, CLNAME, actor, operation, target, endtime)"
- + "values('4','testcl2', 'actor', 'op', 'testtarget2', CURRENT_TIMESTAMP())";
- nq = em.createNativeQuery(addEntry);
- em.getTransaction().begin();
- nq.executeUpdate();
- em.getTransaction().commit();
-
- try {
- method = PipEngineGetStatus.class.getDeclaredMethod("getStatusFromDb", String.class, String.class);
- method.setAccessible(true);
- status = (String) method.invoke(null, "testcl", "testtarget");
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | NoSuchMethodException e) {
- fail(e.getLocalizedMessage());
- }
- assertEquals("2", status);
-
- try {
- method = PipEngineGetStatus.class.getDeclaredMethod("getStatusFromDb", String.class, String.class);
- method.setAccessible(true);
- status = (String) method.invoke(null, "testcl", "testtarget2");
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | NoSuchMethodException e) {
- fail(e.getLocalizedMessage());
- }
- assertEquals("3", status);
-
- try {
- method = PipEngineGetStatus.class.getDeclaredMethod("getStatusFromDb", String.class, String.class);
- method.setAccessible(true);
- status = (String) method.invoke(null, "testcl2", "testtarget2");
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | NoSuchMethodException e) {
- fail(e.getLocalizedMessage());
- }
- assertEquals("4", status);
- }
-
- @Test
- public void testConfigure() throws PIPException {
- PipEngineGetStatus pegs = new PipEngineGetStatus();
- pegs.configure("Dorothy", new Properties());
-
- pegs.setDescription(null);
- pegs.setIssuer(null);
- pegs.configure("Dorothy", new Properties());
- }
-
-}
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
index 8b007fdcc..6526a9cce 100644
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
+++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
@@ -174,13 +174,13 @@ public class PolicyGuardXacmlHelperTest {
Identifier identifierCategory = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow"));
Collection<Attribute> listAttributes = new ArrayList<>();
Identifier categoryIdIn = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow/category"));
- Identifier attributeIdIn0 = new IdentifierImpl(new URI("urn:oasis:names:tc:xacml:1.0:request:request-id"));
+ Identifier attributeIdIn0 = new IdentifierImpl(new URI("urn:org:onap:guard:request:request-id"));
Identifier dataTypeIdIn = new IdentifierImpl(new URI("http://somewhere.over.the.rainbow.dataType"));
AttributeValue<String> valueIn = new StdAttributeValue<String>(dataTypeIdIn, UUID.randomUUID().toString());
Attribute attribute0 = new StdAttribute(categoryIdIn, attributeIdIn0, valueIn);
listAttributes.add(attribute0);
- Identifier attributeIdIn1 = new IdentifierImpl(new URI("urn:oasis:names:tc:xacml:1.0:operation:operation-id"));
+ Identifier attributeIdIn1 = new IdentifierImpl(new URI("urn:org:onap:guard:operation:operation-id"));
Attribute attribute1 = new StdAttribute(categoryIdIn, attributeIdIn1, valueIn);
listAttributes.add(attribute1);
attributesIn.add(new StdAttributeCategory(identifierCategory, listAttributes));
diff --git a/controlloop/common/guard/src/test/resources/META-INF/persistence.xml b/controlloop/common/guard/src/test/resources/META-INF/persistence.xml
index 73b9e1809..b6d80e099 100644
--- a/controlloop/common/guard/src/test/resources/META-INF/persistence.xml
+++ b/controlloop/common/guard/src/test/resources/META-INF/persistence.xml
@@ -1,47 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- drools-applications
- ================================================================================
- Copyright (C) 2018 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.
- ============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">
-
- <!-- In-mem DB for junit -->
- <persistence-unit name="TestOperationsHistoryPU"
- transaction-type="RESOURCE_LOCAL">
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <properties>
- <property name="eclipselink.ddl-generation"
- value="create-or-extend-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" />
- </properties>
- </persistence-unit>
-
-
-</persistence>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ============LICENSE_START=======================================================
+ drools-applications
+ ================================================================================
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+<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="OperationsHistoryPUTest"
+ transaction-type="RESOURCE_LOCAL">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+
+ <class>org.onap.policy.database.operationshistory.Dbao</class>
+
+ <properties>
+ <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/common/guard/src/test/resources/blacklist_template.xml b/controlloop/common/guard/src/test/resources/blacklist_template.xml
index 590b19d25..1563e4a7d 100644
--- a/controlloop/common/guard/src/test/resources/blacklist_template.xml
+++ b/controlloop/common/guard/src/test/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/common/guard/src/test/resources/frequency_limiter_template.xml b/controlloop/common/guard/src/test/resources/frequency_limiter_template.xml
index 34aa1af69..d26432f86 100644
--- a/controlloop/common/guard/src/test/resources/frequency_limiter_template.xml
+++ b/controlloop/common/guard/src/test/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>