From bd387eb46fd45b42a410ef3dd198767861a73de8 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Wed, 15 Feb 2023 17:26:30 +0000 Subject: Remove AutomationCompositionState from ACM Issue-ID: POLICY-4559 Change-Id: Ib088c76fd39fcaf8fc7b5f315880e2619186caec Signed-off-by: FrancescoFioraEst --- .../models/acm/concepts/AutomationComposition.java | 24 -------- .../acm/concepts/AutomationCompositionElement.java | 12 ---- .../acm/concepts/AutomationCompositionInfo.java | 3 - .../AutomationCompositionOrderedState.java | 47 --------------- .../acm/concepts/AutomationCompositionState.java | 67 ---------------------- .../models/acm/concepts/ParticipantDeploy.java | 5 -- .../AutomationCompositionStateChange.java | 7 --- 7 files changed, 165 deletions(-) delete mode 100644 models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionOrderedState.java delete mode 100644 models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionState.java (limited to 'models/src/main') diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationComposition.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationComposition.java index 363668619..dc8a39b34 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationComposition.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationComposition.java @@ -26,7 +26,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.NonNull; -import org.apache.commons.collections4.MapUtils; import org.onap.policy.models.base.PfUtils; import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity; @@ -43,12 +42,6 @@ public class AutomationComposition extends ToscaEntity implements Comparable element.setOrderedState(orderedState)); - } } diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java index ab234f604..018031624 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java @@ -31,7 +31,6 @@ import lombok.ToString; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfUtils; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; -import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; /** * Class to represent a automation composition instance. @@ -49,20 +48,12 @@ public class AutomationCompositionElement { @NonNull private UUID participantId = UUID.randomUUID(); - @NonNull - private AutomationCompositionState state = AutomationCompositionState.UNINITIALISED; - @NonNull private DeployState deployState = DeployState.UNDEPLOYED; @NonNull private LockState lockState = LockState.LOCKED; - @NonNull - private AutomationCompositionOrderedState orderedState = AutomationCompositionOrderedState.UNINITIALISED; - - private ToscaServiceTemplate toscaServiceTemplateFragment; - private String description; // A map indexed by the property name. Each map entry is the serialized value of the property, @@ -78,9 +69,6 @@ public class AutomationCompositionElement { this.id = otherElement.id; this.definition = new ToscaConceptIdentifier(otherElement.definition); this.participantId = otherElement.participantId; - this.state = otherElement.state; - this.orderedState = otherElement.orderedState; - this.toscaServiceTemplateFragment = otherElement.toscaServiceTemplateFragment; this.description = otherElement.description; this.properties = PfUtils.mapMap(otherElement.properties, UnaryOperator.identity()); this.deployState = otherElement.deployState; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionInfo.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionInfo.java index 954665bfb..17875c429 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionInfo.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionInfo.java @@ -35,8 +35,6 @@ public class AutomationCompositionInfo { private UUID automationCompositionId; - private AutomationCompositionState state = AutomationCompositionState.UNINITIALISED; - private DeployState deployState = DeployState.UNDEPLOYED; private LockState lockState = LockState.LOCKED; @@ -48,7 +46,6 @@ public class AutomationCompositionInfo { */ public AutomationCompositionInfo(final AutomationCompositionInfo otherElement) { this.automationCompositionId = otherElement.automationCompositionId; - this.state = otherElement.state; this.deployState = otherElement.deployState; this.lockState = otherElement.lockState; } diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionOrderedState.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionOrderedState.java deleted file mode 100644 index 3be5ffa2f..000000000 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionOrderedState.java +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2021 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.clamp.models.acm.concepts; - -public enum AutomationCompositionOrderedState { - /** - * The automation composition or automation composition element should become uninitialised on participants, it - * should not exist on participants. - */ - UNINITIALISED, - /** - * The automation composition or automation composition element should initialised on the participants and be - * passive, that is, it is not handling automation composition messages yet. - */ - PASSIVE, - /** - * The automation composition or automation composition element should running and is executing automation - * compositions. - */ - RUNNING; - - public boolean equalsAutomationCompositionState(final AutomationCompositionState automationCompositionState) { - return this.name().equals(automationCompositionState.name()); - } - - public AutomationCompositionState asState() { - return AutomationCompositionState.valueOf(this.name()); - } -} diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionState.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionState.java deleted file mode 100644 index aa6fcfd1d..000000000 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionState.java +++ /dev/null @@ -1,67 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2021 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.clamp.models.acm.concepts; - -public enum AutomationCompositionState { - /** - * The automation composition or automation composition element is not initialised on participants, it does not - * exist on participants. - */ - UNINITIALISED, - /** - * The automation composition or automation composition element is changing from unitialised to passive, it is being - * initialised onto participants. - */ - UNINITIALISED2PASSIVE, - /** - * The automation composition or automation composition element is initialised on the participants but is passive, - * that is, it is not handling automation composition messages yet. - */ - PASSIVE, - /** - * The automation composition or automation composition element is changing from passive to running, the - * participants are preparing to execute automation compositions. - */ - PASSIVE2RUNNING, - /** - * The automation composition or automation composition element is running and is executing automation compositions. - */ - RUNNING, - /** - * The automation composition or automation composition element is completing execution of current automation - * compositions but will not start running any more automation compositions and will become passive. - */ - RUNNING2PASSIVE, - /** - * The automation composition or automation composition element is changing from passive to unitialised, the - * automation composition is being removed from participants. - */ - PASSIVE2UNINITIALISED; - - public boolean equalsAutomationCompositionOrderedState( - final AutomationCompositionOrderedState automationCompositionOrderedState) { - return this.name().equals(automationCompositionOrderedState.name()); - } - - public AutomationCompositionOrderedState asOrderedState() { - return AutomationCompositionOrderedState.valueOf(this.name()); - } -} diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantDeploy.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantDeploy.java index 337a09d17..7d3b4ca98 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantDeploy.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantDeploy.java @@ -40,9 +40,6 @@ public class ParticipantDeploy { private UUID participantId; - // List of AutomationCompositionElement values for a particular participant - private List automationCompositionElementList = new ArrayList<>(); - // List of Automation Composition Element Deploy for a particular participant private List acElementList = new ArrayList<>(); @@ -53,8 +50,6 @@ public class ParticipantDeploy { */ public ParticipantDeploy(final ParticipantDeploy copyConstructor) { this.participantId = copyConstructor.participantId; - this.automationCompositionElementList = PfUtils.mapList( - copyConstructor.automationCompositionElementList, AutomationCompositionElement::new); this.acElementList = PfUtils.mapList(copyConstructor.acElementList, AcElementDeploy::new); } } diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChange.java b/models/src/main/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChange.java index 64102e607..2b4c9f996 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChange.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/AutomationCompositionStateChange.java @@ -23,8 +23,6 @@ package org.onap.policy.clamp.models.acm.messages.dmaap.participant; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionOrderedState; -import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionState; import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder; import org.onap.policy.clamp.models.acm.messages.rest.instantiation.LockOrder; @@ -36,8 +34,6 @@ import org.onap.policy.clamp.models.acm.messages.rest.instantiation.LockOrder; @Setter @ToString(callSuper = true) public class AutomationCompositionStateChange extends ParticipantMessage { - private AutomationCompositionOrderedState orderedState; - private AutomationCompositionState currentState; private DeployOrder deployOrderedState = DeployOrder.NONE; private LockOrder lockOrderedState = LockOrder.NONE; private Integer startPhase; @@ -58,9 +54,6 @@ public class AutomationCompositionStateChange extends ParticipantMessage { */ public AutomationCompositionStateChange(AutomationCompositionStateChange source) { super(source); - - this.orderedState = source.orderedState; - this.currentState = source.currentState; this.deployOrderedState = source.deployOrderedState; this.lockOrderedState = source.lockOrderedState; this.startPhase = source.startPhase; -- cgit 1.2.3-korg