From 6806f583453720ae222c88445d81cbaa8d62934c Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 3 Apr 2019 13:15:49 -0400 Subject: Clean up models-pap based on updates to models-pdp Change-Id: I5e55dd669200e4fc28f58379bbaa61e5d3331610 Issue-ID: POLICY-1542 Signed-off-by: Jim Hahn --- .../models/pap/concepts/PdpDeployPolicies.java | 4 +- .../onap/policy/models/pap/concepts/PdpGroup.java | 47 --------------------- .../onap/policy/models/pap/concepts/PdpGroups.java | 37 ----------------- .../models/pap/concepts/PdpInstanceDetails.java | 44 -------------------- .../policy/models/pap/concepts/PdpPolicies.java | 40 ------------------ .../policy/models/pap/concepts/PdpSubGroup.java | 48 ---------------------- .../onap/policy/models/pap/concepts/Policy.java | 43 ------------------- .../policy/models/pap/concepts/PolicyIdent.java | 38 ----------------- .../models/pap/concepts/PolicyIdentOptVersion.java | 39 ------------------ .../models/pap/concepts/PolicyTypeIdent.java | 38 ----------------- 10 files changed, 2 insertions(+), 376 deletions(-) delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroups.java delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpPolicies.java delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/Policy.java delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyIdent.java delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyIdentOptVersion.java delete mode 100644 models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyTypeIdent.java diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpDeployPolicies.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpDeployPolicies.java index a292c1320..0484cc307 100644 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpDeployPolicies.java +++ b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpDeployPolicies.java @@ -21,10 +21,10 @@ package org.onap.policy.models.pap.concepts; import java.util.List; - import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.onap.policy.models.pdp.concepts.ToscaPolicyIdentifierOptVersion; /** * Request deploy or update a set of policies using the simple PDP Group deployment @@ -35,5 +35,5 @@ import lombok.ToString; @Setter @ToString public class PdpDeployPolicies { - private List policies; + private List policies; } 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 deleted file mode 100644 index 29c4713db..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019 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. - * 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.models.pdp.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 pdpGroupState; - private String description; - private Map properties; - private List pdpSubgroups; -} diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroups.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroups.java deleted file mode 100644 index 4c732bbf9..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroups.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP Policy Models - * ================================================================================ - * Copyright (C) 2019 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. - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.pap.concepts; - -import java.util.List; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -/** - * Request deploy or update a set of groups via the PDP Group deployment - * REST API. - */ -@Getter -@Setter -@ToString -public class PdpGroups { - private List groups; -} 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 deleted file mode 100644 index d5846160c..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019 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. - * 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.models.pdp.enums.PdpHealthStatus; -import org.onap.policy.models.pdp.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 pdpState; - private PdpHealthStatus healthy; - private String message; -} diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpPolicies.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpPolicies.java deleted file mode 100644 index 3111becca..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpPolicies.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP Policy Models - * ================================================================================ - * Copyright (C) 2019 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. - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.pap.concepts; - -import java.util.List; - -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -// TODO delete this once PAP has been modified to use PdpDeployPolicies -/** - * Request deploy or update a set of policies using the simple PDP Group deployment - * REST API. Only the "name" and "policyVersion" fields of a Policy are used, and only the - * "name" field is actually required. - */ -@Getter -@Setter -@ToString -public class PdpPolicies { - private List policies; -} 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 deleted file mode 100644 index 9989d2516..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpSubGroup.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019 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. - * 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; - -/** - * 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/main/java/org/onap/policy/models/pap/concepts/Policy.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/Policy.java deleted file mode 100644 index 541eb2435..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/Policy.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019 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. - * 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; - -/** - * Class to represent a policy running in a PDP. - * - * @author Ram Krishna Verma (ram.krishna.verma@est.tech) - */ -@Getter -@Setter -@ToString -public class Policy { - - private String name; - private String policyVersion; - private String policyType; - private String policyTypeVersion; - private String policyTypeImpl; -} diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyIdent.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyIdent.java deleted file mode 100644 index 914840f15..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyIdent.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP Policy Models - * ================================================================================ - * Copyright (C) 2019 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. - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.pap.concepts; - -import lombok.Getter; -import lombok.NonNull; -import lombok.Setter; -import lombok.ToString; - -/** - * Identifies a policy. Both the name and version must be non-null. - */ -@Getter -@Setter -@ToString -@NonNull -public class PolicyIdent { - private String name; - private String version; -} diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyIdentOptVersion.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyIdentOptVersion.java deleted file mode 100644 index ecac2a27e..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyIdentOptVersion.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP Policy Models - * ================================================================================ - * Copyright (C) 2019 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. - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.pap.concepts; - -import lombok.Getter; -import lombok.NonNull; -import lombok.Setter; -import lombok.ToString; - -/** - * Policy identifier with an optional version; only the "name" is required. - */ -@Getter -@Setter -@ToString -public class PolicyIdentOptVersion { - @NonNull - private String name; - - private String version; -} diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyTypeIdent.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyTypeIdent.java deleted file mode 100644 index 3d466b7f5..000000000 --- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PolicyTypeIdent.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP Policy Models - * ================================================================================ - * Copyright (C) 2019 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. - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.models.pap.concepts; - -import lombok.Getter; -import lombok.NonNull; -import lombok.Setter; -import lombok.ToString; - -/** - * Identifies a policy type. Both the name and version must be non-null. - */ -@Getter -@Setter -@ToString -@NonNull -public class PolicyTypeIdent { - private String name; - private String version; -} -- cgit 1.2.3-korg