Rename controlloop to ACM

Issue-ID: POLICY-3941
Signed-off-by: Sirisha_Manchikanti <sirisha.manchikanti@est.tech>
Change-Id: I3a9d66b5f6be55e722bb15326d0af83a1b698a02

diff --git a/participant/participant-impl/participant-impl-kubernetes/pom.xml b/participant/participant-impl/participant-impl-kubernetes/pom.xml
index a8b9007..728d890 100644 (file)
--- a/participant/participant-impl/participant-impl-kubernetes/pom.xml
+++ b/participant/participant-impl/participant-impl-kubernetes/pom.xml
@@ -44,7 +44,7 @@
 
     <build>
         <resources>
-            <!-- Output the version of the control loop system -->
+            <!-- Output the version of the automation composition system -->
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>

diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java
index b4cca3a..1fb4152 100644 (file)
--- a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java
+++ b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandler.java
@@ -165,14 +165,14 @@ public class AutomationCompositionElementHandler implements AutomationCompositio
      *
      * @param chart ChartInfo
      */
-    public void checkPodStatus(ToscaConceptIdentifier controlLoopId, UUID elementId,
+    public void checkPodStatus(ToscaConceptIdentifier automationCompositionId, UUID elementId,
             ChartInfo chart, int timeout, int podStatusCheckInterval) throws ExecutionException, InterruptedException {
         // Invoke runnable thread to check pod status
         Future<String> result = executor.submit(new PodStatusValidator(chart, timeout,
                 podStatusCheckInterval), "Done");
         if (!result.get().isEmpty()) {
             LOGGER.info("Pod Status Validator Completed: {}", result.isDone());
-            intermediaryApi.updateAutomationCompositionElementState(controlLoopId, elementId,
+            intermediaryApi.updateAutomationCompositionElementState(automationCompositionId, elementId,
                 AutomationCompositionOrderedState.PASSIVE, AutomationCompositionState.PASSIVE,
                 ParticipantMessageType.AUTOMATION_COMPOSITION_STATE_CHANGE);
         }

diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandlerTest.java b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandlerTest.java
index 41d9b84..5b45cf1 100644 (file)
--- a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandlerTest.java
+++ b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/handler/AutomationCompositionElementHandlerTest.java
@@ -174,10 +174,10 @@ class AutomationCompositionElementHandlerTest {
         doReturn("Done").when(result).get();
         doReturn(true).when(result).isDone();
         var chartInfo = charts.get(0);
-        ToscaConceptIdentifier controlLoopId = new ToscaConceptIdentifier();
+        ToscaConceptIdentifier automationCompositionId = new ToscaConceptIdentifier();
         AutomationCompositionElement element = new AutomationCompositionElement();
         assertDoesNotThrow(
-            () -> automationCompositionElementHandler.checkPodStatus(controlLoopId, element.getId(), chartInfo,
-                1, 1));
+            () -> automationCompositionElementHandler.checkPodStatus(automationCompositionId,
+                    element.getId(), chartInfo, 1, 1));
     }
 }

diff --git a/participant/participant-impl/participant-impl-policy/src/main/resources/version.txt b/participant/participant-impl/participant-impl-policy/src/main/resources/version.txt
index dbd6758..5fcdcab 100644 (file)
--- a/participant/participant-impl/participant-impl-policy/src/main/resources/version.txt
+++ b/participant/participant-impl/participant-impl-policy/src/main/resources/version.txt
@@ -1,4 +1,4 @@
-ONAP Tosca defined control loop Participant
+ONAP Tosca defined automation composition Participant
 Version: ${project.version}
 Built (UTC): ${maven.build.timestamp}
 ONAP https://wiki.onap.org

diff --git a/participant/pom.xml b/participant/pom.xml
index e252b75..8c62f9b 100644 (file)
--- a/participant/pom.xml
+++ b/participant/pom.xml
@@ -32,7 +32,7 @@
     <groupId>org.onap.policy.clamp.participant</groupId>
     <artifactId>policy-clamp-participant</artifactId>
     <name>${project.artifactId}</name>
-    <description>participants that communicate with the runtime server to handle control loops</description>
+    <description>participants that communicate with the runtime server to handle automation compositions</description>
     <packaging>pom</packaging>
 
     <modules>
@@ -142,7 +142,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>org.onap.policy.clamp.controlloop.participant.simulator.main.startstop.Main</mainClass>
+                            <mainClass>org.onap.policy.clamp.acm.participant.simulator.main.startstop.Main</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>