From d6db5582b6705c11abbf8b507aa423aa00bcd7ae Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 19 Mar 2021 18:18:10 +0000 Subject: Fix write failure on PDP statistics Due to the precision of time stamps being saved to the nearest second, a millisecond precision timestamp was being compared to a second precision timestamp, causing the write to fail. This change fixes that. A unit test is also added to test for this on the provider. In addition, a USE-MARIADB flag is being introduced, which allows unit tests to be run against a locally installed MariaDB instance so that the unit tests can be verified against MariaDB locally rather than H2, the default in Gerrit. Issue-ID: POLICY-3146 Change-Id: I878f160956e89506743dc074679ee81ac1c48216 Signed-off-by: liamfallon --- .../impl/PolicyStatisticsPersistenceTest.java | 86 ++++++++++++++++++++++ .../provider/impl/PolicyToscaPersistenceTest.java | 12 ++- .../provider/impl/PolicyTypePersistenceTest.java | 13 +++- .../src/test/resources/META-INF/persistence.xml | 3 +- 4 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyStatisticsPersistenceTest.java (limited to 'models-provider/src/test') diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyStatisticsPersistenceTest.java b/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyStatisticsPersistenceTest.java new file mode 100644 index 000000000..160eeabb0 --- /dev/null +++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyStatisticsPersistenceTest.java @@ -0,0 +1,86 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * 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.models.provider.impl; + +import static org.assertj.core.api.Assertions.assertThatCode; + +import java.time.Instant; +import java.util.Arrays; +import org.junit.Test; +import org.onap.policy.models.base.PfModelException; +import org.onap.policy.models.pdp.concepts.PdpStatistics; +import org.onap.policy.models.provider.PolicyModelsProvider; +import org.onap.policy.models.provider.PolicyModelsProviderFactory; +import org.onap.policy.models.provider.PolicyModelsProviderParameters; + +/** + * Test persistence of PDP statistics to and from the database. + */ +public class PolicyStatisticsPersistenceTest { + + @Test + public void testPdpStatiscticsPersistence() throws PfModelException { + // Try the test on three providers + for (int i = 0; i < 3; i++) { + PolicyModelsProvider databaseProvider = setupProvider(); + testPdpStatiscticsPersistenceOneProvider(databaseProvider); + databaseProvider.close(); + } + } + + public void testPdpStatiscticsPersistenceOneProvider(PolicyModelsProvider databaseProvider) { + PdpStatistics pdpStatistics = new PdpStatistics(); + pdpStatistics.setPdpInstanceId("TheInstance"); + pdpStatistics.setTimeStamp(Instant.now()); + + // Try creating three identical statistics instances + for (int i = 0; i < 3; i++) { + assertThatCode(() -> databaseProvider.createPdpStatistics(Arrays.asList(pdpStatistics))) + .doesNotThrowAnyException(); + } + + // Try creating three statistics instances with timestams incremented + for (int i = 0; i < 3; i++) { + pdpStatistics.setTimeStamp(pdpStatistics.getTimeStamp().plusSeconds(1)); + + assertThatCode(() -> databaseProvider.createPdpStatistics(Arrays.asList(pdpStatistics))) + .doesNotThrowAnyException(); + } + } + + private PolicyModelsProvider setupProvider() throws PfModelException { + PolicyModelsProviderParameters parameters = new PolicyModelsProviderParameters(); + + if (System.getProperty("USE-MARIADB") != null) { + parameters.setDatabaseDriver("org.mariadb.jdbc.Driver"); + parameters.setDatabaseUrl("jdbc:mariadb://localhost:3306/policy"); + } else { + parameters.setDatabaseDriver("org.h2.Driver"); + parameters.setDatabaseUrl("jdbc:h2:mem:testdb"); + } + + parameters.setDatabaseUser("policy"); + parameters.setDatabasePassword("P01icY"); + parameters.setPersistenceUnit("ToscaConceptTest"); + + return new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters); + } +} diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyToscaPersistenceTest.java b/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyToscaPersistenceTest.java index ac62569b3..2c07091c7 100644 --- a/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyToscaPersistenceTest.java +++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyToscaPersistenceTest.java @@ -76,12 +76,20 @@ public class PolicyToscaPersistenceTest { // H2, use "org.mariadb.jdbc.Driver" and "jdbc:mariadb://localhost:3306/policy" for locally installed MariaDB PolicyModelsProviderParameters parameters = new PolicyModelsProviderParameters(); - parameters.setDatabaseDriver("org.h2.Driver"); - parameters.setDatabaseUrl("jdbc:h2:mem:testdb"); + + if (System.getProperty("USE-MARIADB") != null) { + parameters.setDatabaseDriver("org.mariadb.jdbc.Driver"); + parameters.setDatabaseUrl("jdbc:mariadb://localhost:3306/policy"); + } else { + parameters.setDatabaseDriver("org.h2.Driver"); + parameters.setDatabaseUrl("jdbc:h2:mem:testdb"); + } + parameters.setDatabaseUser("policy"); parameters.setDatabasePassword("P01icY"); parameters.setPersistenceUnit("ToscaConceptTest"); + databaseProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters); createPolicyTypes(); diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java b/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java index 61bf13ac6..2a7d83438 100644 --- a/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java +++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyTypePersistenceTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019-2020 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -61,8 +61,15 @@ public class PolicyTypePersistenceTest { // H2, use "org.mariadb.jdbc.Driver" and "jdbc:mariadb://localhost:3306/policy" for locally installed MariaDB PolicyModelsProviderParameters parameters = new PolicyModelsProviderParameters(); - parameters.setDatabaseDriver("org.h2.Driver"); - parameters.setDatabaseUrl("jdbc:h2:mem:testdb"); + + if (System.getProperty("USE-MARIADB") != null) { + parameters.setDatabaseDriver("org.mariadb.jdbc.Driver"); + parameters.setDatabaseUrl("jdbc:mariadb://localhost:3306/policy"); + } else { + parameters.setDatabaseDriver("org.h2.Driver"); + parameters.setDatabaseUrl("jdbc:h2:mem:testdb"); + } + parameters.setDatabaseUser("policy"); parameters.setDatabasePassword("P01icY"); parameters.setPersistenceUnit("ToscaConceptTest"); diff --git a/models-provider/src/test/resources/META-INF/persistence.xml b/models-provider/src/test/resources/META-INF/persistence.xml index d9e1b5fbf..249b29aae 100644 --- a/models-provider/src/test/resources/META-INF/persistence.xml +++ b/models-provider/src/test/resources/META-INF/persistence.xml @@ -1,7 +1,7 @@