From 7ec767641505f52cd8ecf8b9a76fa35afe32635e Mon Sep 17 00:00:00 2001 From: Sirisha_Manchikanti Date: Mon, 28 Feb 2022 17:10:36 +0000 Subject: Rename ControlLoop to AutomationCompsition Issue-ID: POLICY-3938 Signed-off-by: Sirisha_Manchikanti Change-Id: I63188fa9bc5d634d3aeb7e2d7051c4d67b5a202c --- .../setup/config/jsonConfigs/apiConfigFile.json | 18 ++++++------ .../setup/config/jsonConfigs/pdpSimConfig.json | 2 +- .../setup/distribution/etc/defaultConfig.json | 32 +++++++++++----------- .../src/main/resources/testplans/stability.jmx | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'testsuites/stability/src') diff --git a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/apiConfigFile.json b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/apiConfigFile.json index e6f076ab..63e0c4c6 100644 --- a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/apiConfigFile.json +++ b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/apiConfigFile.json @@ -36,20 +36,20 @@ "policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml", "policytypes/onap.policies.optimization.resource.Vim_fit.yaml", "policytypes/onap.policies.optimization.resource.VnfPolicy.yaml", - "policytypes/onap.policies.controlloop.guard.Common.yaml", - "policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml", - "policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml", - "policytypes/onap.policies.controlloop.guard.common.MinMax.yaml", - "policytypes/onap.policies.controlloop.guard.common.Filter.yaml", - "policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml", + "policytypes/onap.policies.acm.guard.Common.yaml", + "policytypes/onap.policies.acm.guard.common.Blacklist.yaml", + "policytypes/onap.policies.acm.guard.common.FrequencyLimiter.yaml", + "policytypes/onap.policies.acm.guard.common.MinMax.yaml", + "policytypes/onap.policies.acm.guard.common.Filter.yaml", + "policytypes/onap.policies.acm.guard.coordination.FirstBlocksSecond.yaml", "policytypes/onap.policies.Naming.yaml", "policytypes/onap.policies.Match.yaml", "policytypes/onap.policies.native.Drools.yaml", "policytypes/onap.policies.native.Xacml.yaml", "policytypes/onap.policies.native.Apex.yaml", - "policytypes/onap.policies.controlloop.operational.Common.yaml", - "policytypes/onap.policies.controlloop.operational.common.Apex.yaml", - "policytypes/onap.policies.controlloop.operational.common.Drools.yaml" + "policytypes/onap.policies.acm.operational.Common.yaml", + "policytypes/onap.policies.acm.operational.common.Apex.yaml", + "policytypes/onap.policies.acm.operational.common.Drools.yaml" ], "preloadPolicies" : [ "policies/sdnc.policy.naming.input.tosca.yaml" diff --git a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json index 396b9f7a..ee832326 100644 --- a/testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json +++ b/testsuites/stability/src/main/resources/setup/config/jsonConfigs/pdpSimConfig.json @@ -6,7 +6,7 @@ "pdpType":"apex", "description":"Pdp Heartbeat", "supportedPolicyTypes":[ - {"name":"onap.policies.controlloop.operational.common.Apex","version":"1.0.0"}, + {"name":"onap.policies.acm.operational.common.Apex","version":"1.0.0"}, {"name":"onap.policies.native.Apex","version":"1.0.0"} ] }, diff --git a/testsuites/stability/src/main/resources/setup/distribution/etc/defaultConfig.json b/testsuites/stability/src/main/resources/setup/distribution/etc/defaultConfig.json index 2b3078ac..8a5b769e 100644 --- a/testsuites/stability/src/main/resources/setup/distribution/etc/defaultConfig.json +++ b/testsuites/stability/src/main/resources/setup/distribution/etc/defaultConfig.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" } } } @@ -56,10 +56,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" } } }, @@ -87,12 +87,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/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx index 9182a97d..8022d607 100644 --- a/testsuites/stability/src/main/resources/testplans/stability.jmx +++ b/testsuites/stability/src/main/resources/testplans/stability.jmx @@ -364,7 +364,7 @@ $[:2].policy-type - onap.policies.controlloop.operational.common.Apex + onap.policies.acm.operational.common.Apex true false false -- cgit 1.2.3-korg