Rename TOSCA Control Loop to ACM

This commit renames the TOSCA Control Loop functionality in CLAMP to
Automation Composition Management.

This review is a direct renaming review and, as everything is renamed
together it is large.

Issue-ID: POLICY-3939
Change-Id: I28f0a6dd889bf3570a4c1365ae9e71fc58db6d6c
Signed-off-by: liamfallon <liam.fallon@est.tech>

7 files changed, 41 insertions, 163 deletions

diff --git a/common/src/main/resources/tosca/ApplicationServiceDescriptorTypes.yaml b/common/src/main/resources/tosca/ApplicationServiceDescriptorTypes.yaml
deleted file mode 100644
index ad16173b9..000000000
--- a/common/src/main/resources/tosca/ApplicationServiceDescriptorTypes.yaml
+++ /dev/null
@@ -1,74 +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=========================================================
-tosca_definitions_version: tosca_simple_yaml_1_3
-node_types:
-  org.oran.asd.DeploymentItem:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.KubernetesControlLoopElement
-    properties:
-      deployemntItemId:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        description: The identifier of this deployment item
-      artifactId:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        description: Reference to a DeploymentArtifact
-      lifecycleParameters:
-        type: string
-        required: false
-        description: List of parameters that can be overridden at deployment time
-                     (e.g. values for values.yaml in the chart this item references)
-  org.oran.asd.ASD:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoop
-    properties:
-      asdId:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        description: The identifier of this deployment item
-      asdSchemaVersion:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        description: Reference to a DeploymentArtifact
-      asdApplication:
-        type: onap.datatypes.ToscaConceptIdentifier
-        required: true
-        description: Reference to a DeploymentArtifact
-      asdApplicationInfoName:
-        type: string
-        required: false
-        description: Human readable name for the Application service. Can change during the AS lifetime. 
-      asdExtCpd:
-        type: string
-        required: false
-        description: Describes external interface(s) exposed by this AS enabling connection with a VL.
-                     (Similar to VnfExtCpd on VNF-D, but only describing L3 and above interfaces, since
-                     K8S can’t do <L3)
-      enhancedClusterCapabilities:
-        type: string
-        required: false
-        description: Describes expected capabilities of the target Kubernetes cluster to aid placement of the
-                     application service on a suitable cluster. Examples of capabilities are; required networking
-                     characteristics, Kubernetes API extensions or quantifiable node specific resources. This attribute
-                     can contain information complementing information provided in the referenced DeploymentArtifacts.
-                     Note; Modeling of enhancedClusterCapabilities is subject to standardization but is ffs. Alignment
-                     between O2-IMS and O2-DMS of these values is required.
-
-
-
diff --git a/common/src/main/resources/tosca/ControlLoopTOSCAServiceTemplateTypes.yaml b/common/src/main/resources/tosca/AutomationCompositionTOSCAServiceTemplateTypes.yaml
index a17cb7624..12f8cf7da 100644
--- a/common/src/main/resources/tosca/ControlLoopTOSCAServiceTemplateTypes.yaml
+++ b/common/src/main/resources/tosca/AutomationCompositionTOSCAServiceTemplateTypes.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (C) 2021-2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ data_types:
         type: string
         required: true
 node_types:
-  org.onap.policy.clamp.controlloop.ControlLoopElement:
+  org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
@@ -36,13 +36,13 @@ node_types:
         required: false
         metadata:
             common: true
-        description: Specifies the organization that provides the control loop element
+        description: Specifies the organization that provides the automation composition element
       participantType:
         type: onap.datatypes.ToscaConceptIdentifier
         required: true
         metadata:
             common: true
-        description: The identity of the participant type that hosts this type of Control Loop Element
+        description: The identity of the participant type that hosts this type of automation composition Element
       startPhase:
         type: integer
         required: false
@@ -50,10 +50,10 @@ node_types:
         - greater_or_equal: 0
         metadata:
             common: true
-        description: A value indicating the start phase in which this control loop element will be started, the
-                     first start phase is zero. Control Loop Elements are started in their start_phase order and stopped
-                     in reverse start phase order. Control Loop Elements with the same start phase are started and
-                     stopped simultaneously
+        description: A value indicating the start phase in which this automation composition element will be started,
+                     the first start phase is zero. automation composition Elements are started in their start_phase
+                     order and stopped in reverse start phase order. automation composition Elements with the same start
+                     phase are started and stopped simultaneously
       uninitializedToPassiveTimeout:
         type: integer
         required: false
@@ -98,8 +98,8 @@ node_types:
         default: 0
         metadata:
             common: true
-        description: The number of milliseconds that the start of this control loop element should be delayed
-  org.onap.policy.clamp.controlloop.ControlLoop:
+        description: The number of milliseconds that the start of this automation composition element should be delayed
+  org.onap.policy.clamp.acm.AutomationComposition:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
@@ -108,7 +108,7 @@ node_types:
         required: false
         metadata:
             common: true
-        description: Specifies the organization that provides the control loop element
+        description: Specifies the organization that provides the automation composition element
       elements:
         type: list
         required: true
@@ -116,5 +116,5 @@ node_types:
             common: true
         entry_schema:
           type: onap.datatypes.ToscaConceptIdentifier
-        description: Specifies a list of control loop element definitions that make up this control loop definition
+        description: Specifies a list of automation composition element definitions that make up this automation composition definition
 
diff --git a/common/src/main/resources/tosca/CdsControlLoopElementType.yaml b/common/src/main/resources/tosca/CdsAutomationCompositionElementType.yaml
index c2fc66a6a..de195ac84 100644
--- a/common/src/main/resources/tosca/CdsControlLoopElementType.yaml
+++ b/common/src/main/resources/tosca/CdsAutomationCompositionElementType.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (C) 2021-2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
 # ============LICENSE_END=========================================================
 tosca_definitions_version: tosca_simple_yaml_1_3
 node_types:
-  org.onap.policy.clamp.controlloop.CDSControlLoopElement:
+  org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cdsBlueprint:
         type: string
         required: true
-        description: The CDS blueprint that this control loop element is managing.
+        description: The CDS blueprint that this automation composition element is managing.
diff --git a/common/src/main/resources/tosca/DcaeControlLoopElementType.yaml b/common/src/main/resources/tosca/DcaeControlLoopElementType.yaml
deleted file mode 100644
index acf91bb92..000000000
--- a/common/src/main/resources/tosca/DcaeControlLoopElementType.yaml
+++ /dev/null
@@ -1,51 +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=========================================================
-tosca_definitions_version: tosca_simple_yaml_1_3
-
-data_types:
-  org.onap.datatypes.policy.clamp.controlloop.DCAEControlLoopElementConsulInfo:
-    version: 1.0.0
-    derived_from: tosca.datatypes.Root
-    properties:
-      consulUrl:
-        name: consulUrl
-        type: string
-        typeVersion: 0.0.0
-        required: true
-        description: Consul url for this entry
-      consulBody:
-        name: consulBody
-        type: string
-        typeVersion: 0.0.0
-        required: true
-        description: Body of Consul entry
-node_types:
-  org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement:
-    version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
-    properties:
-      dcaeBlueprint:
-        type: string
-        required: true
-        description: The DCAE blueprint for the DCAE microservice this control loop element is managing.
-      consulInfo:
-        type: list
-        required: false
-        entry_schema:
-          type: org.onap.datatypes.policy.clamp.controlloop.DCAEControlLoopElementConsulInfo
-        description: The information to be sent to Consul for the microservice this control loop element is managing.
diff --git a/common/src/main/resources/tosca/HttpControlLoopElementType.yaml b/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml
index fd37040c6..f1ea39d61 100644
--- a/common/src/main/resources/tosca/HttpControlLoopElementType.yaml
+++ b/common/src/main/resources/tosca/HttpAutomationCompositionElementType.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (C) 2021-2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 # ============LICENSE_END=========================================================
 tosca_definitions_version: tosca_simple_yaml_1_3
 data_types:
-  org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest:
+  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
     version: 1.0.0
     derived_from: tosca.datatypes.Root
     properties:
@@ -46,7 +46,7 @@ data_types:
         constraints:
           - in_range: [100, 599]
         description: THe expected HTTP status code for the REST request
-  org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity:
+  org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
     version: 1.0.0
     derived_from: tosca.datatypes.Root
     properties:
@@ -54,17 +54,18 @@ data_types:
         type:  onap.datatypes.ToscaConceptIdentifier
         typeVersion: 1.0.0
         required: true
-        description: The name and version of a Configuration Entity to be handled by the HTTP Control Loop Element
+        description: The name and version of a Configuration Entity to be handled by the HTTP Automation Composition
+                     Element
       restSequence:
         type: list
         entry_schema:
-          type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.RestRequest
+          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
           typeVersion: 1.0.0
         description: A sequence of REST commands to send to the REST endpoint
 node_types:
-  org.onap.policy.clamp.controlloop.HttpControlLoopElement:
+  org.onap.policy.clamp.acm.HttpAutomationCompositionElement:
     version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       baseUrl:
         type: string
@@ -80,6 +81,7 @@ node_types:
         type: map
         required: true
         entry_schema:
-          type: org.onap.datatypes.policy.clamp.controlloop.httpControlLoopElement.ConfigurationEntity
+          type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity
           typeVersion: 1.0.0
-        description: The connfiguration entities the Control Loop Element is managing and their associated REST requests
+        description: The connfiguration entities the Automation Composition Element is managing and their associated
+                     REST requests
diff --git a/common/src/main/resources/tosca/KubernetesControlLoopElementType.yaml b/common/src/main/resources/tosca/KubernetesAutomationCompositionElementType.yaml
index 86a8ce197..2b60b679e 100644
--- a/common/src/main/resources/tosca/KubernetesControlLoopElementType.yaml
+++ b/common/src/main/resources/tosca/KubernetesAutomationCompositionElementType.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (C) 2021-2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 # ============LICENSE_END=========================================================
 tosca_definitions_version: tosca_simple_yaml_1_3
 data_types:
-  org.onap.datatypes.policy.clamp.controlloop.kubernetesControlLoopElement.Chart:
+  org.onap.datatypes.policy.clamp.acm.kubernetesAutomationCompositionElement.Chart:
     version: 1.0.0
     derived_from: tosca.datatypes.Root
     properties:
@@ -45,12 +45,12 @@ data_types:
           type: string
         description: A map of override settings for parameters in the chart
 node_types:
-  org.onap.policy.clamp.controlloop.KubernetesControlLoopElement:
+  org.onap.policy.clamp.acm.KubernetesAutomationCompositionElement:
     version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       chart:
-        type: org.onap.datatypes.policy.clamp.controlloop.kubernetesControlLoopElement.Chart
+        type: org.onap.datatypes.policy.clamp.acm.kubernetesAutomationCompositionElement.Chart
         typeVersion: 1.0.0
         required: true
         description: The helm chart for the microservice
diff --git a/common/src/main/resources/tosca/PolicyControlLoopElementType.yaml b/common/src/main/resources/tosca/PolicyAutomationCompositionElementType.yaml
index b4631ba14..3968b3471 100644
--- a/common/src/main/resources/tosca/PolicyControlLoopElementType.yaml
+++ b/common/src/main/resources/tosca/PolicyAutomationCompositionElementType.yaml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation.
+# Copyright (C) 2021-2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +17,20 @@
 # ============LICENSE_END=========================================================
 tosca_definitions_version: tosca_simple_yaml_1_3
 node_types:
-  org.onap.policy.clamp.controlloop.PolicyControlLoopElement:
+  org.onap.policy.clamp.acm.PolicyAutomationCompositionElement:
     version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       policyType:
         type: onap.datatypes.ToscaConceptIdentifier
         required: true
-        description: The policy type of the policy that this control loop element is managing
+        description: The policy type of the policy that this automation composition element is managing
       policyId:
         type: onap.datatypes.ToscaConceptIdentifier
         required: false
-        description: The policy that this control loop element is managing, if the policy ID is specified, the policy
-                     is either already in the Policy Framework database or is specified in the "policies" part of the
-                     TOSCA service template of the Control Loop definition
+        description: The policy that this automation composition element is managing, if the policy ID is specified, the
+                     policy is either already in the Policy Framework database or is specified in the "policies" part of
+                     the TOSCA service template of the Automation Composition definition
       pdpGroup:
         type: string
         required: false
@@ -40,4 +40,5 @@ node_types:
       pdpType:
         type: string
         required: true
-        description: The PDP type to which the policy will run on. This parameter is used when the policy is deployed to PAP.
\ No newline at end of file
+        description: The PDP type to which the policy will run on. This parameter is used when the policy is deployed to
+                     PAP.
\ No newline at end of file