Rename ControlLoop to AutomationCompsition

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

2 files changed, 32 insertions, 32 deletions

diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json
index 4c14f75b..5cdb99ec 100644
--- a/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json
+++ b/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json
@@ -20,10 +20,10 @@
                         "decoderClassName": "org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
                         "decoderConfigurationName": "toscaPolicyDecoderConfiguration"
                     },
-                    "ToscaControlLoopDecoder": {
-                        "decoderType": "ToscaControlLoopDecoder",
-                        "decoderClassName": "org.onap.policy.distribution.reception.decoding.policy.file.ControlLoopDecoderFileInCsar",
-                        "decoderConfigurationName": "toscaControlLoopDecoderConfiguration"
+                    "ToscaAutomationCompositionDecoder": {
+                        "decoderType": "ToscaAutomationCompositionDecoder",
+                        "decoderClassName": "org.onap.policy.distribution.reception.decoding.policy.file.AutomationCompositionDecoderFileInCsar",
+                        "decoderConfigurationName": "toscaAutomationCompositionDecoderConfiguration"
                     }
                 },
                 "policyForwarders": {
@@ -32,10 +32,10 @@
                         "forwarderClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiPolicyForwarder",
                         "forwarderConfigurationName": "lifecycleApiPolicyConfiguration"
                     },
-                    "LifeCycleApiControlLoopForwarder": {
-                        "forwarderType": "LifeCycleControlLoopAPI",
-                        "forwarderClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiControlLoopForwarder",
-                        "forwarderConfigurationName": "lifecycleApiControlLoopConfiguration"
+                    "LifeCycleApiAutomationCompositionForwarder": {
+                        "forwarderType": "LifeCycleAutomationCompositionAPI",
+                        "forwarderClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiAutomationCompositionForwarder",
+                        "forwarderConfigurationName": "lifecycleApiAutomationCompositionConfiguration"
                     }
                 }
             }
@@ -76,10 +76,10 @@
                 "policyTypeFileName": "tosca_policy_type"
             }
         },
-        "toscaControlLoopDecoderConfiguration": {
-            "parameterClassName": "org.onap.policy.distribution.reception.decoding.policy.file.ControlLoopDecoderFileInCsarParameterGroup",
+        "toscaAutomationCompositionDecoderConfiguration": {
+            "parameterClassName": "org.onap.policy.distribution.reception.decoding.policy.file.AutomationCompositionDecoderFileInCsarParameterGroup",
             "parameters": {
-                "controlLoopType": "controlloop"
+                "automationCompositionType": "acm"
             }
         }
     },
@@ -106,12 +106,12 @@
                 "deployPolicies": true
             }
         },
-        "lifecycleApiControlLoopConfiguration": {
-            "parameterClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiControlLoopForwarderParameters",
+        "lifecycleApiAutomationCompositionConfiguration": {
+            "parameterClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiAutomationCompositionForwarderParameters",
             "parameters": {
-                "controlLoopRuntimeParameters": {
-                    "clientName": "policy-clamp-cl-runtime",
-                    "hostname": "policy-clamp-cl-runtime",
+                "automationCompositionRuntimeParameters": {
+                    "clientName": "policy-clamp-runtime-acm",
+                    "hostname": "policy-clamp-runtime-acm",
                     "port": 6969,
                     "useHttps": true,
                     "userName": "policyadmin",
diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json
index cea48547..2a057c80 100644
--- a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json
+++ b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json
@@ -18,10 +18,10 @@
                         "decoderClassName": "org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
                         "decoderConfigurationName": "toscaPolicyDecoderConfiguration"
                     },
-                "ToscaControlLoopDecoder": {
-                        "decoderType": "ToscaControlLoopDecoder",
-                        "decoderClassName": "org.onap.policy.distribution.reception.decoding.policy.file.ControlLoopDecoderFileInCsar",
-                        "decoderConfigurationName": "toscaControlLoopDecoderConfiguration"
+                "ToscaAutomationCompositionDecoder": {
+                        "decoderType": "ToscaAutomationCompositionDecoder",
+                        "decoderClassName": "org.onap.policy.distribution.reception.decoding.policy.file.AutomationCompositionDecoderFileInCsar",
+                        "decoderConfigurationName": "toscaAutomationCompositionDecoderConfiguration"
                     }
                 },
                 "policyForwarders": {
@@ -30,10 +30,10 @@
                         "forwarderClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiPolicyForwarder",
                         "forwarderConfigurationName": "lifecycleApiPolicyConfiguration"
                     },
-                    "LifeCycleApiControlLoopForwarder": {
-                        "forwarderType": "LifeCycleControlLoopAPI",
-                        "forwarderClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiControlLoopForwarder",
-                        "forwarderConfigurationName": "lifecycleApiControlLoopConfiguration"
+                    "LifeCycleApiAutomationCompositionForwarder": {
+                        "forwarderType": "LifeCycleAutomationCompositionAPI",
+                        "forwarderClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiAutomationCompositionForwarder",
+                        "forwarderConfigurationName": "lifecycleApiAutomationCompositionConfiguration"
                     }
                 }
             }
@@ -55,10 +55,10 @@
                 "policyTypeFileName": "tosca_policy_type"
             }
         },
-        "toscaControlLoopDecoderConfiguration": {
-            "parameterClassName": "org.onap.policy.distribution.reception.decoding.policy.file.ControlLoopDecoderFileInCsarParameterGroup",
+        "toscaAutomationCompositionDecoderConfiguration": {
+            "parameterClassName": "org.onap.policy.distribution.reception.decoding.policy.file.AutomationCompositionDecoderFileInCsarParameterGroup",
             "parameters": {
-                "controlLoopType": "controlloop"
+                "automationCompositionType": "acm"
             }
         }
     },
@@ -85,12 +85,12 @@
                 "deployPolicies": true
             }
         },
-        "lifecycleApiControlLoopConfiguration": {
-            "parameterClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiControlLoopForwarderParameters",
+        "lifecycleApiAutomationCompositionConfiguration": {
+            "parameterClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiAutomationCompositionForwarderParameters",
             "parameters": {
-                "controlLoopRuntimeParameters": {
-                    "clientName": "policy-clamp-cl-runtime",
-                    "hostname": "policy-clamp-cl-runtime",
+                "automationCompositionRuntimeParameters": {
+                    "clientName": "policy-clamp-runtime-acm",
+                    "hostname": "policy-clamp-runtime-acm",
                     "port": 6969,
                     "useHttps": true,
                     "userName": "policyadmin",