From defa996aa95c11a6252604498a1e775134c34f2e Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 3 Apr 2019 15:47:36 +0000 Subject: Add impl of more PDP persistence Add the implementation of more metods in the PDP provider. Issue-ID: POLICY-1095 Change-Id: Ie02189cad7a262a453e1f731190525f838648401 Signed-off-by: liamfallon --- .../models/provider/PolicyModelsProvider.java | 26 +++++++++++++++++++++- .../impl/DatabasePolicyModelsProviderImpl.java | 14 ++++++++++++ .../impl/DummyPolicyModelsProviderImpl.java | 13 +++++++++++ .../impl/DatabasePolicyModelsProviderTest.java | 10 +++++---- .../models/provider/impl/DummyBadProviderImpl.java | 12 ++++++++++ 5 files changed, 70 insertions(+), 5 deletions(-) (limited to 'models-provider') diff --git a/models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProvider.java b/models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProvider.java index af1c88f2b..12c72d714 100644 --- a/models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProvider.java +++ b/models-provider/src/main/java/org/onap/policy/models/provider/PolicyModelsProvider.java @@ -27,6 +27,7 @@ import lombok.NonNull; import org.apache.commons.lang3.tuple.Pair; import org.onap.policy.models.base.PfModelException; +import org.onap.policy.models.pdp.concepts.Pdp; import org.onap.policy.models.pdp.concepts.PdpGroup; import org.onap.policy.models.pdp.concepts.PdpStatistics; import org.onap.policy.models.pdp.concepts.PdpSubGroup; @@ -143,6 +144,18 @@ public interface PolicyModelsProvider extends AutoCloseable { */ public List getPolicyList(final String name, final String version) throws PfModelException; + /** + * Get policies for a policy type name. + * + * @param policyTypeName the name of the policy type for which to get policies + * @param policyTypeVersion the version of the policy type, null returns all versions of deployed policies for + * policy types + * @return the policies found + * @throws PfModelException on errors getting policies + */ + public ToscaServiceTemplate getPolicies4PolicyType(@NonNull final String policyTypeName, + final String policyTypeVersion) throws PfModelException; + /** * Get policies for a policy type name. * @@ -328,7 +341,6 @@ public interface PolicyModelsProvider extends AutoCloseable { */ public List updatePdpGroups(@NonNull final List pdpGroups) throws PfModelException; - /** * Update a PDP subgroup. * @@ -340,6 +352,18 @@ public interface PolicyModelsProvider extends AutoCloseable { public void updatePdpSubGroup(@NonNull final String pdpGroupName, @NonNull final String pdpGroupVersion, @NonNull final PdpSubGroup pdpSubGroup) throws PfModelException; + /** + * Update a PDP. + * + * @param pdpGroupName the name of the PDP group of the PDP subgroup + * @param pdpGroupVersion the version of the PDP group of the PDP subgroup + * @param pdpSubGroup the PDP subgroup to be updated + * @param pdp the PDP to be updated + * @throws PfModelException on errors updating PDP subgroups + */ + public void updatePdp(@NonNull final String pdpGroupName, @NonNull final String pdpGroupVersion, + @NonNull final String pdpSubGroup, @NonNull final Pdp pdp) throws PfModelException; + /** * Delete a PDP group. * diff --git a/models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java b/models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java index 96185b65a..51b7d2f68 100644 --- a/models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java +++ b/models-provider/src/main/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderImpl.java @@ -37,6 +37,7 @@ import org.onap.policy.models.dao.DaoParameters; import org.onap.policy.models.dao.PfDao; import org.onap.policy.models.dao.PfDaoFactory; import org.onap.policy.models.dao.impl.DefaultPfDao; +import org.onap.policy.models.pdp.concepts.Pdp; import org.onap.policy.models.pdp.concepts.PdpGroup; import org.onap.policy.models.pdp.concepts.PdpStatistics; import org.onap.policy.models.pdp.concepts.PdpSubGroup; @@ -205,6 +206,13 @@ public class DatabasePolicyModelsProviderImpl implements PolicyModelsProvider { return new AuthorativeToscaProvider().getPolicyList(pfDao, name, version); } + @Override + public ToscaServiceTemplate getPolicies4PolicyType(@NonNull String policyTypeName, String policyTypeVersion) + throws PfModelException { + assertInitilized(); + return new AuthorativeToscaProvider().getPolicies4PolicyType(pfDao, policyTypeName, policyTypeVersion); + } + @Override public List getPolicyList4PolicyType(@NonNull final String policyTypeName, final String policyTypeVersion) throws PfModelException { @@ -336,6 +344,12 @@ public class DatabasePolicyModelsProviderImpl implements PolicyModelsProvider { new PdpProvider().updatePdpSubGroup(pfDao, pdpGroupName, pdpGroupVersion, pdpSubGroup); } + @Override + public void updatePdp(@NonNull String pdpGroupName, @NonNull String pdpGroupVersion, + @NonNull String pdpSubGroup, @NonNull Pdp pdp) throws PfModelException { + new PdpProvider().updatePdp(pfDao, pdpGroupName, pdpGroupVersion, pdpSubGroup, pdp); + } + @Override public PdpGroup deletePdpGroup(@NonNull final String name, @NonNull final String version) throws PfModelException { assertInitilized(); diff --git a/models-provider/src/main/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderImpl.java b/models-provider/src/main/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderImpl.java index bf707ef53..52929ab5a 100644 --- a/models-provider/src/main/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderImpl.java +++ b/models-provider/src/main/java/org/onap/policy/models/provider/impl/DummyPolicyModelsProviderImpl.java @@ -34,6 +34,7 @@ import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.base.PfModelRuntimeException; +import org.onap.policy.models.pdp.concepts.Pdp; import org.onap.policy.models.pdp.concepts.PdpGroup; import org.onap.policy.models.pdp.concepts.PdpStatistics; import org.onap.policy.models.pdp.concepts.PdpSubGroup; @@ -118,6 +119,12 @@ public class DummyPolicyModelsProviderImpl implements PolicyModelsProvider { return new ArrayList<>(); } + @Override + public ToscaServiceTemplate getPolicies4PolicyType(@NonNull String policyTypeName, String policyTypeVersion) + throws PfModelException { + return null; + } + @Override public List getPolicyList4PolicyType(@NonNull final String policyTypeName, final String policyTypeVersion) throws PfModelException { @@ -230,6 +237,12 @@ public class DummyPolicyModelsProviderImpl implements PolicyModelsProvider { // Not implemented } + @Override + public void updatePdp(@NonNull String pdpGroupName, @NonNull String pdpGroupVersion, + @NonNull String pdpSubGroup, @NonNull Pdp pdp) throws PfModelException { + // Not implemented + } + @Override public PdpGroup deletePdpGroup(@NonNull final String name, @NonNull final String version) throws PfModelException { return null; diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java index 7ad221721..8a83f4414 100644 --- a/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java +++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java @@ -21,6 +21,7 @@ package org.onap.policy.models.provider.impl; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @@ -311,13 +312,14 @@ public class DatabasePolicyModelsProviderTest { databaseProvider.deleteGuardPolicy("policy_id"); }).hasMessage("no policy found for policy ID: policy_id"); - assertThatThrownBy(() -> { - databaseProvider.getPdpGroups("name", "version"); - }).hasMessage("PDP group not found: name:version"); + assertEquals(0, databaseProvider.getPdpGroups("name", "version").size()); assertNotNull(databaseProvider.createPdpGroups(new ArrayList<>())); assertNotNull(databaseProvider.updatePdpGroups(new ArrayList<>())); - assertNotNull(databaseProvider.deletePdpGroup("name", "version")); + + assertThatThrownBy(() -> { + databaseProvider.deletePdpGroup("name", "version"); + }).hasMessage("delete of PDP group \"name:version\" failed, PDP group does not exist"); } catch (Exception exc) { LOGGER.warn("test should not throw an exception", exc); diff --git a/models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyBadProviderImpl.java b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyBadProviderImpl.java index c64603d9a..69b7a0f71 100644 --- a/models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyBadProviderImpl.java +++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DummyBadProviderImpl.java @@ -30,6 +30,7 @@ import lombok.NonNull; import org.apache.commons.lang3.tuple.Pair; import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.base.PfModelRuntimeException; +import org.onap.policy.models.pdp.concepts.Pdp; import org.onap.policy.models.pdp.concepts.PdpGroup; import org.onap.policy.models.pdp.concepts.PdpStatistics; import org.onap.policy.models.pdp.concepts.PdpSubGroup; @@ -158,6 +159,11 @@ public class DummyBadProviderImpl implements PolicyModelsProvider { return null; } + @Override + public void updatePdp(@NonNull String pdpGroupName, @NonNull String pdpGroupVersion, + @NonNull String pdpSubGroup, @NonNull Pdp pdp) throws PfModelException { + } + @Override public PdpGroup deletePdpGroup(@NonNull String name, @NonNull String verison) throws PfModelException { return null; @@ -183,6 +189,12 @@ public class DummyBadProviderImpl implements PolicyModelsProvider { return null; } + @Override + public ToscaServiceTemplate getPolicies4PolicyType(@NonNull String policyTypeName, String policyTypeVersion) + throws PfModelException { + return null; + } + @Override public List getPolicyList4PolicyType(@NonNull String policyTypeName, final String policyTypeVersion) throws PfModelException { -- cgit 1.2.3-korg