From 59483882f3f06f38e5b862687cf7ad2d37bd97a5 Mon Sep 17 00:00:00 2001 From: ramverma Date: Tue, 12 Mar 2019 22:15:38 +0000 Subject: Adding models-pap module to policy/models 1) Adding models-pap module to policy/models for storing models required by PAP REST API's. 2) Adding test cases. Change-Id: I4e8c38f1ebe96e7a50a188f19f4f4a5bed835f99 Issue-ID: POLICY-1541 Signed-off-by: ramverma --- models-pap/pom.xml | 41 ++++++++++++++++++ .../onap/policy/models/pap/concepts/PdpGroup.java | 49 +++++++++++++++++++++ .../models/pap/concepts/PdpInstanceDetails.java | 44 +++++++++++++++++++ .../policy/models/pap/concepts/PdpSubGroup.java | 50 ++++++++++++++++++++++ .../policy/models/pap/concepts/TestModels.java | 45 +++++++++++++++++++ pom.xml | 1 + 6 files changed, 230 insertions(+) create mode 100644 models-pap/pom.xml create mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java create mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java create mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java create mode 100644 models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java diff --git a/models-pap/pom.xml b/models-pap/pom.xml new file mode 100644 index 000000000..1cc5603cb --- /dev/null +++ b/models-pap/pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + + org.onap.policy.models + policy-models + 2.0.0-SNAPSHOT + + + models-pap + + ${project.artifactId} + The models for Policy Administration (PAP) REST API's. + + + org.onap.policy.common + pdp-common + ${policy.common.version} + + + \ No newline at end of file diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java new file mode 100644 index 000000000..6da5a10d1 --- /dev/null +++ b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java @@ -0,0 +1,49 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.models.pap.concepts; + +import java.util.List; +import java.util.Map; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import org.onap.policy.pdp.common.enums.PdpState; + +/** + * Class to represent a PDPGroup, which groups multiple PDPSubGroup entities together for a particular domain. + * + * @author Ram Krishna Verma (ram.krishna.verma@est.tech) + */ +@Getter +@Setter +@ToString +public class PdpGroup { + + private String name; + private String version; + private PdpState state; + private String description; + private Map properties; + private List pdpSubgroups; + +} diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java new file mode 100644 index 000000000..44645fcc0 --- /dev/null +++ b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java @@ -0,0 +1,44 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.models.pap.concepts; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import org.onap.policy.pdp.common.enums.PdpHealthStatus; +import org.onap.policy.pdp.common.enums.PdpState; + +/** + * Class to represent details of a running instance of PDP. + * + * @author Ram Krishna Verma (ram.krishna.verma@est.tech) + */ +@Getter +@Setter +@ToString +public class PdpInstanceDetails { + + private String instanceId; + private PdpState state; + private PdpHealthStatus healthy; + private String message; +} diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java new file mode 100644 index 000000000..248c82979 --- /dev/null +++ b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java @@ -0,0 +1,50 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.models.pap.concepts; + +import java.util.List; +import java.util.Map; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import org.onap.policy.pdp.common.models.Policy; + +/** + * 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) + */ +@Getter +@Setter +@ToString +public class PdpSubGroup { + + private String pdpType; + private List supportedPolicyTypes; + private List policies; + private int currentInstanceCount; + private int desiredInstanceCount; + private Map properties; + private List pdpInstances; + +} diff --git a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java new file mode 100644 index 000000000..c87aead9c --- /dev/null +++ b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java @@ -0,0 +1,45 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.models.pap.concepts; + +import com.openpojo.reflection.filters.FilterPackageInfo; +import com.openpojo.validation.Validator; +import com.openpojo.validation.ValidatorBuilder; +import com.openpojo.validation.test.impl.GetterTester; +import com.openpojo.validation.test.impl.SetterTester; + +import org.junit.Test; +import org.onap.policy.common.utils.validation.ToStringTester; + +/** + * Class to perform unit testing of models. + * + * @author Ram Krishna Verma (ram.krishna.verma@est.tech) + */ +public class TestModels { + + @Test + public void testPapModels() { + final Validator validator = ValidatorBuilder.create().with(new ToStringTester()).with(new SetterTester()) + .with(new GetterTester()).build(); + validator.validate(TestModels.class.getPackage().getName(), new FilterPackageInfo()); + } +} diff --git a/pom.xml b/pom.xml index 0ee588c3a..6277849cf 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ models-base models-dao models-tosca + models-pap -- cgit 1.2.3-korg