import javax.persistence.Column;
import javax.persistence.Embeddable;
-import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.Getter;
import lombok.NonNull;
+import lombok.ToString;
import org.onap.policy.common.utils.validation.Assertions;
import org.onap.policy.models.base.PfValidationResult.ValidationResult;
* regular expressions respectively.
*/
@Embeddable
-@Data
+@Getter
+@ToString
@EqualsAndHashCode(callSuper = false)
public class PfConceptKey extends PfKey {
private static final long serialVersionUID = 8932717618579392561L;
return this;
}
+ public void setName(@NonNull final String name) {
+ this.name = Assertions.validateStringParameter(NAME_TOKEN, name, NAME_REGEXP);
+ }
+
+ public void setVersion(@NonNull final String version) {
+ this.version = Assertions.validateStringParameter(VERSION_TOKEN, version, VERSION_REGEXP);
+ }
+
@Override
public List<PfKey> getKeys() {
final List<PfKey> keyList = new ArrayList<>();
public static final String NAME_REGEXP = "[A-Za-z0-9\\-_\\.]+";
/** Regular expression to specify the structure of key versions. */
- public static final String VERSION_REGEXP = "[A-Za-z0-9.]+";
+ public static final String VERSION_REGEXP = "[0-9.]+";
/** Regular expression to specify the structure of key IDs. */
public static final String KEY_ID_REGEXP = "[A-Za-z0-9\\-_\\.]+:[0-9].[0-9].[0-9]";
public void testAuthorative() {
Map<String, DummyAuthorativeConcept> dacMap = new LinkedHashMap<>();
dacMap.put("name0", new DummyAuthorativeConcept("name0", "1.2.3", "Hello"));
- dacMap.put("name1", new DummyAuthorativeConcept(null, null, "Hi"));
+ dacMap.put("name1", new DummyAuthorativeConcept(PfKey.NULL_KEY_NAME, PfKey.NULL_KEY_VERSION, "Hi"));
dacMap.put("name2", new DummyAuthorativeConcept("name2", "1.2.3", "Howdy"));
List<Map<String, DummyAuthorativeConcept>> authorativeList = new ArrayList<>();
container.fromAuthorative(authorativeList);
assertEquals("Hello", container.getConceptMap().get(new PfConceptKey("name0:1.2.3")).getDescription());
- assertEquals("Hi", container.getConceptMap().get(new PfConceptKey("name1:0.0.0")).getDescription());
+ assertEquals("Hi", container.getConceptMap().get(new PfConceptKey("NULL:0.0.0")).getDescription());
assertEquals("Howdy", container.getConceptMap().get(new PfConceptKey("name2:1.2.3")).getDescription());
List<Map<String, DummyAuthorativeConcept>> outMapList = container.toAuthorative();
assertEquals(dacMap.get("name0"), outMapList.get(0).get("name0"));
- assertEquals(dacMap.get("name1").getDescription(), outMapList.get(0).get("name1").getDescription());
+ assertEquals(dacMap.get("name1").getDescription(), outMapList.get(0).get("NULL").getDescription());
assertEquals(dacMap.get("name2"), outMapList.get(0).get("name2"));
DummyBadPfConceptContainer badContainer = new DummyBadPfConceptContainer();
versionField.setAccessible(false);
assertEquals(
"version invalid-parameter version with value Key Version "
- + "does not match regular expression [A-Za-z0-9.]+",
+ + "does not match regular expression [0-9.]+",
validationResult.getMessageList().get(0).getMessage());
} catch (Exception validationException) {
fail("test should not throw an exception");
parentVersionField.setAccessible(false);
assertEquals(
"parentKeyVersion invalid-parameter parentKeyVersion with value Parent Version "
- + "does not match regular expression [A-Za-z0-9.]+",
+ + "does not match regular expression [0-9.]+",
validationResult.getMessageList().get(0).getMessage());
} catch (Exception validationException) {
fail("test should not throw an exception");
/**
* Get legacy operational policy.
*
- * @param policyId ID of the policy.
+ * @param policyId ID of the policy
+ * @param policyVersion version of the policy, set to null to get the latest policy
* @return the policies found
* @throws PfModelException on errors getting policies
*/
- public LegacyOperationalPolicy getOperationalPolicy(@NonNull final String policyId) throws PfModelException;
+ public LegacyOperationalPolicy getOperationalPolicy(@NonNull final String policyId, final String policyVersion)
+ throws PfModelException;
/**
* Create legacy operational policy.
* Delete legacy operational policy.
*
* @param policyId ID of the policy.
+ * @param policyVersion version of the policy, set to null to get the latest policy
* @return the deleted policy
* @throws PfModelException on errors deleting policies
*/
- public LegacyOperationalPolicy deleteOperationalPolicy(@NonNull final String policyId) throws PfModelException;
+ public LegacyOperationalPolicy deleteOperationalPolicy(@NonNull final String policyId,
+ @NonNull final String policyVersion) throws PfModelException;
/**
* Get legacy guard policy.
*
- * @param policyId ID of the policy.
+ * @param policyId ID of the policy
+ * @param policyVersion version of the policy, set to null to get the latest policy
* @return the policies found
* @throws PfModelException on errors getting policies
*/
- public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(@NonNull final String policyId) throws PfModelException;
+ public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(@NonNull final String policyId,
+ final String policyVersion) throws PfModelException;
/**
* Create legacy guard policy.
* Delete legacy guard policy.
*
* @param policyId ID of the policy.
+ * @param policyVersion version of the policy, set to null to get the latest policy
* @return the deleted policy
* @throws PfModelException on errors deleting policies
*/
- public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(@NonNull final String policyId)
- throws PfModelException;
+ public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(@NonNull final String policyId,
+ @NonNull final String policyVersion) throws PfModelException;
/**
* Get PDP groups.
}
@Override
- public LegacyOperationalPolicy getOperationalPolicy(@NonNull final String policyId) throws PfModelException {
+ public LegacyOperationalPolicy getOperationalPolicy(@NonNull final String policyId, final String policyVersion)
+ throws PfModelException {
assertInitilized();
- return new LegacyProvider().getOperationalPolicy(pfDao, policyId);
+ return new LegacyProvider().getOperationalPolicy(pfDao, policyId, policyVersion);
}
@Override
}
@Override
- public LegacyOperationalPolicy deleteOperationalPolicy(@NonNull final String policyId) throws PfModelException {
+ public LegacyOperationalPolicy deleteOperationalPolicy(@NonNull final String policyId,
+ @NonNull final String policyVersion) throws PfModelException {
assertInitilized();
- return new LegacyProvider().deleteOperationalPolicy(pfDao, policyId);
+ return new LegacyProvider().deleteOperationalPolicy(pfDao, policyId, policyVersion);
}
@Override
- public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(@NonNull final String policyId) throws PfModelException {
+ public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(@NonNull final String policyId,
+ final String policyVersion) throws PfModelException {
assertInitilized();
- return new LegacyProvider().getGuardPolicy(pfDao, policyId);
+ return new LegacyProvider().getGuardPolicy(pfDao, policyId, policyVersion);
}
@Override
}
@Override
- public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(@NonNull final String policyId)
- throws PfModelException {
+ public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(@NonNull final String policyId,
+ @NonNull final String policyVersion) throws PfModelException {
assertInitilized();
- return new LegacyProvider().deleteGuardPolicy(pfDao, policyId);
+ return new LegacyProvider().deleteGuardPolicy(pfDao, policyId, policyVersion);
}
@Override
public void updatePdpStatistics(@NonNull final String pdpGroupName, @NonNull final String pdpType,
@NonNull final String pdpInstanceId, @NonNull final PdpStatistics pdpStatistics) throws PfModelException {
assertInitilized();
- new PdpProvider().updatePdpStatistics(pfDao, pdpGroupName, pdpType, pdpInstanceId,
- pdpStatistics);
+ new PdpProvider().updatePdpStatistics(pfDao, pdpGroupName, pdpType, pdpInstanceId, pdpStatistics);
}
/**
@Override
- public LegacyOperationalPolicy getOperationalPolicy(final String policyId) throws PfModelException {
+ public LegacyOperationalPolicy getOperationalPolicy(final String policyId, final String policyVersion)
+ throws PfModelException {
return new LegacyOperationalPolicy();
}
}
@Override
- public LegacyOperationalPolicy deleteOperationalPolicy(final String policyId) throws PfModelException {
+ public LegacyOperationalPolicy deleteOperationalPolicy(final String policyId, final String policyVersion)
+ throws PfModelException {
return new LegacyOperationalPolicy();
}
@Override
- public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(final String policyId) throws PfModelException {
+ public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(final String policyId, final String policyVersion)
+ throws PfModelException {
return new HashMap<>();
}
}
@Override
- public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(final String policyId) throws PfModelException {
+ public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(final String policyId, final String policyVersion)
+ throws PfModelException {
return new HashMap<>();
}
}).hasMessage("version is marked @NonNull but is null");
assertThatThrownBy(() -> {
- databaseProvider.getOperationalPolicy(null);
+ databaseProvider.getOperationalPolicy(null, null);
}).hasMessage("policyId is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getOperationalPolicy(null, "");
+ }).hasMessage("policyId is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ databaseProvider.getOperationalPolicy("", null);
+ }).hasMessage("no policy found for policy: :null");
+
assertThatThrownBy(() -> {
databaseProvider.createOperationalPolicy(null);
}).hasMessage("legacyOperationalPolicy is marked @NonNull but is null");
}).hasMessage("legacyOperationalPolicy is marked @NonNull but is null");
assertThatThrownBy(() -> {
- databaseProvider.deleteOperationalPolicy(null);
+ databaseProvider.deleteOperationalPolicy(null, null);
+ }).hasMessage("policyId is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteOperationalPolicy(null, "");
+ }).hasMessage("policyId is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteOperationalPolicy("", null);
+ }).hasMessage("policyVersion is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ databaseProvider.getGuardPolicy(null, null);
}).hasMessage("policyId is marked @NonNull but is null");
assertThatThrownBy(() -> {
- databaseProvider.getGuardPolicy(null);
+ databaseProvider.getGuardPolicy(null, "");
}).hasMessage("policyId is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getGuardPolicy("", null);
+ }).hasMessage("no policy found for policy: :null");
+
assertThatThrownBy(() -> {
databaseProvider.createGuardPolicy(null);
}).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
}).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
assertThatThrownBy(() -> {
- databaseProvider.deleteGuardPolicy(null);
+ databaseProvider.deleteGuardPolicy(null, null);
+ }).hasMessage("policyId is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteGuardPolicy(null, "");
}).hasMessage("policyId is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteGuardPolicy("", null);
+ }).hasMessage("policyVersion is marked @NonNull but is null");
+
assertThatThrownBy(() -> {
databaseProvider.getFilteredPdpGroups(null);
}).hasMessage("filter is marked @NonNull but is null");
try (PolicyModelsProvider databaseProvider =
new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters)) {
- assertEquals(0, databaseProvider.getPolicyTypes("name", "version").getPolicyTypes().get(0).size());
- assertEquals(0, databaseProvider.getPolicyTypeList("name", "version").size());
+ assertEquals(0, databaseProvider.getPolicyTypes("name", "1.0.0").getPolicyTypes().get(0).size());
+ assertEquals(0, databaseProvider.getPolicyTypeList("name", "1.0.0").size());
assertEquals(0, databaseProvider.getFilteredPolicyTypes(ToscaPolicyTypeFilter.builder().build())
.getPolicyTypes().get(0).size());
assertEquals(0, databaseProvider.getFilteredPolicyTypeList(ToscaPolicyTypeFilter.builder().build()).size());
databaseProvider.updatePolicyTypes(new ToscaServiceTemplate());
}).hasMessage("no policy types specified on service template");
- assertEquals(0, databaseProvider.deletePolicyType("name", "version").getPolicyTypes().get(0).size());
+ assertEquals(0, databaseProvider.deletePolicyType("name", "1.0.0").getPolicyTypes().get(0).size());
- assertEquals(0, databaseProvider.deletePolicyType("name", "version").getPolicyTypes().get(0).size());
+ assertEquals(0, databaseProvider.deletePolicyType("name", "1.0.0").getPolicyTypes().get(0).size());
- assertEquals(0, databaseProvider.getPolicies("name", "version").getToscaTopologyTemplate().getPolicies()
+ assertEquals(0, databaseProvider.getPolicies("name", "1.0.0").getToscaTopologyTemplate().getPolicies()
.get(0).size());
- assertEquals(0, databaseProvider.getPolicyList("name", "version").size());
+ assertEquals(0, databaseProvider.getPolicyList("name", "1.0.0").size());
assertEquals(0, databaseProvider.getFilteredPolicies(ToscaPolicyFilter.builder().build())
.getToscaTopologyTemplate().getPolicies().get(0).size());
assertEquals(0, databaseProvider.getFilteredPolicyList(ToscaPolicyFilter.builder().build()).size());
.get(0).size());
assertThatThrownBy(() -> {
- databaseProvider.getOperationalPolicy("policy_id");
- }).hasMessage("no policy found for policy ID: policy_id");
+ databaseProvider.getOperationalPolicy("policy_id", null);
+ }).hasMessage("no policy found for policy: policy_id:null");
+
+ assertThatThrownBy(() -> {
+ databaseProvider.getOperationalPolicy("policy_id", "10.9.8");
+ }).hasMessage("no policy found for policy: policy_id:10.9.8");
assertThatThrownBy(() -> {
databaseProvider.createOperationalPolicy(new LegacyOperationalPolicy());
assertThatThrownBy(() -> {
databaseProvider.updateOperationalPolicy(new LegacyOperationalPolicy());
- }).hasMessage("no policy found for policy ID: null");
+ }).hasMessage("name is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteOperationalPolicy("policy_id", "55.44.33");
+ }).hasMessage("no policy found for policy: policy_id:55.44.33");
assertThatThrownBy(() -> {
- databaseProvider.deleteOperationalPolicy("policy_id");
- }).hasMessage("no policy found for policy ID: policy_id");
+ databaseProvider.getGuardPolicy("policy_id", null);
+ }).hasMessage("no policy found for policy: policy_id:null");
assertThatThrownBy(() -> {
- databaseProvider.getGuardPolicy("policy_id");
- }).hasMessage("no policy found for policy ID: policy_id");
+ databaseProvider.getGuardPolicy("policy_id", "6.7.5");
+ }).hasMessage("no policy found for policy: policy_id:6.7.5");
assertThatThrownBy(() -> {
databaseProvider.createGuardPolicy(new LegacyGuardPolicyInput());
}).hasMessage("policy type for guard policy \"null\" unknown");
assertThatThrownBy(() -> {
- databaseProvider.deleteGuardPolicy("policy_id");
- }).hasMessage("no policy found for policy ID: policy_id");
+ databaseProvider.deleteGuardPolicy("policy_id", "33.22.11");
+ }).hasMessage("no policy found for policy: policy_id:33.22.11");
assertEquals(0, databaseProvider.getPdpGroups("name").size());
assertEquals(0, databaseProvider.getFilteredPdpGroups(PdpGroupFilter.builder().build()).size());
}
@Override
- public LegacyOperationalPolicy getOperationalPolicy(@NonNull String policyId) throws PfModelException {
+ public LegacyOperationalPolicy getOperationalPolicy(@NonNull final String policyId, final String policyVersion)
+ throws PfModelException {
return null;
}
}
@Override
- public LegacyOperationalPolicy deleteOperationalPolicy(@NonNull String policyId) throws PfModelException {
+ public LegacyOperationalPolicy deleteOperationalPolicy(@NonNull String policyId, final String policyVersion)
+ throws PfModelException {
return null;
}
@Override
- public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(@NonNull String policyId) throws PfModelException {
+ public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(@NonNull String policyId, final String policyVersion)
+ throws PfModelException {
return null;
}
}
@Override
- public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(@NonNull String policyId) throws PfModelException {
+ public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(@NonNull String policyId, final String policyVersion)
+ throws PfModelException {
return null;
}
}
@Override
- public void updatePdp(@NonNull String pdpGroupName, @NonNull String pdpSubGroup,
- @NonNull Pdp pdp) throws PfModelException {}
+ public void updatePdp(@NonNull String pdpGroupName, @NonNull String pdpSubGroup, @NonNull Pdp pdp)
+ throws PfModelException {}
@Override
public PdpGroup deletePdpGroup(@NonNull String name) throws PfModelException {
}
@Override
- public void updatePdpSubGroup(@NonNull String pdpGroupName,
- @NonNull PdpSubGroup pdpSubGroup) throws PfModelException {}
+ public void updatePdpSubGroup(@NonNull String pdpGroupName, @NonNull PdpSubGroup pdpSubGroup)
+ throws PfModelException {}
@Override
public List<PdpStatistics> getPdpStatistics(String name) throws PfModelException {
}
@Override
- public void updatePdpStatistics(@NonNull String pdpGroupName,
- @NonNull String pdpType, @NonNull String pdpInstanceId, @NonNull PdpStatistics pdppStatistics) {}
+ public void updatePdpStatistics(@NonNull String pdpGroupName, @NonNull String pdpType,
+ @NonNull String pdpInstanceId, @NonNull PdpStatistics pdppStatistics) {}
}
assertNotNull(dummyProvider.updatePolicies(new ToscaServiceTemplate()));
assertNotNull(dummyProvider.deletePolicy("name", "version"));
- assertNotNull(dummyProvider.getOperationalPolicy("policy_id"));
+ assertNotNull(dummyProvider.getOperationalPolicy("policy_id", "1"));
assertNotNull(dummyProvider.createOperationalPolicy(new LegacyOperationalPolicy()));
assertNotNull(dummyProvider.updateOperationalPolicy(new LegacyOperationalPolicy()));
- assertNotNull(dummyProvider.deleteOperationalPolicy("policy_id"));
+ assertNotNull(dummyProvider.deleteOperationalPolicy("policy_id", "1"));
- assertNotNull(dummyProvider.getGuardPolicy("policy_id"));
+ assertNotNull(dummyProvider.getGuardPolicy("policy_id", "1"));
assertNotNull(dummyProvider.createGuardPolicy(new LegacyGuardPolicyInput()));
assertNotNull(dummyProvider.updateGuardPolicy(new LegacyGuardPolicyInput()));
- assertNotNull(dummyProvider.deleteGuardPolicy("policy_id"));
+ assertNotNull(dummyProvider.deleteGuardPolicy("policy_id", "1"));
assertTrue(dummyProvider.getPdpGroups("name").isEmpty());
assertTrue(dummyProvider.getFilteredPdpGroups(PdpGroupFilter.builder().build()).isEmpty());
assertEquals(gip.getContent(),
createdGopm.get(gip.getPolicyId()).getProperties().values().iterator().next());
- Map<String, LegacyGuardPolicyOutput> gotGopm = databaseProvider.getGuardPolicy(gip.getPolicyId());
+ Map<String, LegacyGuardPolicyOutput> gotGopm = databaseProvider.getGuardPolicy(gip.getPolicyId(), null);
assertEquals(gip.getPolicyId(), gotGopm.keySet().iterator().next());
assertEquals(gip.getContent(),
gotGopm.get(gip.getPolicyId()).getProperties().values().iterator().next());
assertEquals(gip.getContent(),
updatedGopm.get(gip.getPolicyId()).getProperties().values().iterator().next());
- Map<String, LegacyGuardPolicyOutput> deletedGopm = databaseProvider.deleteGuardPolicy(gip.getPolicyId());
+ Map<String, LegacyGuardPolicyOutput> deletedGopm = databaseProvider.deleteGuardPolicy(gip.getPolicyId(), "1");
assertEquals(gip.getPolicyId(), deletedGopm.keySet().iterator().next());
assertEquals(gip.getContent(),
deletedGopm.get(gip.getPolicyId()).getProperties().values().iterator().next());
LegacyOperationalPolicy createdLop = databaseProvider.createOperationalPolicy(lop);
assertEquals(createdLop, lop);
- LegacyOperationalPolicy gotLop = databaseProvider.getOperationalPolicy(lop.getPolicyId());
+ LegacyOperationalPolicy gotLop = databaseProvider.getOperationalPolicy(lop.getPolicyId(), null);
assertEquals(gotLop, lop);
LegacyOperationalPolicy updatedLop = databaseProvider.updateOperationalPolicy(lop);
assertEquals(gotLop, updatedLop);
- LegacyOperationalPolicy deletedLop = databaseProvider.deleteOperationalPolicy(lop.getPolicyId());
+ LegacyOperationalPolicy deletedLop = databaseProvider.deleteOperationalPolicy(lop.getPolicyId(), "1");
assertEquals(gotLop, deletedLop);
String actualRetrievedJson = standardCoder.encode(gotLop);
package org.onap.policy.models.tosca.legacy.provider;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.NonNull;
+import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.dao.PfDao;
private static final Logger LOGGER = LoggerFactory.getLogger(LegacyProvider.class);
private static final String FIRST_POLICY_VERSION = "1";
+ private static final String LEGACY_MINOR_PATCH_SUFFIX = ".0.0";
// Recurring constants
- private static final String NO_POLICY_FOUND_FOR_POLICY_ID = "no policy found for policy ID: ";
+ private static final String NO_POLICY_FOUND_FOR_POLICY = "no policy found for policy: ";
/**
* Get legacy operational policy.
*
* @param dao the DAO to use to access the database
* @param policyId ID of the policy.
+ * @param policyVersion version of the policy.
* @return the policies found
* @throws PfModelException on errors getting policies
*/
- public LegacyOperationalPolicy getOperationalPolicy(@NonNull final PfDao dao, @NonNull final String policyId)
- throws PfModelException {
+ public LegacyOperationalPolicy getOperationalPolicy(@NonNull final PfDao dao, @NonNull final String policyId,
+ final String policyVersion) throws PfModelException {
- JpaToscaPolicy newestPolicy = getLatestPolicy(dao, policyId);
-
- if (newestPolicy == null) {
- String errorMessage = NO_POLICY_FOUND_FOR_POLICY_ID + policyId;
- LOGGER.warn(errorMessage);
- throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
- }
-
- // Create the structure of the TOSCA service template to contain the policy type
- JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
- serviceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
- serviceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
- serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(newestPolicy.getKey(), newestPolicy);
-
- return new LegacyOperationalPolicyMapper().fromToscaServiceTemplate(serviceTemplate);
+ return new LegacyOperationalPolicyMapper()
+ .fromToscaServiceTemplate(getLegacyPolicy(dao, policyId, policyVersion));
}
/**
public LegacyOperationalPolicy updateOperationalPolicy(@NonNull final PfDao dao,
@NonNull final LegacyOperationalPolicy legacyOperationalPolicy) throws PfModelException {
- // We need to find the latest policy and use the major version, if there is no policy with this ID, then
- // we have an error
- JpaToscaPolicy newestPolicy = getLatestPolicy(dao, legacyOperationalPolicy.getPolicyId());
-
- if (newestPolicy == null) {
- String errorMessage = NO_POLICY_FOUND_FOR_POLICY_ID + legacyOperationalPolicy.getPolicyId();
- LOGGER.warn(errorMessage);
- throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
- } else {
- legacyOperationalPolicy.setPolicyVersion(Integer.toString(newestPolicy.getKey().getMajorVersion()));
- }
-
JpaToscaServiceTemplate incomingServiceTemplate =
new LegacyOperationalPolicyMapper().toToscaServiceTemplate(legacyOperationalPolicy);
JpaToscaServiceTemplate outgoingingServiceTemplate =
- new SimpleToscaProvider().createPolicies(dao, incomingServiceTemplate);
+ new SimpleToscaProvider().updatePolicies(dao, incomingServiceTemplate);
return new LegacyOperationalPolicyMapper().fromToscaServiceTemplate(outgoingingServiceTemplate);
}
*
* @param dao the DAO to use to access the database
* @param policyId ID of the policy.
+ * @param policyVersion version of the policy.
* @return the deleted policy
* @throws PfModelException on errors deleting policies
*/
- public LegacyOperationalPolicy deleteOperationalPolicy(@NonNull final PfDao dao, @NonNull final String policyId)
- throws PfModelException {
-
- // Get all the policies in the database and check the policy ID against the policies returned
- List<JpaToscaPolicy> policyList = dao.getAll(JpaToscaPolicy.class);
-
- // Find the latest policy that matches the ID
- List<JpaToscaPolicy> policyDeleteList = new ArrayList<>();
-
- for (JpaToscaPolicy policy : policyList) {
- if (policyId.equals(policy.getKey().getName())) {
- policyDeleteList.add(policy);
- }
- }
-
- if (policyDeleteList.isEmpty()) {
- String errorMessage = NO_POLICY_FOUND_FOR_POLICY_ID + policyId;
- LOGGER.warn(errorMessage);
- throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
- }
-
- // Create the structure of the TOSCA service template to contain the policy type
- JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
- serviceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
- serviceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
-
- for (JpaToscaPolicy deletePolicy : policyDeleteList) {
- dao.delete(deletePolicy);
- serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(deletePolicy.getKey(),
- deletePolicy);
- }
+ public LegacyOperationalPolicy deleteOperationalPolicy(@NonNull final PfDao dao, @NonNull final String policyId,
+ @NonNull final String policyVersion) throws PfModelException {
- return new LegacyOperationalPolicyMapper().fromToscaServiceTemplate(serviceTemplate);
+ return new LegacyOperationalPolicyMapper()
+ .fromToscaServiceTemplate(deleteLegacyPolicy(dao, policyId, policyVersion));
}
/**
*
* @param dao the DAO to use to access the database
* @param policyId ID of the policy.
+ * @param policyVersion version of the policy.
* @return the policies found
* @throws PfModelException on errors getting policies
*/
- public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(@NonNull final PfDao dao, @NonNull final String policyId)
- throws PfModelException {
+ public Map<String, LegacyGuardPolicyOutput> getGuardPolicy(@NonNull final PfDao dao, @NonNull final String policyId,
+ final String policyVersion) throws PfModelException {
- JpaToscaPolicy newestPolicy = getLatestPolicy(dao, policyId);
-
- if (newestPolicy == null) {
- String errorMessage = NO_POLICY_FOUND_FOR_POLICY_ID + policyId;
- LOGGER.warn(errorMessage);
- throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
- }
-
- // Create the structure of the TOSCA service template to contain the policy type
- JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
- serviceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
- serviceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
- serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(newestPolicy.getKey(), newestPolicy);
-
- return new LegacyGuardPolicyMapper().fromToscaServiceTemplate(serviceTemplate);
+ return new LegacyGuardPolicyMapper().fromToscaServiceTemplate(getLegacyPolicy(dao, policyId, policyVersion));
}
/**
JpaToscaServiceTemplate incomingServiceTemplate =
new LegacyGuardPolicyMapper().toToscaServiceTemplate(legacyGuardPolicy);
JpaToscaServiceTemplate outgoingingServiceTemplate =
- new SimpleToscaProvider().createPolicies(dao, incomingServiceTemplate);
+ new SimpleToscaProvider().updatePolicies(dao, incomingServiceTemplate);
return new LegacyGuardPolicyMapper().fromToscaServiceTemplate(outgoingingServiceTemplate);
}
*
* @param dao the DAO to use to access the database
* @param policyId ID of the policy.
+ * @param policyVersion version of the policy.
* @return the deleted policy
* @throws PfModelException on errors deleting policies
*/
public Map<String, LegacyGuardPolicyOutput> deleteGuardPolicy(@NonNull final PfDao dao,
- @NonNull final String policyId) throws PfModelException {
-
- // Get all the policies in the database and check the policy ID against the policies returned
- List<JpaToscaPolicy> policyList = dao.getAll(JpaToscaPolicy.class);
+ @NonNull final String policyId, @NonNull final String policyVersion) throws PfModelException {
- // Find the latest policy that matches the ID
- List<JpaToscaPolicy> policyDeleteList = new ArrayList<>();
+ return new LegacyGuardPolicyMapper().fromToscaServiceTemplate(deleteLegacyPolicy(dao, policyId, policyVersion));
+ }
- for (JpaToscaPolicy policy : policyList) {
- if (policyId.equals(policy.getKey().getName())) {
- policyDeleteList.add(policy);
- }
+ /**
+ * Get the JPA Policy for a policy ID and version.
+ *
+ * @param dao The DAO to search
+ * @param policyId the policy ID to search for
+ * @param policyVersion the policy version to search for
+ * @return the JPA policy found
+ * @throws PfModelRuntimeException if a policy is not found
+ */
+ private JpaToscaServiceTemplate getLegacyPolicy(final PfDao dao, final String policyId,
+ final String policyVersion) {
+ JpaToscaPolicy foundPolicy = null;
+ if (policyVersion == null) {
+ foundPolicy = getLatestPolicy(dao, policyId);
+ } else {
+ foundPolicy = dao.get(JpaToscaPolicy.class,
+ new PfConceptKey(policyId, policyVersion + LEGACY_MINOR_PATCH_SUFFIX));
}
- if (policyDeleteList.isEmpty()) {
- String errorMessage = NO_POLICY_FOUND_FOR_POLICY_ID + policyId;
+ if (foundPolicy == null) {
+ String errorMessage = NO_POLICY_FOUND_FOR_POLICY + policyId + ':' + policyVersion;
LOGGER.warn(errorMessage);
throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
}
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
serviceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
+ serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(foundPolicy.getKey(), foundPolicy);
+
+ return serviceTemplate;
+ }
+
+ /**
+ * Delete a legacy policy.
+ *
+ * @param dao the DAO to use for the deletion
+ * @param policyId the policy ID
+ * @param policyVersion the policy version
+ * @return a service template containing the policy that has been deleted
+ */
+ private JpaToscaServiceTemplate deleteLegacyPolicy(final PfDao dao, final String policyId,
+ final String policyVersion) {
+
+ final JpaToscaPolicy deletePolicy =
+ dao.get(JpaToscaPolicy.class, new PfConceptKey(policyId, policyVersion + LEGACY_MINOR_PATCH_SUFFIX));
- for (JpaToscaPolicy deletePolicy : policyDeleteList) {
- dao.delete(deletePolicy);
- serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(deletePolicy.getKey(),
- deletePolicy);
+ if (deletePolicy == null) {
+ String errorMessage = NO_POLICY_FOUND_FOR_POLICY + policyId + ':' + policyVersion;
+ LOGGER.warn(errorMessage);
+ throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
}
- return new LegacyGuardPolicyMapper().fromToscaServiceTemplate(serviceTemplate);
+ // Delete the policy
+ dao.delete(deletePolicy);
+
+ // Create the structure of the TOSCA service template to contain the policy type
+ JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
+ serviceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
+ serviceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
+ serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(deletePolicy.getKey(), deletePolicy);
+
+ return serviceTemplate;
}
/**
}
return newestPolicy;
}
+
}
public void fromAuthorative(@NonNull final ToscaPolicy toscaPolicy) {
super.fromAuthorative(toscaPolicy);
- type.setName(toscaPolicy.getType());
- type.setVersion(toscaPolicy.getTypeVersion());
- if (type.getVersion() == null) {
+ if (toscaPolicy.getType() != null) {
+ type.setName(toscaPolicy.getType());
+ }
+ else {
+ type.setName(PfKey.NULL_KEY_NAME);
+ }
+
+ if (toscaPolicy.getTypeVersion() != null) {
+ type.setVersion(toscaPolicy.getTypeVersion());
+ }
+ else {
type.setVersion(PfKey.NULL_KEY_VERSION);
}
@Test
public void testPoliciesGet() throws Exception {
assertThatThrownBy(() -> {
- new LegacyProvider().getGuardPolicy(null, null);
+ new LegacyProvider().getGuardPolicy(null, null, null);
}).hasMessage("dao is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().getGuardPolicy(null, "");
+ new LegacyProvider().getGuardPolicy(null, null, "");
}).hasMessage("dao is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().getGuardPolicy(pfDao, null);
+ new LegacyProvider().getGuardPolicy(pfDao, null, null);
}).hasMessage("policyId is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().getGuardPolicy(pfDao, "I Dont Exist");
- }).hasMessage("no policy found for policy ID: I Dont Exist");
+ new LegacyProvider().getGuardPolicy(pfDao, "I Dont Exist", null);
+ }).hasMessage("no policy found for policy: I Dont Exist:null");
createPolicyTypes();
createdGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
Map<String, LegacyGuardPolicyOutput> gotGopm =
- new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId());
+ new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), null);
assertEquals(originalGip.getPolicyId(), gotGopm.keySet().iterator().next());
assertEquals(originalGip.getContent(),
String actualJsonOutput = standardCoder.encode(gotGopm);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
+
+ gotGopm = new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), "1");
+
+ assertEquals(originalGip.getPolicyId(), gotGopm.keySet().iterator().next());
+ assertEquals(originalGip.getContent(),
+ gotGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
+
+ actualJsonOutput = standardCoder.encode(gotGopm);
+
+ assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
+
+ assertThatThrownBy(() -> {
+ new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), "2");
+ }).hasMessage("no policy found for policy: guard.frequency.scaleout:2");
}
@Test
createdGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
Map<String, LegacyGuardPolicyOutput> gotGopm =
- new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId());
+ new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), null);
assertEquals(originalGip.getPolicyId(), gotGopm.keySet().iterator().next());
assertEquals(originalGip.getContent(),
createdGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
Map<String, LegacyGuardPolicyOutput> gotGopm =
- new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId());
+ new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), null);
assertEquals(originalGip.getPolicyId(), gotGopm.keySet().iterator().next());
assertEquals(originalGip.getContent(),
updatedGp.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
Map<String, LegacyGuardPolicyOutput> gotUpdatedGopm =
- new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId());
+ new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), null);
assertEquals(originalGip.getPolicyId(), gotUpdatedGopm.keySet().iterator().next());
assertEquals(originalGip.getContent(),
gotUpdatedGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
@Test
public void testPoliciesDelete() throws Exception {
assertThatThrownBy(() -> {
- new LegacyProvider().deleteGuardPolicy(null, null);
+ new LegacyProvider().deleteGuardPolicy(null, null, null);
+ }).hasMessage("dao is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteGuardPolicy(null, null, "");
+ }).hasMessage("dao is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteGuardPolicy(null, "", null);
}).hasMessage("dao is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().deleteGuardPolicy(null, "");
+ new LegacyProvider().deleteGuardPolicy(null, "", "");
}).hasMessage("dao is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().deleteGuardPolicy(pfDao, null);
+ new LegacyProvider().deleteGuardPolicy(pfDao, null, null);
}).hasMessage("policyId is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteGuardPolicy(pfDao, null, "");
+ }).hasMessage("policyId is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteGuardPolicy(pfDao, "", null);
+ }).hasMessage("policyVersion is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().deleteGuardPolicy(pfDao, "I Dont Exist");
- }).hasMessage("no policy found for policy ID: I Dont Exist");
+ new LegacyProvider().deleteGuardPolicy(pfDao, "IDontExist", "");
+ }).hasMessage("no policy found for policy: IDontExist:");
createPolicyTypes();
createdGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
Map<String, LegacyGuardPolicyOutput> gotGopm =
- new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId());
+ new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), null);
assertEquals(originalGip.getPolicyId(), gotGopm.keySet().iterator().next());
assertEquals(originalGip.getContent(),
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteGuardPolicy(pfDao, originalGip.getPolicyId(), null);
+ }).hasMessage("policyVersion is marked @NonNull but is null");
+
Map<String, LegacyGuardPolicyOutput> deletedGopm =
- new LegacyProvider().deleteGuardPolicy(pfDao, originalGip.getPolicyId());
+ new LegacyProvider().deleteGuardPolicy(pfDao, originalGip.getPolicyId(), "1");
assertEquals(originalGip.getPolicyId(), deletedGopm.keySet().iterator().next());
assertEquals(originalGip.getContent(),
deletedGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
assertThatThrownBy(() -> {
- new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId());
- }).hasMessage("no policy found for policy ID: guard.frequency.scaleout");
+ new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), null);
+ }).hasMessage("no policy found for policy: guard.frequency.scaleout:null");
LegacyGuardPolicyInput otherGip = new LegacyGuardPolicyInput();
otherGip.setPolicyId("guard.blacklist.b0");
createdOtherGopm.get(otherGip.getPolicyId()).getProperties().values().iterator().next());
assertThatThrownBy(() -> {
- new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId());
- }).hasMessage("no policy found for policy ID: guard.frequency.scaleout");
+ new LegacyProvider().getGuardPolicy(pfDao, originalGip.getPolicyId(), null);
+ }).hasMessage("no policy found for policy: guard.frequency.scaleout:null");
}
private void createPolicyTypes() throws CoderException, PfModelException {
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_DRIVER, "org.h2.Driver");
jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_URL, "jdbc:h2:mem:testdb");
- daoParameters.setJdbcProperties(jdbcProperties );
+ daoParameters.setJdbcProperties(jdbcProperties);
pfDao = new PfDaoFactory().createPfDao(daoParameters);
pfDao.init(daoParameters);
@Test
public void testPoliciesGet() throws Exception {
assertThatThrownBy(() -> {
- new LegacyProvider().getOperationalPolicy(null, null);
+ new LegacyProvider().getOperationalPolicy(null, null, null);
}).hasMessage("dao is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().getOperationalPolicy(null, "");
+ new LegacyProvider().getOperationalPolicy(null, "", null);
}).hasMessage("dao is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().getOperationalPolicy(pfDao, null);
+ new LegacyProvider().getOperationalPolicy(pfDao, null, null);
}).hasMessage("policyId is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().getOperationalPolicy(pfDao, "I Dont Exist");
- }).hasMessage("no policy found for policy ID: I Dont Exist");
+ new LegacyProvider().getOperationalPolicy(pfDao, "I Dont Exist", null);
+ }).hasMessage("no policy found for policy: I Dont Exist:null");
createPolicyTypes();
assertEquals(originalLop, createdLop);
- LegacyOperationalPolicy gotLop = new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId());
+ LegacyOperationalPolicy gotLop =
+ new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
assertEquals(gotLop, originalLop);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
LegacyOperationalPolicy createdLopV2 = new LegacyProvider().createOperationalPolicy(pfDao, originalLop);
- LegacyOperationalPolicy gotLopV2 = new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId());
+ LegacyOperationalPolicy gotLopV2 =
+ new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
assertEquals(gotLopV2, createdLopV2);
}
assertEquals(originalLop, createdLop);
- LegacyOperationalPolicy gotLop = new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId());
+ LegacyOperationalPolicy gotLop =
+ new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
assertEquals(gotLop, originalLop);
assertThatThrownBy(() -> {
new LegacyProvider().updateOperationalPolicy(pfDao, new LegacyOperationalPolicy());
- }).hasMessage("no policy found for policy ID: null");
+ }).hasMessage("name is marked @NonNull but is null");
createPolicyTypes();
LegacyOperationalPolicy createdLop = new LegacyProvider().createOperationalPolicy(pfDao, originalLop);
assertEquals(originalLop, createdLop);
- LegacyOperationalPolicy gotLop = new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId());
+ LegacyOperationalPolicy gotLop =
+ new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
assertEquals(gotLop, originalLop);
originalLop.setContent("Some New Content");
assertEquals(originalLop, updatedLop);
LegacyOperationalPolicy gotUpdatedLop =
- new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId());
+ new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
assertEquals(gotUpdatedLop, originalLop);
assertEquals("Some New Content", gotUpdatedLop.getContent());
}
@Test
public void testPoliciesDelete() throws Exception {
assertThatThrownBy(() -> {
- new LegacyProvider().deleteOperationalPolicy(null, null);
+ new LegacyProvider().deleteOperationalPolicy(null, null, null);
}).hasMessage("dao is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().deleteOperationalPolicy(null, "");
+ new LegacyProvider().deleteOperationalPolicy(null, null, "");
}).hasMessage("dao is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().deleteOperationalPolicy(pfDao, null);
+ new LegacyProvider().deleteOperationalPolicy(null, "", null);
+ }).hasMessage("dao is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteOperationalPolicy(null, "", "");
+
+ }).hasMessage("dao is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteOperationalPolicy(pfDao, null, null);
}).hasMessage("policyId is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new LegacyProvider().deleteOperationalPolicy(pfDao, "I Dont Exist");
- }).hasMessage("no policy found for policy ID: I Dont Exist");
+ new LegacyProvider().deleteOperationalPolicy(pfDao, null, "");
+ }).hasMessage("policyId is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteOperationalPolicy(pfDao, "", null);
+ }).hasMessage("policyVersion is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteOperationalPolicy(pfDao, "IDontExist", "");
+ }).hasMessage("no policy found for policy: IDontExist:");
createPolicyTypes();
LegacyOperationalPolicy createdLop = new LegacyProvider().createOperationalPolicy(pfDao, originalLop);
assertEquals(originalLop, createdLop);
- LegacyOperationalPolicy gotLop = new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId());
+ LegacyOperationalPolicy gotLop =
+ new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
assertEquals(gotLop, originalLop);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
+ assertThatThrownBy(() -> {
+ new LegacyProvider().deleteOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
+ }).hasMessage("policyVersion is marked @NonNull but is null");
+
LegacyOperationalPolicy deletedLop =
- new LegacyProvider().deleteOperationalPolicy(pfDao, originalLop.getPolicyId());
+ new LegacyProvider().deleteOperationalPolicy(pfDao, originalLop.getPolicyId(), "1");
assertEquals(originalLop, deletedLop);
assertThatThrownBy(() -> {
- new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId());
- }).hasMessage("no policy found for policy ID: operational.restart");
+ new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
+ }).hasMessage("no policy found for policy: operational.restart:null");
LegacyOperationalPolicy otherLop = new LegacyOperationalPolicy();
otherLop.setPolicyId("another-policy");
assertEquals(otherLop, createdOtherLop);
assertThatThrownBy(() -> {
- new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId());
- }).hasMessage("no policy found for policy ID: operational.restart");
+ new LegacyProvider().getOperationalPolicy(pfDao, originalLop.getPolicyId(), null);
+ }).hasMessage("no policy found for policy: operational.restart:null");
}
private void createPolicyTypes() throws CoderException, PfModelException {
- Object yamlObject = new Yaml().load(
- ResourceUtils.getResourceAsString("policytypes/onap.policies.controlloop.Operational.yaml"));
+ Object yamlObject = new Yaml()
+ .load(ResourceUtils.getResourceAsString("policytypes/onap.policies.controlloop.Operational.yaml"));
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
Code Review / policy / models.git / commitdiff