+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property.
- * ================================================================================
- * 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.pdp.concepts;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import org.onap.policy.models.pdp.enums.PdpMessageType;
-
-/**
- * Class to represent the PDP_HEALTH_CHECK message that PAP will send to either PDPGroup/Subgroup or a PDP.
- *
- * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
- */
-@Getter
-@Setter
-@ToString
-public class PdpHealthCheck extends PdpMessage {
-
- private String name;
- private String pdpGroup;
- private String pdpSubgroup;
-
- /**
- * Constructor for instantiating PdpHealthCheck class with message name.
- *
- */
- public PdpHealthCheck() {
- super(PdpMessageType.PDP_HEALTH_CHECK);
- }
-}
package org.onap.policy.models.pdp.concepts;
import java.util.List;
+
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
+
import org.onap.policy.models.pdp.enums.PdpHealthStatus;
import org.onap.policy.models.pdp.enums.PdpMessageType;
import org.onap.policy.models.pdp.enums.PdpState;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
/**
* Class to represent the PDP_STATUS message that all the PDP's will send to PAP.
private String description;
private String pdpGroup;
private String pdpSubgroup;
- private List<PolicyTypeIdent> supportedPolicyTypes;
- private List<ToscaPolicy> policies;
+ private List<ToscaPolicyTypeIdentifier> supportedPolicyTypes;
+ private List<ToscaPolicyIdentifier> policies;
private String instance;
private String deploymentInstanceInfo;
private String properties;
-/*
+/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
import lombok.ToString;
+
import org.onap.policy.models.base.PfUtils;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
/**
- * Class to represent a group of all PDP's of the same pdp type running for a particular
- * domain.
+ * Class to represent a group of all PDP's of the same pdp type running for a particular domain.
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
@ToString
public class PdpSubGroup {
private String pdpType;
- private List<PolicyTypeIdent> supportedPolicyTypes;
- private List<ToscaPolicy> policies;
+ private List<ToscaPolicyTypeIdentifier> supportedPolicyTypes;
+ private List<ToscaPolicyIdentifier> policies;
private int currentInstanceCount;
private int desiredInstanceCount;
private Map<String, String> properties;
*
* @param source source from which to copy fields
*/
- public PdpSubGroup(@NonNull PdpSubGroup source) {
+ public PdpSubGroup(@NonNull final PdpSubGroup source) {
this.pdpType = source.pdpType;
- this.supportedPolicyTypes = PfUtils.mapList(source.supportedPolicyTypes, PolicyTypeIdent::new);
- this.policies = PfUtils.mapList(source.policies, ToscaPolicy::new);
+ this.supportedPolicyTypes = PfUtils.mapList(source.supportedPolicyTypes, ToscaPolicyTypeIdentifier::new);
+ this.policies = PfUtils.mapList(source.policies, ToscaPolicyIdentifier::new);
this.currentInstanceCount = source.currentInstanceCount;
this.desiredInstanceCount = source.desiredInstanceCount;
this.properties = (source.properties == null ? null : new LinkedHashMap<>(source.properties));
*/
@Data
@NoArgsConstructor
-public class PolicyIdent {
+public class ToscaPolicyIdentifier {
@NonNull
private String name;
private String version;
- public PolicyIdent(@NonNull String name, @NonNull String version) {
+ public ToscaPolicyIdentifier(@NonNull String name, @NonNull String version) {
this.name = name;
this.version = version;
}
- public PolicyIdent(PolicyIdent source) {
+ public ToscaPolicyIdentifier(ToscaPolicyIdentifier source) {
this.name = source.name;
this.version = source.version;
}
*/
@Data
@NoArgsConstructor
-public class PolicyIdentOptVersion {
+public class ToscaPolicyIdentifierOptVersion {
@NonNull
private String name;
private String version;
- public PolicyIdentOptVersion(@NonNull String name, String version) {
+ public ToscaPolicyIdentifierOptVersion(@NonNull String name, String version) {
this.name = name;
this.version = version;
}
- public PolicyIdentOptVersion(PolicyIdentOptVersion source) {
+ public ToscaPolicyIdentifierOptVersion(ToscaPolicyIdentifierOptVersion source) {
this.name = source.name;
this.version = source.version;
}
*/
@Data
@NoArgsConstructor
-public class PolicyTypeIdent {
+public class ToscaPolicyTypeIdentifier {
@NonNull
private String name;
private String version;
- public PolicyTypeIdent(@NonNull String name, @NonNull String version) {
+ public ToscaPolicyTypeIdentifier(@NonNull String name, @NonNull String version) {
this.name = name;
this.version = version;
}
- public PolicyTypeIdent(PolicyTypeIdent source) {
+ public ToscaPolicyTypeIdentifier(ToscaPolicyTypeIdentifier source) {
this.name = source.name;
this.version = source.version;
}
import org.onap.policy.models.base.PfValidationResult.ValidationResult;
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.models.pdp.concepts.PdpSubGroup;
-import org.onap.policy.models.pdp.concepts.PolicyTypeIdent;
+import org.onap.policy.models.pdp.concepts.ToscaPolicyIdentifier;
+import org.onap.policy.models.pdp.concepts.ToscaPolicyTypeIdentifier;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
/**
pdpSubgroup.setSupportedPolicyTypes(new ArrayList<>());
for (PfConceptKey supportedPolicyTypeKey : supportedPolicyTypes) {
- PolicyTypeIdent supportedPolicyTypeIdent =
- new PolicyTypeIdent(supportedPolicyTypeKey.getName(), supportedPolicyTypeKey.getVersion());
+ ToscaPolicyTypeIdentifier supportedPolicyTypeIdent = new ToscaPolicyTypeIdentifier(
+ supportedPolicyTypeKey.getName(), supportedPolicyTypeKey.getVersion());
pdpSubgroup.getSupportedPolicyTypes().add(supportedPolicyTypeIdent);
}
pdpSubgroup.setPolicies(new ArrayList<>());
for (PfConceptKey policyKey : policies) {
- ToscaPolicy toscaPolicy = new ToscaPolicy();
- toscaPolicy.setName(policyKey.getName());
- toscaPolicy.setVersion(policyKey.getVersion());
- pdpSubgroup.getPolicies().add(toscaPolicy);
+ ToscaPolicyIdentifier toscaPolicyIdentifier = new ToscaPolicyIdentifier();
+ toscaPolicyIdentifier.setName(policyKey.getName());
+ toscaPolicyIdentifier.setVersion(policyKey.getVersion());
+ pdpSubgroup.getPolicies().add(toscaPolicyIdentifier);
}
pdpSubgroup.setCurrentInstanceCount(currentInstanceCount);
}
this.supportedPolicyTypes = new ArrayList<>();
- for (PolicyTypeIdent supportedPolicyType : pdpSubgroup.getSupportedPolicyTypes()) {
+ for (ToscaPolicyTypeIdentifier supportedPolicyType : pdpSubgroup.getSupportedPolicyTypes()) {
this.supportedPolicyTypes
.add(new PfConceptKey(supportedPolicyType.getName(), supportedPolicyType.getVersion()));
}
this.policies = new ArrayList<>();
- for (ToscaPolicy toscaPolicy : pdpSubgroup.getPolicies()) {
- this.policies.add(new PfConceptKey(toscaPolicy.getName(), toscaPolicy.getVersion()));
+ for (ToscaPolicyIdentifier toscaPolicyIdentifier : pdpSubgroup.getPolicies()) {
+ this.policies.add(new PfConceptKey(toscaPolicyIdentifier.getName(), toscaPolicyIdentifier.getVersion()));
}
this.currentInstanceCount = pdpSubgroup.getCurrentInstanceCount();
import java.util.Arrays;
import java.util.Map;
import java.util.TreeMap;
+
import org.junit.Test;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
/**
* Test the copy constructor, as {@link TestModels} tests the other methods.
public void testCopyConstructor() {
assertThatThrownBy(() -> new PdpSubGroup(null)).isInstanceOf(NullPointerException.class);
- PdpSubGroup orig = new PdpSubGroup();
+ final PdpSubGroup orig = new PdpSubGroup();
// verify with null values
assertEquals(
orig.setCurrentInstanceCount(10);
orig.setDesiredInstanceCount(11);
- Pdp inst1 = new Pdp();
+ final Pdp inst1 = new Pdp();
inst1.setInstanceId("my-id-A");
- Pdp inst2 = new Pdp();
+ final Pdp inst2 = new Pdp();
inst2.setInstanceId("my-id-B");
orig.setPdpInstances(Arrays.asList(inst1, inst2));
orig.setPdpType("my-type");
- ToscaPolicy pol1 = new ToscaPolicy();
- pol1.setDescription("policy-A");
- ToscaPolicy pol2 = new ToscaPolicy();
- pol2.setDescription("policy-B");
+ final ToscaPolicyIdentifier pol1 = new ToscaPolicyIdentifier();
+ pol1.setName("policy-A");
+ pol1.setVersion("1.0.0");
+ final ToscaPolicyIdentifier pol2 = new ToscaPolicyIdentifier();
+ pol2.setName("policy-B");
+ pol1.setVersion("2.0.0");
orig.setPolicies(Arrays.asList(pol1, pol2));
- Map<String, String> props = new TreeMap<>();
+ final Map<String, String> props = new TreeMap<>();
props.put("key-A", "value-A");
props.put("key-B", "value-B");
orig.setProperties(props);
- PolicyTypeIdent supp1 = new PolicyTypeIdent("supp-A", "1.2");
- PolicyTypeIdent supp2 = new PolicyTypeIdent("supp-B", "3.4");
+ final ToscaPolicyTypeIdentifier supp1 = new ToscaPolicyTypeIdentifier("supp-A", "1.2");
+ final ToscaPolicyTypeIdentifier supp2 = new ToscaPolicyTypeIdentifier("supp-B", "3.4");
orig.setSupportedPolicyTypes(Arrays.asList(supp1, supp2));
assertEquals(orig.toString(), new PdpSubGroup(orig).toString());
/**
* Test the other constructors, as {@link TestModels} tests the other methods.
*/
-public class TestPolicyTypeIdent extends IdentTestBase<PolicyTypeIdent> {
+public class TestToscaPolicyIdentifier extends ToscaIdentifierTestBase<ToscaPolicyIdentifier> {
private static final String NAME = "my-name";
private static final String VERSION = "1.2.3";
- public TestPolicyTypeIdent() {
- super(PolicyTypeIdent.class);
+ public TestToscaPolicyIdentifier() {
+ super(ToscaPolicyIdentifier.class);
}
@Test
public void testAllArgsConstructor() {
- assertThatThrownBy(() -> new PolicyTypeIdent(null, VERSION)).isInstanceOf(NullPointerException.class);
- assertThatThrownBy(() -> new PolicyTypeIdent(NAME, null)).isInstanceOf(NullPointerException.class);
+ assertThatThrownBy(() -> new ToscaPolicyIdentifier(null, VERSION)).isInstanceOf(NullPointerException.class);
+ assertThatThrownBy(() -> new ToscaPolicyIdentifier(NAME, null)).isInstanceOf(NullPointerException.class);
- PolicyTypeIdent orig = new PolicyTypeIdent(NAME, VERSION);
+ ToscaPolicyIdentifier orig = new ToscaPolicyIdentifier(NAME, VERSION);
assertEquals(NAME, orig.getName());
assertEquals(VERSION, orig.getVersion());
}
@Test
public void testCopyConstructor() {
- assertThatThrownBy(() -> new PolicyTypeIdent(null)).isInstanceOf(NullPointerException.class);
+ assertThatThrownBy(() -> new ToscaPolicyIdentifier(null)).isInstanceOf(NullPointerException.class);
- PolicyTypeIdent orig = new PolicyTypeIdent();
+ ToscaPolicyIdentifier orig = new ToscaPolicyIdentifier();
// verify with null values
- assertEquals(orig.toString(), new PolicyTypeIdent(orig).toString());
+ assertEquals(orig.toString(), new ToscaPolicyIdentifier(orig).toString());
// verify with all values
- orig = new PolicyTypeIdent(NAME, VERSION);
- assertEquals(orig.toString(), new PolicyTypeIdent(orig).toString());
+ orig = new ToscaPolicyIdentifier(NAME, VERSION);
+ assertEquals(orig.toString(), new ToscaPolicyIdentifier(orig).toString());
}
-
}
/**
* Test the other constructors, as {@link TestModels} tests the other methods.
*/
-public class TestPolicyIdentOptVersion extends IdentTestBase<PolicyIdentOptVersion> {
+public class TestToscaPolicyIdentifierOptVersion extends ToscaIdentifierTestBase<ToscaPolicyIdentifierOptVersion> {
private static final String NAME = "my-name";
private static final String VERSION = "1.2.3";
- public TestPolicyIdentOptVersion() {
- super(PolicyIdentOptVersion.class);
+ public TestToscaPolicyIdentifierOptVersion() {
+ super(ToscaPolicyIdentifierOptVersion.class);
}
@Test
public void testAllArgsConstructor_testIsNullVersion() {
- assertThatThrownBy(() -> new PolicyIdentOptVersion(null, VERSION)).isInstanceOf(NullPointerException.class);
+ assertThatThrownBy(() -> new ToscaPolicyIdentifierOptVersion(null, VERSION))
+ .isInstanceOf(NullPointerException.class);
// with null version
- PolicyIdentOptVersion orig = new PolicyIdentOptVersion(NAME, null);
+ ToscaPolicyIdentifierOptVersion orig = new ToscaPolicyIdentifierOptVersion(NAME, null);
assertEquals(NAME, orig.getName());
assertEquals(null, orig.getVersion());
assertTrue(orig.isNullVersion());
- orig = new PolicyIdentOptVersion(NAME, VERSION);
+ orig = new ToscaPolicyIdentifierOptVersion(NAME, VERSION);
assertEquals(NAME, orig.getName());
assertEquals(VERSION, orig.getVersion());
assertFalse(orig.isNullVersion());
@Test
public void testCopyConstructor() throws Exception {
- assertThatThrownBy(() -> new PolicyIdentOptVersion(null)).isInstanceOf(NullPointerException.class);
+ assertThatThrownBy(() -> new ToscaPolicyIdentifierOptVersion(null)).isInstanceOf(NullPointerException.class);
- PolicyIdentOptVersion orig = new PolicyIdentOptVersion();
+ ToscaPolicyIdentifierOptVersion orig = new ToscaPolicyIdentifierOptVersion();
// verify with null values
- assertEquals(orig.toString(), new PolicyIdentOptVersion(orig).toString());
+ assertEquals(orig.toString(), new ToscaPolicyIdentifierOptVersion(orig).toString());
// verify with all values
orig = makeIdent(NAME, VERSION);
- assertEquals(orig.toString(), new PolicyIdentOptVersion(orig).toString());
+ assertEquals(orig.toString(), new ToscaPolicyIdentifierOptVersion(orig).toString());
}
}
/**
* Test the other constructors, as {@link TestModels} tests the other methods.
*/
-public class TestPolicyIdent extends IdentTestBase<PolicyIdent> {
+public class TestToscaPolicyTypeIdentifier extends ToscaIdentifierTestBase<ToscaPolicyTypeIdentifier> {
private static final String NAME = "my-name";
private static final String VERSION = "1.2.3";
- public TestPolicyIdent() {
- super(PolicyIdent.class);
+ public TestToscaPolicyTypeIdentifier() {
+ super(ToscaPolicyTypeIdentifier.class);
}
@Test
public void testAllArgsConstructor() {
- assertThatThrownBy(() -> new PolicyIdent(null, VERSION)).isInstanceOf(NullPointerException.class);
- assertThatThrownBy(() -> new PolicyIdent(NAME, null)).isInstanceOf(NullPointerException.class);
+ assertThatThrownBy(() -> new ToscaPolicyTypeIdentifier(null, VERSION)).isInstanceOf(NullPointerException.class);
+ assertThatThrownBy(() -> new ToscaPolicyTypeIdentifier(NAME, null)).isInstanceOf(NullPointerException.class);
- PolicyIdent orig = new PolicyIdent(NAME, VERSION);
+ ToscaPolicyTypeIdentifier orig = new ToscaPolicyTypeIdentifier(NAME, VERSION);
assertEquals(NAME, orig.getName());
assertEquals(VERSION, orig.getVersion());
}
@Test
public void testCopyConstructor() {
- assertThatThrownBy(() -> new PolicyIdent(null)).isInstanceOf(NullPointerException.class);
+ assertThatThrownBy(() -> new ToscaPolicyTypeIdentifier(null)).isInstanceOf(NullPointerException.class);
- PolicyIdent orig = new PolicyIdent();
+ ToscaPolicyTypeIdentifier orig = new ToscaPolicyTypeIdentifier();
// verify with null values
- assertEquals(orig.toString(), new PolicyIdent(orig).toString());
+ assertEquals(orig.toString(), new ToscaPolicyTypeIdentifier(orig).toString());
// verify with all values
- orig = new PolicyIdent(NAME, VERSION);
- assertEquals(orig.toString(), new PolicyIdent(orig).toString());
+ orig = new ToscaPolicyTypeIdentifier(NAME, VERSION);
+ assertEquals(orig.toString(), new ToscaPolicyTypeIdentifier(orig).toString());
}
+
}
*
* @param <T> type of key being tested
*/
-public class IdentTestBase<T> {
+public class ToscaIdentifierTestBase<T> {
private static final Coder coder = new StandardCoder();
* Constructs the object.
* @param clazz the type of class being tested
*/
- public IdentTestBase(Class<T> clazz) {
+ public ToscaIdentifierTestBase(Class<T> clazz) {
this.clazz = clazz;
}
import org.onap.policy.models.pdp.concepts.PdpGroup;
import org.onap.policy.models.pdp.concepts.PdpGroups;
import org.onap.policy.models.pdp.concepts.PdpSubGroup;
-import org.onap.policy.models.pdp.concepts.PolicyTypeIdent;
+import org.onap.policy.models.pdp.concepts.ToscaPolicyTypeIdentifier;
import org.onap.policy.models.pdp.enums.PdpHealthStatus;
import org.onap.policy.models.pdp.enums.PdpState;
import org.onap.policy.models.pdp.persistence.provider.PdpProvider;
Code Review / policy / models.git / commitdiff