/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 2021 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.
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.util.ArrayList;
+import com.google.gson.GsonBuilder;
+import java.util.LinkedHashMap;
import java.util.List;
-
+import java.util.Properties;
+import org.apache.commons.lang3.ObjectUtils;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.base.PfModelException;
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.tosca.authorative.concepts.ToscaPolicy;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyFilter;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaEntityFilter;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
+import org.yaml.snakeyaml.Yaml;
/**
* Test of the {@link AuthorativeToscaProvider} class.
- *
- * @author Liam Fallon (liam.fallon@est.tech)
*/
public class AuthorativeToscaProviderPolicyTypeTest {
- private Connection connection;
+ private static final String VERSION = "version";
+ private static final String POLICY_NO_VERSION_VERSION1 = "onap.policies.NoVersion:0.0.1";
+ private static final String POLICY_NO_VERSION = "onap.policies.NoVersion";
+ private static final String MISSING_POLICY_TYPES = "no policy types specified on service template";
+ private static final String DAO_IS_NULL = "^dao is marked .*on.*ull but is null$";
+ private static final String VERSION_001 = "0.0.1";
+ private static String yamlAsJsonString;
private PfDao pfDao;
private StandardCoder standardCoder;
+ /**
+ * Read the policy type definition.
+ *
+ * @throws Exception on errors
+ */
+ @BeforeClass
+ public static void readPolicyDefinition() {
+ String yamlString = ResourceUtils.getResourceAsString("src/test/resources/onap.policies.NoVersion.yaml");
+
+ Object yamlObject = new Yaml().load(yamlString);
+ yamlAsJsonString = new GsonBuilder().setPrettyPrinting().create().toJson(yamlObject);
+ }
+
/**
* Set up the DAO towards the database.
*
*/
@Before
public void setupDao() throws Exception {
- // Use the JDBC UI "jdbc:h2:mem:testdb" to test towards the h2 database
- // Use the JDBC UI "jdbc:mariadb://localhost:3306/policy" to test towards a locally installed mariadb instance
- connection = DriverManager.getConnection("jdbc:h2:mem:testdb", "policy", "P01icY");
-
final DaoParameters daoParameters = new DaoParameters();
- daoParameters.setPluginClass(DefaultPfDao.class.getCanonicalName());
+ daoParameters.setPluginClass(DefaultPfDao.class.getName());
- // Use the persistence unit ToscaConceptTest to test towards the h2 database
- // Use the persistence unit ToscaConceptMariaDBTest to test towards a locally installed mariadb instance
daoParameters.setPersistenceUnit("ToscaConceptTest");
+ Properties jdbcProperties = new Properties();
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
+ if (System.getProperty("USE-MARIADB") != null) {
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
+ } else {
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
+ "jdbc:h2:mem:AuthorativeToscaProviderPolicyTypeTest");
+ }
+ daoParameters.setJdbcProperties(jdbcProperties);
+
pfDao = new PfDaoFactory().createPfDao(daoParameters);
pfDao.init(daoParameters);
}
}
@After
- public void teardown() throws Exception {
+ public void teardown() {
pfDao.close();
- connection.close();
}
@Test
- public void testPoliciesGet() throws Exception {
+ public void testPolicyTypesGet() throws Exception {
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getPolicies(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().getPolicyTypes(null, null, null);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getPolicyList(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessageMatching(DAO_IS_NULL);
- ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
- ToscaServiceTemplate.class);
+ ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_NO_VERSION_VERSION1);
- ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
- assertTrue(beforePolicy.getType().equals(createdPolicy.getType()));
+ ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
- ToscaServiceTemplate gotServiceTemplate =
- new AuthorativeToscaProvider().getPolicies(pfDao, policyKey.getName(), policyKey.getVersion());
+ ToscaServiceTemplate gotServiceTemplate = new AuthorativeToscaProvider().getPolicyTypes(pfDao,
+ policyTypeKey.getName(), policyTypeKey.getVersion());
- ToscaPolicy gotPolicy =
- gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
- assertTrue(beforePolicy.getType().equals(gotPolicy.getType()));
+ ToscaPolicyType gotPolicyType = gotServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
- List<ToscaPolicy> gotPolicyList =
- new AuthorativeToscaProvider().getPolicyList(pfDao, "onap.restart.tca", "1.0.0");
- assertEquals(1, gotPolicyList.size());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
+ List<ToscaPolicyType> gotPolicyTypeList =
+ new AuthorativeToscaProvider().getPolicyTypeList(pfDao, POLICY_NO_VERSION, VERSION_001);
+ assertEquals(2, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
- gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, "onap.restart.tca", null);
- assertEquals(1, gotPolicyList.size());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
+ gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, POLICY_NO_VERSION, null);
+ assertEquals(2, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
- gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, null, null);
- assertEquals(1, gotPolicyList.size());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
+ gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, null, null);
+ assertEquals(2, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
- gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, null, "1.0.0");
- assertEquals(1, gotPolicyList.size());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
- }
+ gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, null, VERSION_001);
+ assertEquals(2, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicyTypeList(new DefaultPfDao(), POLICY_NO_VERSION,
+ VERSION_001)).hasMessageContaining("Policy Framework DAO has not been initialized");
+
+ assertTrue(new AuthorativeToscaProvider().getPolicyTypeList(pfDao, "i.dont.Exist", VERSION_001).isEmpty());
+ }
@Test
- public void testPoliciesGetFiltered() throws Exception {
+ public void testPolicyTypesGetFiltered() throws Exception {
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().getFilteredPolicyTypes(null, null);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicies(null, ToscaPolicyFilter.builder().build());
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().getFilteredPolicyTypes(null,
+ ToscaEntityFilter.<ToscaPolicyType>builder().build());
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicies(pfDao, null);
- }).hasMessage("filter is marked @NonNull but is null");
+ new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao, null);
+ }).hasMessageMatching("^filter is marked .*on.*ull but is null$");
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyList(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().getFilteredPolicyTypeList(null, null);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyList(null, ToscaPolicyFilter.builder().build());
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().getFilteredPolicyTypeList(null,
+ ToscaEntityFilter.<ToscaPolicyType>builder().build());
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyList(pfDao, null);
- }).hasMessage("filter is marked @NonNull but is null");
+ new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao, null);
+ }).hasMessageMatching("^filter is marked .*on.*ull but is null$");
+
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyTypeList(new DefaultPfDao(),
+ ToscaEntityFilter.<ToscaPolicyType>builder().name("i.dont.Exist").build()))
+ .hasMessageContaining("Policy Framework DAO has not been initialized");
- ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
- ToscaServiceTemplate.class);
+ assertTrue(new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao,
+ ToscaEntityFilter.<ToscaPolicyType>builder().name("i.dont.Exist").build()).isEmpty());
+
+ ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
-
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
-
- ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
- assertTrue(beforePolicy.getType().equals(createdPolicy.getType()));
-
- ToscaServiceTemplate gotServiceTemplate =
- new AuthorativeToscaProvider().getFilteredPolicies(pfDao, ToscaPolicyFilter.builder().build());
-
- ToscaPolicy gotPolicy =
- gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
- assertTrue(beforePolicy.getType().equals(gotPolicy.getType()));
-
- gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicies(pfDao,
- ToscaPolicyFilter.builder().name(policyKey.getName()).build());
-
- gotPolicy = gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
- assertTrue(beforePolicy.getType().equals(gotPolicy.getType()));
-
- gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicies(pfDao,
- ToscaPolicyFilter.builder().name(policyKey.getName()).version("1.0.0").build());
-
- gotPolicy = gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
- assertTrue(beforePolicy.getType().equals(gotPolicy.getType()));
-
- List<ToscaPolicy> gotPolicyList =
- new AuthorativeToscaProvider().getPolicyList(pfDao, "onap.restart.tca", "1.0.0");
- assertEquals(1, gotPolicyList.size());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
-
- gotPolicyList =
- new AuthorativeToscaProvider().getFilteredPolicyList(pfDao, ToscaPolicyFilter.builder().build());
- assertEquals(1, gotPolicyList.size());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
-
- gotPolicyList = new AuthorativeToscaProvider().getFilteredPolicyList(pfDao,
- ToscaPolicyFilter.builder().name(policyKey.getName()).build());
- assertEquals(1, gotPolicyList.size());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
-
- gotPolicyList = new AuthorativeToscaProvider().getFilteredPolicyList(pfDao,
- ToscaPolicyFilter.builder().name(policyKey.getName()).version("1.0.0").build());
- assertEquals(1, gotPolicyList.size());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
+
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_NO_VERSION_VERSION1);
+
+ ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
+
+ ToscaServiceTemplate gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao,
+ ToscaEntityFilter.<ToscaPolicyType>builder().build());
+
+ ToscaPolicyType gotPolicyType = gotServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ checkEqualsNameDescription(beforePolicyType, gotPolicyType);
+
+ gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao,
+ ToscaEntityFilter.<ToscaPolicyType>builder().name(policyTypeKey.getName()).build());
+
+ gotPolicyType = gotServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ checkEqualsNameDescription(beforePolicyType, gotPolicyType);
+
+ gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao, ToscaEntityFilter
+ .<ToscaPolicyType>builder().name(policyTypeKey.getName()).version(VERSION_001).build());
+
+ gotPolicyType = gotServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ checkEqualsNameDescription(beforePolicyType, gotPolicyType);
+
+ List<ToscaPolicyType> gotPolicyTypeList =
+ new AuthorativeToscaProvider().getPolicyTypeList(pfDao, POLICY_NO_VERSION, VERSION_001);
+ assertEquals(2, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+
+ gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao,
+ ToscaEntityFilter.<ToscaPolicyType>builder().build());
+ assertEquals(2, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+
+ gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao,
+ ToscaEntityFilter.<ToscaPolicyType>builder().name(policyTypeKey.getName()).build());
+ assertEquals(1, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+
+ gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao, ToscaEntityFilter
+ .<ToscaPolicyType>builder().name(policyTypeKey.getName()).version(VERSION_001).build());
+ assertEquals(1, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+
+ gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao,
+ ToscaEntityFilter.<ToscaPolicyType>builder().version("1.0.0").build());
+ assertEquals(1, gotPolicyTypeList.size());
+ assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ }
+
+ private void checkEqualsNameDescription(ToscaPolicyType beforePolicyType, ToscaPolicyType gotPolicyType) {
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), gotPolicyType.getDescription()));
}
@Test
- public void testPolicyCreate() throws Exception {
+ public void testPolicyTypesCreate() throws Exception {
+ assertThatThrownBy(() -> {
+ new AuthorativeToscaProvider().createPolicyTypes(null, null);
+ }).hasMessageMatching(DAO_IS_NULL);
+
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().createPolicyTypes(null, new ToscaServiceTemplate());
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(null, new ToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, null);
+ }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
+ ToscaServiceTemplate testToscaServiceTemplate = new ToscaServiceTemplate();
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(pfDao, null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, testToscaServiceTemplate);
+ }).hasMessage(MISSING_POLICY_TYPES);
- ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
- ToscaServiceTemplate.class);
+ testToscaServiceTemplate.setPolicyTypes(new LinkedHashMap<>());
+ assertThatThrownBy(() -> {
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, testToscaServiceTemplate);
+ }).hasMessage("An incoming list of concepts must have at least one entry");
+
+ ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_NO_VERSION_VERSION1);
- ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
- assertTrue(beforePolicy.getType().equals(createdPolicy.getType()));
+ ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
}
-
@Test
- public void testPolicyUpdate() throws Exception {
+ public void testPolicyTypesUpdate() throws Exception {
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().createPolicyTypes(null, null);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().updatePolicyTypes(null, null);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicies(null, new ToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().updatePolicyTypes(null, new ToscaServiceTemplate());
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicies(pfDao, null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
+ new AuthorativeToscaProvider().updatePolicyTypes(pfDao, null);
+ }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
- ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
- ToscaServiceTemplate.class);
+ ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_NO_VERSION_VERSION1);
- ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
- assertTrue(beforePolicy.getType().equals(createdPolicy.getType()));
+ ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
ToscaServiceTemplate updatedServiceTemplate =
- new AuthorativeToscaProvider().updatePolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().updatePolicyTypes(pfDao, toscaServiceTemplate);
- ToscaPolicy updatedPolicy =
- updatedServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, updatedPolicy));
- assertTrue(beforePolicy.getType().equals(updatedPolicy.getType()));
+ ToscaPolicyType updatedPolicy = updatedServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ assertEquals(true, beforePolicyType.getName().equals(updatedPolicy.getName()));
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), updatedPolicy.getDescription()));
}
@Test
- public void testPoliciesDelete() throws Exception {
+ public void testPolicyTypesDelete() throws Exception {
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(null, null, null);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, null, "version");
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(null, null, VERSION);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, "name", null);
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(null, "name", null);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, "name", "version");
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(null, "name", VERSION);
+ }).hasMessageMatching(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, null, null);
- }).hasMessage("name is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(pfDao, null, null);
+ }).hasMessageMatching("^name is marked .*on.*ull but is null$");
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, null, "version");
- }).hasMessage("name is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(pfDao, null, VERSION);
+ }).hasMessageMatching("^name is marked .*on.*ull but is null$");
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, "name", null);
- }).hasMessage("version is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(pfDao, "name", null);
+ }).hasMessageMatching("^version is marked .*on.*ull but is null$");
- ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
- ToscaServiceTemplate.class);
+ ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_NO_VERSION_VERSION1);
- ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
- assertTrue(beforePolicy.getType().equals(createdPolicy.getType()));
+ ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
- ToscaServiceTemplate deletedServiceTemplate =
- new AuthorativeToscaProvider().deletePolicy(pfDao, policyKey.getName(), policyKey.getVersion());
+ ToscaServiceTemplate deletedServiceTemplate = new AuthorativeToscaProvider().deletePolicyType(pfDao,
+ policyTypeKey.getName(), policyTypeKey.getVersion());
- ToscaPolicy deletedPolicy =
- deletedServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
- assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
- assertTrue(beforePolicy.getType().equals(deletedPolicy.getType()));
+ ToscaPolicyType deletedPolicy = deletedServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
+ assertEquals(true, beforePolicyType.getName().equals(deletedPolicy.getName()));
+ assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), deletedPolicy.getDescription()));
- ToscaServiceTemplate gotServiceTemplate =
- new AuthorativeToscaProvider().getPolicies(pfDao, policyKey.getName(), policyKey.getVersion());
-
- assertEquals(0, gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).size());
+ assertThatThrownBy(() -> {
+ new AuthorativeToscaProvider().getPolicyTypes(pfDao, policyTypeKey.getName(), policyTypeKey.getVersion());
+ }).hasMessage("policy types for onap.policies.NoVersion:0.0.1 do not exist");
}
@Test
- public void testAssertPoliciesExist() throws PfModelException {
+ public void testAssertPoliciesExist() {
ToscaServiceTemplate testServiceTemplate = new ToscaServiceTemplate();
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, "name", null);
- }).hasMessage("version is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(pfDao, "name", null);
+ }).hasMessageMatching("^version is marked .*on.*ull but is null$");
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate);
- }).hasMessage("topology template not specified on service template");
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate);
+ }).hasMessage(MISSING_POLICY_TYPES);
testServiceTemplate.setToscaTopologyTemplate(new ToscaTopologyTemplate());
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate);
- }).hasMessage("no policies specified on topology template of service template");
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate);
+ }).hasMessage(MISSING_POLICY_TYPES);
- testServiceTemplate.getToscaTopologyTemplate().setPolicies(new ArrayList<>());
+ testServiceTemplate.setPolicyTypes(new LinkedHashMap<>());
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate);
+ new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate);
}).hasMessage("An incoming list of concepts must have at least one entry");
}
+
+ @Test
+ public void testNullParameters() throws Exception {
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicyTypeList(null, null, null))
+ .hasMessageMatching("^dao is marked .*on.*ull but is null$");
+ }
}