From c9624f0e437db1d91b7076a1abdf71f74b5024dc Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 21 May 2021 15:00:36 +0100 Subject: [PATCH] Move tosca-controlloop src directries to new modules This is the second stage of the TOSCA Controlloop merge. In this review, the src directories of the old tosca-controlloop modules are moved to the new modules off the root of the clamp repo and the pom.xml files are updated with dependencies to allow the build of the moved modules to run. So the changes are renaming of files and updates of POM files in the modules to which src directories are added so that the build works, and of course deletion of the tosca-controlloop directory and its sub- modules The third and final review will follow this, which will merge the tosca-poc branch onto master, in effect merging this review to master. The differences with the clamp master repo are shown here: diff -qr clamp clamp-tp | diff_filter.sh Files clamp/INFO.yaml and clamp-tp/INFO.yaml differ Only in clamp-tp/common: src Only in clamp-tp/models: src Files clamp/participant/participant-impl/participant-impl-dcae/pom.xml and clamp-tp/participant/participant-impl/participant-impl-dcae/pom.xml differ Only in clamp-tp/participant/participant-impl/participant-impl-dcae: src Only in clamp-tp/participant/participant-impl/participant-impl-policy: src Only in clamp-tp/participant/participant-impl/participant-impl-simulator: src Files clamp/participant/participant-impl/pom.xml and clamp-tp/participant/participant-impl/pom.xml differ Only in clamp-tp/participant/participant-intermediary: src Files clamp/participant/pom.xml and clamp-tp/participant/pom.xml differ Files clamp/pom.xml and clamp-tp/pom.xml differ Only in clamp/releases: 6.0.1-container.yaml Only in clamp/releases: 6.0.1.yaml Only in clamp/releases: 6.0.2-container.yaml Only in clamp/releases: 6.0.2.yaml Only in clamp/releases: 6.1.0-container.yaml Only in clamp/releases: 6.1.0.yaml Only in clamp/releases: 6.1.1-container.yaml Only in clamp/releases: 6.1.1.yaml Files clamp/runtime/pom.xml and clamp-tp/runtime/pom.xml differ Only in clamp-tp: runtime-controlloop Issue-ID: POLICY-3215 Change-Id: I0e69e3c566ea387d61f77cfa118bb6d67b4f8253 Signed-off-by: liamfallon --- .../controlloop/common/ControlLoopConstants.java | 0 .../common/exception/ControlLoopException.java | 0 .../exception/ControlLoopRuntimeException.java | 0 .../common/handler/ControlLoopHandler.java | 0 .../startstop/CommonCommandLineArguments.java | 0 .../examples/controlloop/KubernetesHelm.yaml | 0 .../controlloop/PMSH/consul_call_body.json | 0 .../examples/controlloop/PMSH/consul_url.txt | 0 .../controlloop/PMSH/pmsh_cloudify_blueprint.yaml | 0 .../controlloop/PMSH/pmsh_monitoring_policy.json | 0 .../controlloop/PMSH/pmsh_monitoring_policy.yaml | 0 .../PMSH/pmsh_monitoring_policy_type.yaml | 0 .../controlloop/PMSH/pmsh_operational_policy.json | 0 .../controlloop/PMSH/pmsh_operational_policy.yaml | 0 .../controlloop/PMSubscriptionHandling.yaml | 0 .../PMSubscriptionHandling_GuilinFormat.yaml | 0 .../original/cloop_DCAE_VES_TCA_substitution.yaml | 0 .../controlloop/original/cloop_base_types.yaml | 0 .../controlloop/original/cloop_dcae_example.yaml | 0 .../controlloop/original/cloop_dcae_types.yaml | 0 .../controlloop/original/cloop_other_types.yaml | 0 .../common/exception/ExceptionsTest.java | 0 .../common/handler/ControlLoopHandlerTest.java | 0 .../common/handler/DummyControlLoopHandler.java | 0 .../src/test/resources/demo/Notes.txt | 0 .../demo/config/DEMO.postman_collection.json | 0 .../resources/demo/config/PolicyAPIConfig.json | 0 .../demo/config/PolicyParticipantConfig.json | 0 .../test/resources/demo/config/RuntimeConfig.json | 0 .../controlloop/concepts/ClElementStatistics.java | 0 .../concepts/ClElementStatisticsList.java | 0 .../models/controlloop/concepts/ControlLoop.java | 0 .../controlloop/concepts/ControlLoopElement.java | 0 .../concepts/ControlLoopOrderedState.java | 0 .../controlloop/concepts/ControlLoopState.java | 0 .../models/controlloop/concepts/ControlLoops.java | 0 .../models/controlloop/concepts/Participant.java | 0 .../concepts/ParticipantHealthStatus.java | 0 .../controlloop/concepts/ParticipantState.java | 0 .../concepts/ParticipantStatistics.java | 0 .../concepts/ParticipantStatisticsList.java | 0 .../concepts/JpaClElementStatistics.java | 0 .../persistence/concepts/JpaControlLoop.java | 0 .../concepts/JpaControlLoopElement.java | 0 .../persistence/concepts/JpaParticipant.java | 0 .../concepts/JpaParticipantStatistics.java | 0 .../provider/ClElementStatisticsProvider.java | 0 .../persistence/provider/ControlLoopProvider.java | 0 .../persistence/provider/ParticipantProvider.java | 0 .../provider/ParticipantStatisticsProvider.java | 0 .../notification/ControlLoopNotification.java | 0 .../dmaap/notification/ControlLoopStatus.java | 0 .../ParticipantControlLoopStateChange.java | 0 .../participant/ParticipantControlLoopUpdate.java | 0 .../dmaap/participant/ParticipantHealthCheck.java | 0 .../dmaap/participant/ParticipantMessage.java | 0 .../dmaap/participant/ParticipantMessageType.java | 0 .../participant/ParticipantResponseDetails.java | 0 .../participant/ParticipantResponseStatus.java | 0 .../dmaap/participant/ParticipantStateChange.java | 0 .../dmaap/participant/ParticipantStatus.java | 0 .../models/messages/rest/SimpleResponse.java | 0 .../models/messages/rest/TypedSimpleResponse.java | 0 .../rest/commissioning/CommissioningResponse.java | 0 .../rest/instantiation/InstantiationCommand.java | 0 .../rest/instantiation/InstantiationResponse.java | 0 .../concepts/ClElementStatisticsTest.java | 0 .../concepts/ControlLoopConceptPojosTest.java | 0 .../concepts/ControlLoopElementTest.java | 0 .../controlloop/concepts/ControlLoopTest.java | 0 .../concepts/ParticipantStatisticsTest.java | 0 .../controlloop/concepts/ParticipantTest.java | 0 .../concepts/DummyJpaClElementStatisticsChild.java | 0 .../concepts/DummyJpaControlLoopChild.java | 0 .../concepts/DummyJpaControlLoopElementChild.java | 0 .../concepts/DummyJpaParticipantChild.java | 0 .../DummyJpaParticipantStatisticsChild.java | 0 .../concepts/JpaClElementStatisticsTest.java | 0 .../concepts/JpaControlLoopElementTest.java | 0 .../persistence/concepts/JpaControlLoopTest.java | 0 .../concepts/JpaParticipantStatisticsTest.java | 0 .../persistence/concepts/JpaParticipantTest.java | 0 .../persistence/concepts/PojosTest.java | 0 .../provider/ClElementStatisticsProviderTest.java | 0 .../provider/ControlLoopProviderTest.java | 0 .../provider/ParticipantProviderTest.java | 0 .../ParticipantStatisticsProviderTest.java | 0 .../notification/ControlLoopNotificationTest.java | 0 .../dmaap/notification/ControlLoopStatusTest.java | 0 .../dmaap/notification/NotificationPojosTest.java | 0 .../ParticipantControlLoopStateChangeTest.java | 0 .../ParticipantControlLoopUpdateTest.java | 0 .../participant/ParticipantHealthCheckTest.java | 0 .../dmaap/participant/ParticipantMessageTest.java | 0 .../dmaap/participant/ParticipantMessageUtils.java | 0 .../dmaap/participant/ParticipantPojosTest.java | 0 .../participant/ParticipantStateChangeTest.java | 0 .../dmaap/participant/ParticipantStatusTest.java | 0 .../messages/rest/MessagesRestPojosTest.java | 0 .../instantiation/InstantiationCommandTest.java | 0 .../src/test/resources/META-INF/persistence.xml | 0 .../json/ControlLoopElementNoOrderedState.json | 0 .../resources/json/ControlLoopNoOrderedState.json | 0 .../providers/TestClElementStatistics.json | 0 .../test/resources/providers/TestControlLoops.json | 0 .../test/resources/providers/TestParticipant.json | 0 .../providers/TestParticipantStatistics.json | 0 .../resources/providers/UpdateControlLoops.json | 0 .../participant-impl/participant-impl-dcae/pom.xml | 19 + .../dcae/httpclient/AbstractHttpClient.java | 0 .../dcae/httpclient/ClampHttpClient.java | 0 .../dcae/httpclient/ConsulDcaeHttpClient.java | 0 .../main/handler/ControlLoopElementHandler.java | 0 .../participant/dcae/main/handler/DcaeHandler.java | 0 .../dcae/main/handler/DcaeProvider.java | 0 .../ParticipantDcaeParameterHandler.java | 0 .../main/parameters/ParticipantDcaeParameters.java | 0 .../participant/dcae/main/startstop/Main.java | 0 .../main/startstop/ParticipantDcaeActivator.java | 0 .../ParticipantDcaeCommandLineArguments.java | 0 .../participant/dcae/model/ExternalComponent.java | 0 .../dcae/model/ExternalComponentState.java | 0 .../controlloop/participant/dcae/model/Loop.java | 0 .../resources/config/DCAEParticipantConfig.json | 0 .../src/main/resources/version.txt | 0 .../dcae/httpclient/ClampHttpClientTest.java | 0 .../dcae/main/parameters/CommonTestData.java | 0 .../TestParticipantDcaeParameterHandler.java | 0 .../parameters/TestParticipantDcaeParameters.java | 0 .../dcae/main/rest/TestListenerUtils.java | 0 .../participant/dcae/main/startstop/TestMain.java | 0 .../startstop/TestParticipantDcaeActivator.java | 0 .../resources/parameters/InvalidParameters.json | 0 .../resources/parameters/MinimumParametersH2.json | 0 .../test/resources/parameters/NoParameters.json | 0 .../test/resources/parameters/TestCLParams.json | 0 .../test/resources/parameters/TestParameters.json | 0 .../resources/parameters/TestParametersStd.json | 0 .../src/test/resources/parameters/Unreadable.json | 0 .../src/test/resources/parameters/logback-test.xml | 0 .../servicetemplates/pm_control_loop_tosca.yaml | 0 .../src/test/resources/rest/status.json | 0 .../main/handler/ControlLoopElementHandler.java | 0 .../policy/main/handler/PolicyHandler.java | 0 .../policy/main/handler/PolicyProvider.java | 0 .../ParticipantPolicyParameterHandler.java | 0 .../parameters/ParticipantPolicyParameters.java | 0 .../participant/policy/main/startstop/Main.java | 0 .../main/startstop/ParticipantPolicyActivator.java | 0 .../ParticipantPolicyCommandLineArguments.java | 0 .../src/main/resources/META-INF/persistence.xml | 0 .../resources/config/PolicyParticipantConfig.json | 0 .../src/main/resources/version.txt | 0 .../policy/main/handler/TestPolicyHandler.java | 0 .../policy/main/parameters/CommonTestData.java | 0 .../TestParticipantPolicyParameterHandler.java | 0 .../TestParticipantPolicyParameters.java | 0 .../policy/main/startstop/TestMain.java | 0 .../startstop/TestParticipantPolicyActivator.java | 0 .../policy/main/utils/TestListenerUtils.java | 0 .../resources/parameters/InvalidParameters.json | 0 .../resources/parameters/MinimumParametersH2.json | 0 .../test/resources/parameters/NoParameters.json | 0 .../test/resources/parameters/TestCLParams.yaml | 0 .../test/resources/parameters/TestParameters.json | 0 .../resources/parameters/TestParametersStd.json | 0 .../src/test/resources/parameters/Unreadable.json | 0 .../src/test/resources/parameters/logback-test.xml | 0 .../vCPE.policies.optimization.input.tosca.yaml | 0 .../resources/policytypes/onap.policies.Match.yaml | 0 .../policytypes/onap.policies.Naming.yaml | 0 .../policytypes/onap.policies.Optimization.yaml | 0 .../onap.policies.controlloop.guard.Common.yaml | 0 ...olicies.controlloop.guard.common.Blacklist.yaml | 0 ...p.policies.controlloop.guard.common.Filter.yaml | 0 ....controlloop.guard.common.FrequencyLimiter.yaml | 0 ...p.policies.controlloop.guard.common.MinMax.yaml | 0 ...lloop.guard.coordination.FirstBlocksSecond.yaml | 0 ...ap.policies.controlloop.operational.Common.yaml | 0 ...licies.controlloop.operational.common.Apex.yaml | 0 ...cies.controlloop.operational.common.Drools.yaml | 0 .../onap.policies.monitoring.dcae-pm-mapper.yaml | 0 ...es.monitoring.dcae-pm-subscription-handler.yaml | 0 ...policies.monitoring.dcae-restconfcollector.yaml | 0 ...n2.collectors.datafile.datafile-app-server.yaml | 0 .../onap.policies.monitoring.tcagen2.yaml | 0 .../policytypes/onap.policies.native.Apex.yaml | 0 .../policytypes/onap.policies.native.Drools.yaml | 0 .../policytypes/onap.policies.native.Xacml.yaml | 0 .../onap.policies.optimization.Resource.yaml | 0 .../onap.policies.optimization.Service.yaml | 0 ...icies.optimization.resource.AffinityPolicy.yaml | 0 ...icies.optimization.resource.DistancePolicy.yaml | 0 ...p.policies.optimization.resource.HpaPolicy.yaml | 0 ...s.optimization.resource.OptimizationPolicy.yaml | 0 ...p.policies.optimization.resource.PciPolicy.yaml | 0 ...nap.policies.optimization.resource.Vim_fit.yaml | 0 ...p.policies.optimization.resource.VnfPolicy.yaml | 0 ....policies.optimization.service.QueryPolicy.yaml | 0 ...cies.optimization.service.SubscriberPolicy.yaml | 0 .../servicetemplates/pm_control_loop_tosca.yaml | 0 .../ParticipantSimulatorParameterHandler.java | 0 .../parameters/ParticipantSimulatorParameters.java | 0 .../main/rest/ParticipantSimulatorAafFilter.java | 0 .../simulator/main/rest/RestController.java | 0 .../participant/simulator/main/startstop/Main.java | 0 .../startstop/ParticipantSimulatorActivator.java | 0 .../ParticipantSimulatorCommandLineArguments.java | 0 .../simulator/simulation/SimulationHandler.java | 0 .../simulator/simulation/SimulationProvider.java | 0 .../rest/SimulationElementController.java | 0 .../rest/SimulationParticipantController.java | 0 .../resources/config/CDSParticipantConfig.json | 0 .../resources/config/DCAEParticipantConfig.json | 0 .../resources/config/PolicyParticipantConfig.json | 0 .../src/main/resources/version.txt | 0 .../TestControlLoopUpdateListener.java | 0 .../simulator/main/parameters/CommonTestData.java | 0 .../TestParticipantSimulatorParameterHandler.java | 0 .../TestParticipantSimulatorParameters.java | 0 .../main/rest/CommonParticipantRestServer.java | 0 .../simulator/main/rest/RestControllerTest.java | 0 .../simulator/main/rest/TestListenerUtils.java | 0 .../main/rest/TestSimulationRestController.java | 0 .../simulator/main/startstop/TestMain.java | 0 .../TestParticipantSimulatorActivator.java | 0 .../test/resources/parameters/EmptyParameters.json | 0 .../resources/parameters/InvalidParameters.json | 0 .../test/resources/parameters/NoParameters.json | 0 .../test/resources/parameters/TestParameters.json | 0 .../resources/parameters/TestParametersStd.json | 0 .../src/test/resources/parameters/Unreadable.json | 0 .../servicetemplates/pm_control_loop_tosca.yaml | 0 participant/participant-impl/pom.xml | 8 + .../api/ControlLoopElementListener.java | 0 .../api/ParticipantIntermediaryApi.java | 0 .../api/ParticipantIntermediaryFactory.java | 0 .../api/impl/ParticipantIntermediaryApiImpl.java | 0 .../comm/ControlLoopStateChangeListener.java | 0 .../comm/ControlLoopUpdateListener.java | 0 .../intermediary/comm/MessageSender.java | 0 .../comm/ParticipantHealthCheckListener.java | 0 .../comm/ParticipantStateChangeListener.java | 0 .../comm/ParticipantStatusPublisher.java | 0 .../intermediary/handler/ControlLoopHandler.java | 0 .../handler/IntermediaryActivator.java | 0 .../intermediary/handler/ParticipantHandler.java | 0 .../ParticipantIntermediaryParameters.java | 0 participant/pom.xml | 32 + pom.xml | 70 ++ .../runtime => runtime-controlloop}/pom.xml | 18 +- .../commissioning/CommissioningHandler.java | 0 .../commissioning/CommissioningProvider.java | 0 .../rest/CommissioningController.java | 0 .../ControlLoopInstantiationProvider.java | 0 .../instantiation/InstantiationHandler.java | 0 .../rest/InstantiationController.java | 0 .../main/parameters/ClRuntimeParameterGroup.java | 0 .../main/parameters/ClRuntimeParameterHandler.java | 0 .../main/parameters/ParticipantParameters.java | 0 .../ParticipantStateChangeParameters.java | 0 .../parameters/ParticipantUpdateParameters.java | 0 .../runtime/main/rest/ControlLoopAafFilter.java | 0 .../runtime/main/rest/RestController.java | 0 .../runtime/main/startstop/ClRuntimeActivator.java | 0 .../startstop/ClRuntimeCommandLineArguments.java | 0 .../controlloop/runtime/main/startstop/Main.java | 0 .../runtime/monitoring/MonitoringHandler.java | 0 .../runtime/monitoring/MonitoringProvider.java | 0 .../monitoring/rest/MonitoringQueryController.java | 0 .../runtime/supervision/SupervisionHandler.java | 0 .../runtime/supervision/SupervisionScanner.java | 0 ...ParticipantControlLoopStateChangePublisher.java | 0 .../ParticipantControlLoopUpdatePublisher.java | 0 .../comm/ParticipantStateChangePublisher.java | 0 .../comm/ParticipantStatusListener.java | 0 .../src/main/resources/META-INF/persistence.xml | 0 .../src/main/resources/version.txt | 0 .../commissioning/CommissioningProviderTest.java | 0 .../rest/CommissioningControllerTest.java | 0 .../ControlLoopInstantiationProviderTest.java | 0 .../runtime/instantiation/InstantiationUtils.java | 0 .../rest/InstantiationControllerTest.java | 0 .../runtime/main/rest/RestControllerTest.java | 0 .../main/startstop/ClRuntimeActivatorTest.java | 0 .../runtime/main/startstop/MainTest.java | 0 .../runtime/monitoring/TestMonitoringProvider.java | 0 .../rest/MonitoringQueryControllerTest.java | 0 .../controlloop/runtime/util/CommonTestData.java | 0 .../runtime/util/rest/CommonRestController.java | 0 .../src/test/resources/META-INF/persistence.xml | 0 .../resources/parameters/CommissioningConfig.json | 0 .../test/resources/parameters/EmptyParameters.json | 0 .../InstantiationConfigParametersStd.json | 0 .../InstantiationConfigParameters_InvalidName.json | 0 .../InstantiationConfigParameters_sim.json | 0 .../resources/parameters/InvalidParameters.json | 0 .../resources/parameters/MinimumParametersH2.json | 0 .../test/resources/parameters/NoParameters.json | 0 .../test/resources/parameters/TestParameters.json | 0 .../parameters/TestParametersMariaDB.json | 0 .../src/test/resources/parameters/Unreadable.json | 0 .../src/test/resources/parameters/logback-test.xml | 0 .../controlloops/ControlLoopElementsNotFound.json | 0 .../resources/rest/controlloops/ControlLoops.json | 0 .../rest/controlloops/ControlLoopsNotFound.json | 0 .../rest/controlloops/ControlLoopsUpdate.json | 0 .../ControlLoopsVersionNotMatches.json | 0 .../rest/controlloops/PassiveCommand.json | 0 .../rest/monitoring/TestClElementStatistics.json | 0 .../TestClElementStatistics_Invalid.json | 0 .../rest/monitoring/TestParticipantStatistics.json | 0 .../TestParticipantStatistics_Invalid.json | 0 .../rest/servicetemplates/PMSHMultipleCLTosca.yaml | 0 .../servicetemplates/pm_control_loop_tosca.yaml | 0 .../servicetemplates/pmsh_multiple_cl_tosca.yaml | 0 .../test/resources/testscripts/listenOnTopic.sh | 0 runtime/pom.xml | 2 +- .../main/resources/META-INF/resources/swagger.html | 4 +- tosca-controlloop/common/pom.xml | 36 - tosca-controlloop/design/pom.xml | 35 - tosca-controlloop/models/pom.xml | 35 - .../participant-impl/participant-impl-cds/pom.xml | 34 - .../participant-impl/participant-impl-dcae/pom.xml | 58 - .../participant-impl-kubernetes/pom.xml | 34 - .../participant-impl-policy/pom.xml | 42 - .../participant-impl-simulator/pom.xml | 42 - .../participant/participant-impl/pom.xml | 43 - .../participant/participant-intermediary/pom.xml | 36 - tosca-controlloop/participant/pom.xml | 72 -- tosca-controlloop/pom.xml | 163 --- .../HonoluluDTFForum_Postman_collection.json | 583 ---------- .../postman/Tosca POC.postman_collection.json | 1226 -------------------- 333 files changed, 141 insertions(+), 2451 deletions(-) rename {tosca-controlloop/common => common}/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java (100%) rename {tosca-controlloop/common => common}/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopException.java (100%) rename {tosca-controlloop/common => common}/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopRuntimeException.java (100%) rename {tosca-controlloop/common => common}/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java (100%) rename {tosca-controlloop/common => common}/src/main/java/org/onap/policy/clamp/controlloop/common/startstop/CommonCommandLineArguments.java (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/KubernetesHelm.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSH/consul_call_body.json (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSH/consul_url.txt (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSH/pmsh_cloudify_blueprint.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.json (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy_type.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.json (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSubscriptionHandling.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/PMSubscriptionHandling_GuilinFormat.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/original/cloop_DCAE_VES_TCA_substitution.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/original/cloop_base_types.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/original/cloop_dcae_example.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/original/cloop_dcae_types.yaml (100%) rename {tosca-controlloop/common => common}/src/main/resources/examples/controlloop/original/cloop_other_types.yaml (100%) rename {tosca-controlloop/common => common}/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java (100%) rename {tosca-controlloop/common => common}/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java (100%) rename {tosca-controlloop/common => common}/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java (100%) rename {tosca-controlloop/common => common}/src/test/resources/demo/Notes.txt (100%) rename {tosca-controlloop/common => common}/src/test/resources/demo/config/DEMO.postman_collection.json (100%) rename {tosca-controlloop/common => common}/src/test/resources/demo/config/PolicyAPIConfig.json (100%) rename {tosca-controlloop/common => common}/src/test/resources/demo/config/PolicyParticipantConfig.json (100%) rename {tosca-controlloop/common => common}/src/test/resources/demo/config/RuntimeConfig.json (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatistics.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsList.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElement.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopOrderedState.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopState.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoops.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/Participant.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantHealthStatus.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantState.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatistics.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsList.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatistics.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoop.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElement.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipant.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatistics.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProvider.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProvider.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProvider.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProvider.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotification.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatus.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChange.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdate.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheck.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessage.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageType.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseDetails.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseStatus.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChange.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/SimpleResponse.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/TypedSimpleResponse.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/commissioning/CommissioningResponse.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommand.java (100%) rename {tosca-controlloop/models => models}/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationResponse.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopConceptPojosTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaClElementStatisticsChild.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopChild.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopElementChild.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantChild.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantStatisticsChild.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatisticsTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElementTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatisticsTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/PojosTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProviderTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProviderTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProviderTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProviderTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotificationTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatusTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/NotificationPojosTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChangeTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdateTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheckTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageUtils.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantPojosTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChangeTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/MessagesRestPojosTest.java (100%) rename {tosca-controlloop/models => models}/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommandTest.java (100%) rename {tosca-controlloop/models => models}/src/test/resources/META-INF/persistence.xml (100%) rename {tosca-controlloop/models => models}/src/test/resources/json/ControlLoopElementNoOrderedState.json (100%) rename {tosca-controlloop/models => models}/src/test/resources/json/ControlLoopNoOrderedState.json (100%) rename {tosca-controlloop/models => models}/src/test/resources/providers/TestClElementStatistics.json (100%) rename {tosca-controlloop/models => models}/src/test/resources/providers/TestControlLoops.json (100%) rename {tosca-controlloop/models => models}/src/test/resources/providers/TestParticipant.json (100%) rename {tosca-controlloop/models => models}/src/test/resources/providers/TestParticipantStatistics.json (100%) rename {tosca-controlloop/models => models}/src/test/resources/providers/UpdateControlLoops.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/AbstractHttpClient.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClient.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ConsulDcaeHttpClient.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeProvider.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameterHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameters.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/Main.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeActivator.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeCommandLineArguments.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponent.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponentState.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/Loop.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/resources/config/DCAEParticipantConfig.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/main/resources/version.txt (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClientTest.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/CommonTestData.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameterHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameters.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/rest/TestListenerUtils.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestMain.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestParticipantDcaeActivator.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/parameters/InvalidParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/parameters/MinimumParametersH2.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/parameters/NoParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestCLParams.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParametersStd.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/parameters/Unreadable.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/parameters/logback-test.xml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-dcae/src/test/resources/rest/status.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyProvider.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameterHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameters.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/Main.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyActivator.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyCommandLineArguments.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/resources/config/PolicyParticipantConfig.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/main/resources/version.txt (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/TestPolicyHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameterHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameters.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestMain.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestParticipantPolicyActivator.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/parameters/InvalidParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/parameters/MinimumParametersH2.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/parameters/NoParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/parameters/TestCLParams.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParametersStd.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/parameters/Unreadable.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/parameters/logback-test.xml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policies/vCPE.policies.optimization.input.tosca.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Match.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Naming.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Optimization.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.Common.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Filter.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.Common.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.tcagen2.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Apex.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Drools.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Xacml.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Resource.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Service.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-policy/src/test/resources/utils/servicetemplates/pm_control_loop_tosca.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameterHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameters.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantSimulatorAafFilter.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestController.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/Main.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorActivator.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorCommandLineArguments.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationProvider.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationElementController.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationParticipantController.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/resources/config/CDSParticipantConfig.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/resources/config/DCAEParticipantConfig.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/resources/config/PolicyParticipantConfig.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/main/resources/version.txt (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/intermediary/TestControlLoopUpdateListener.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/CommonParticipantRestServer.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestControllerTest.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestSimulationRestController.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestMain.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestParticipantSimulatorActivator.java (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/resources/parameters/EmptyParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/resources/parameters/InvalidParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/resources/parameters/NoParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParameters.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParametersStd.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/resources/parameters/Unreadable.json (100%) rename {tosca-controlloop/participant => participant}/participant-impl/participant-impl-simulator/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ControlLoopElementListener.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryApi.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryFactory.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopStateChangeListener.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopUpdateListener.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/MessageSender.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantHealthCheckListener.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStateChangeListener.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStatusPublisher.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivator.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java (100%) rename {tosca-controlloop/participant => participant}/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/parameters/ParticipantIntermediaryParameters.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/pom.xml (76%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningHandler.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningController.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationHandler.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationController.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterHandler.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantParameters.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantStateChangeParameters.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantUpdateParameters.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/ControlLoopAafFilter.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestController.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeCommandLineArguments.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/Main.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringHandler.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryController.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopStateChangePublisher.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopUpdatePublisher.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStateChangePublisher.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStatusListener.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/resources/META-INF/persistence.xml (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/main/resources/version.txt (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningControllerTest.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationUtils.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationControllerTest.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestControllerTest.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivatorTest.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/MainTest.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/CommonTestData.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/rest/CommonRestController.java (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/META-INF/persistence.xml (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/CommissioningConfig.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/EmptyParameters.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/InstantiationConfigParametersStd.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/InstantiationConfigParameters_sim.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/InvalidParameters.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/MinimumParametersH2.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/NoParameters.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/TestParameters.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/TestParametersMariaDB.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/Unreadable.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/parameters/logback-test.xml (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/controlloops/ControlLoopElementsNotFound.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/controlloops/ControlLoops.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/controlloops/ControlLoopsNotFound.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/controlloops/ControlLoopsUpdate.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/controlloops/ControlLoopsVersionNotMatches.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/controlloops/PassiveCommand.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/monitoring/TestClElementStatistics.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/monitoring/TestClElementStatistics_Invalid.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/monitoring/TestParticipantStatistics.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/monitoring/TestParticipantStatistics_Invalid.json (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/servicetemplates/PMSHMultipleCLTosca.yaml (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/rest/servicetemplates/pmsh_multiple_cl_tosca.yaml (100%) rename {tosca-controlloop/runtime => runtime-controlloop}/src/test/resources/testscripts/listenOnTopic.sh (100%) delete mode 100755 tosca-controlloop/common/pom.xml delete mode 100755 tosca-controlloop/design/pom.xml delete mode 100755 tosca-controlloop/models/pom.xml delete mode 100644 tosca-controlloop/participant/participant-impl/participant-impl-cds/pom.xml delete mode 100644 tosca-controlloop/participant/participant-impl/participant-impl-dcae/pom.xml delete mode 100644 tosca-controlloop/participant/participant-impl/participant-impl-kubernetes/pom.xml delete mode 100644 tosca-controlloop/participant/participant-impl/participant-impl-policy/pom.xml delete mode 100644 tosca-controlloop/participant/participant-impl/participant-impl-simulator/pom.xml delete mode 100644 tosca-controlloop/participant/participant-impl/pom.xml delete mode 100644 tosca-controlloop/participant/participant-intermediary/pom.xml delete mode 100644 tosca-controlloop/participant/pom.xml delete mode 100755 tosca-controlloop/pom.xml delete mode 100644 tosca-controlloop/postman/HonoluluDTFForum_Postman_collection.json delete mode 100644 tosca-controlloop/postman/Tosca POC.postman_collection.json diff --git a/tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java similarity index 100% rename from tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java rename to common/src/main/java/org/onap/policy/clamp/controlloop/common/ControlLoopConstants.java diff --git a/tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopException.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopException.java similarity index 100% rename from tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopException.java rename to common/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopException.java diff --git a/tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopRuntimeException.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopRuntimeException.java similarity index 100% rename from tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopRuntimeException.java rename to common/src/main/java/org/onap/policy/clamp/controlloop/common/exception/ControlLoopRuntimeException.java diff --git a/tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java similarity index 100% rename from tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java rename to common/src/main/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandler.java diff --git a/tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/startstop/CommonCommandLineArguments.java b/common/src/main/java/org/onap/policy/clamp/controlloop/common/startstop/CommonCommandLineArguments.java similarity index 100% rename from tosca-controlloop/common/src/main/java/org/onap/policy/clamp/controlloop/common/startstop/CommonCommandLineArguments.java rename to common/src/main/java/org/onap/policy/clamp/controlloop/common/startstop/CommonCommandLineArguments.java diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/KubernetesHelm.yaml b/common/src/main/resources/examples/controlloop/KubernetesHelm.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/KubernetesHelm.yaml rename to common/src/main/resources/examples/controlloop/KubernetesHelm.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/consul_call_body.json b/common/src/main/resources/examples/controlloop/PMSH/consul_call_body.json similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/consul_call_body.json rename to common/src/main/resources/examples/controlloop/PMSH/consul_call_body.json diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/consul_url.txt b/common/src/main/resources/examples/controlloop/PMSH/consul_url.txt similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/consul_url.txt rename to common/src/main/resources/examples/controlloop/PMSH/consul_url.txt diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_cloudify_blueprint.yaml b/common/src/main/resources/examples/controlloop/PMSH/pmsh_cloudify_blueprint.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_cloudify_blueprint.yaml rename to common/src/main/resources/examples/controlloop/PMSH/pmsh_cloudify_blueprint.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.json b/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.json similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.json rename to common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.json diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.yaml b/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.yaml rename to common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy_type.yaml b/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy_type.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy_type.yaml rename to common/src/main/resources/examples/controlloop/PMSH/pmsh_monitoring_policy_type.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.json b/common/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.json similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.json rename to common/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.json diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.yaml b/common/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.yaml rename to common/src/main/resources/examples/controlloop/PMSH/pmsh_operational_policy.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSubscriptionHandling.yaml b/common/src/main/resources/examples/controlloop/PMSubscriptionHandling.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSubscriptionHandling.yaml rename to common/src/main/resources/examples/controlloop/PMSubscriptionHandling.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSubscriptionHandling_GuilinFormat.yaml b/common/src/main/resources/examples/controlloop/PMSubscriptionHandling_GuilinFormat.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/PMSubscriptionHandling_GuilinFormat.yaml rename to common/src/main/resources/examples/controlloop/PMSubscriptionHandling_GuilinFormat.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_DCAE_VES_TCA_substitution.yaml b/common/src/main/resources/examples/controlloop/original/cloop_DCAE_VES_TCA_substitution.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_DCAE_VES_TCA_substitution.yaml rename to common/src/main/resources/examples/controlloop/original/cloop_DCAE_VES_TCA_substitution.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_base_types.yaml b/common/src/main/resources/examples/controlloop/original/cloop_base_types.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_base_types.yaml rename to common/src/main/resources/examples/controlloop/original/cloop_base_types.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_dcae_example.yaml b/common/src/main/resources/examples/controlloop/original/cloop_dcae_example.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_dcae_example.yaml rename to common/src/main/resources/examples/controlloop/original/cloop_dcae_example.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_dcae_types.yaml b/common/src/main/resources/examples/controlloop/original/cloop_dcae_types.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_dcae_types.yaml rename to common/src/main/resources/examples/controlloop/original/cloop_dcae_types.yaml diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_other_types.yaml b/common/src/main/resources/examples/controlloop/original/cloop_other_types.yaml similarity index 100% rename from tosca-controlloop/common/src/main/resources/examples/controlloop/original/cloop_other_types.yaml rename to common/src/main/resources/examples/controlloop/original/cloop_other_types.yaml diff --git a/tosca-controlloop/common/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java b/common/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java similarity index 100% rename from tosca-controlloop/common/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java rename to common/src/test/java/org/onap/policy/clamp/controlloop/common/exception/ExceptionsTest.java diff --git a/tosca-controlloop/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java b/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java similarity index 100% rename from tosca-controlloop/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java rename to common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/ControlLoopHandlerTest.java diff --git a/tosca-controlloop/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java b/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java similarity index 100% rename from tosca-controlloop/common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java rename to common/src/test/java/org/onap/policy/clamp/controlloop/common/handler/DummyControlLoopHandler.java diff --git a/tosca-controlloop/common/src/test/resources/demo/Notes.txt b/common/src/test/resources/demo/Notes.txt similarity index 100% rename from tosca-controlloop/common/src/test/resources/demo/Notes.txt rename to common/src/test/resources/demo/Notes.txt diff --git a/tosca-controlloop/common/src/test/resources/demo/config/DEMO.postman_collection.json b/common/src/test/resources/demo/config/DEMO.postman_collection.json similarity index 100% rename from tosca-controlloop/common/src/test/resources/demo/config/DEMO.postman_collection.json rename to common/src/test/resources/demo/config/DEMO.postman_collection.json diff --git a/tosca-controlloop/common/src/test/resources/demo/config/PolicyAPIConfig.json b/common/src/test/resources/demo/config/PolicyAPIConfig.json similarity index 100% rename from tosca-controlloop/common/src/test/resources/demo/config/PolicyAPIConfig.json rename to common/src/test/resources/demo/config/PolicyAPIConfig.json diff --git a/tosca-controlloop/common/src/test/resources/demo/config/PolicyParticipantConfig.json b/common/src/test/resources/demo/config/PolicyParticipantConfig.json similarity index 100% rename from tosca-controlloop/common/src/test/resources/demo/config/PolicyParticipantConfig.json rename to common/src/test/resources/demo/config/PolicyParticipantConfig.json diff --git a/tosca-controlloop/common/src/test/resources/demo/config/RuntimeConfig.json b/common/src/test/resources/demo/config/RuntimeConfig.json similarity index 100% rename from tosca-controlloop/common/src/test/resources/demo/config/RuntimeConfig.json rename to common/src/test/resources/demo/config/RuntimeConfig.json diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatistics.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatistics.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatistics.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatistics.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsList.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsList.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsList.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsList.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoop.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElement.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElement.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElement.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElement.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopOrderedState.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopOrderedState.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopOrderedState.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopOrderedState.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopState.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopState.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopState.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopState.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoops.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoops.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoops.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoops.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/Participant.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/Participant.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/Participant.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/Participant.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantHealthStatus.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantHealthStatus.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantHealthStatus.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantHealthStatus.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantState.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantState.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantState.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantState.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatistics.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatistics.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatistics.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatistics.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsList.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsList.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsList.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsList.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatistics.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatistics.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatistics.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatistics.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoop.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoop.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoop.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoop.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElement.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElement.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElement.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElement.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipant.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipant.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipant.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipant.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatistics.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatistics.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatistics.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatistics.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProvider.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProvider.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProvider.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProvider.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProvider.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProvider.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProvider.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProvider.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProvider.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProvider.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProvider.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProvider.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProvider.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProvider.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProvider.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProvider.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotification.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotification.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotification.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotification.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatus.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatus.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatus.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatus.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChange.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChange.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChange.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChange.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdate.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdate.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdate.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdate.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheck.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheck.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheck.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheck.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessage.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessage.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessage.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessage.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageType.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageType.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageType.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageType.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseDetails.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseDetails.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseDetails.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseDetails.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseStatus.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseStatus.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseStatus.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantResponseStatus.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChange.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChange.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChange.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChange.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/SimpleResponse.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/SimpleResponse.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/SimpleResponse.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/SimpleResponse.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/TypedSimpleResponse.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/TypedSimpleResponse.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/TypedSimpleResponse.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/TypedSimpleResponse.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/commissioning/CommissioningResponse.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/commissioning/CommissioningResponse.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/commissioning/CommissioningResponse.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/commissioning/CommissioningResponse.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommand.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommand.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommand.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommand.java diff --git a/tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationResponse.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationResponse.java similarity index 100% rename from tosca-controlloop/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationResponse.java rename to models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationResponse.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ClElementStatisticsTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopConceptPojosTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopConceptPojosTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopConceptPojosTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopConceptPojosTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopElementTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ControlLoopTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantStatisticsTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/concepts/ParticipantTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaClElementStatisticsChild.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaClElementStatisticsChild.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaClElementStatisticsChild.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaClElementStatisticsChild.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopChild.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopChild.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopChild.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopChild.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopElementChild.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopElementChild.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopElementChild.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaControlLoopElementChild.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantChild.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantChild.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantChild.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantChild.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantStatisticsChild.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantStatisticsChild.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantStatisticsChild.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/DummyJpaParticipantStatisticsChild.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatisticsTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatisticsTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaClElementStatisticsTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElementTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElementTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElementTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopElementTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaControlLoopTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatisticsTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatisticsTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatisticsTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantStatisticsTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/JpaParticipantTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/PojosTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/PojosTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/PojosTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/concepts/PojosTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProviderTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProviderTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProviderTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ClElementStatisticsProviderTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProviderTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProviderTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProviderTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ControlLoopProviderTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProviderTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProviderTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProviderTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantProviderTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProviderTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProviderTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProviderTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/controlloop/persistence/provider/ParticipantStatisticsProviderTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotificationTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotificationTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotificationTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopNotificationTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatusTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatusTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatusTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/ControlLoopStatusTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/NotificationPojosTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/NotificationPojosTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/NotificationPojosTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/notification/NotificationPojosTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChangeTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChangeTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChangeTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopStateChangeTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdateTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdateTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdateTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantControlLoopUpdateTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheckTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheckTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheckTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantHealthCheckTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageUtils.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageUtils.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageUtils.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantMessageUtils.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantPojosTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantPojosTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantPojosTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantPojosTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChangeTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChangeTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChangeTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStateChangeTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatusTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/MessagesRestPojosTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/MessagesRestPojosTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/MessagesRestPojosTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/MessagesRestPojosTest.java diff --git a/tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommandTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommandTest.java similarity index 100% rename from tosca-controlloop/models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommandTest.java rename to models/src/test/java/org/onap/policy/clamp/controlloop/models/messages/rest/instantiation/InstantiationCommandTest.java diff --git a/tosca-controlloop/models/src/test/resources/META-INF/persistence.xml b/models/src/test/resources/META-INF/persistence.xml similarity index 100% rename from tosca-controlloop/models/src/test/resources/META-INF/persistence.xml rename to models/src/test/resources/META-INF/persistence.xml diff --git a/tosca-controlloop/models/src/test/resources/json/ControlLoopElementNoOrderedState.json b/models/src/test/resources/json/ControlLoopElementNoOrderedState.json similarity index 100% rename from tosca-controlloop/models/src/test/resources/json/ControlLoopElementNoOrderedState.json rename to models/src/test/resources/json/ControlLoopElementNoOrderedState.json diff --git a/tosca-controlloop/models/src/test/resources/json/ControlLoopNoOrderedState.json b/models/src/test/resources/json/ControlLoopNoOrderedState.json similarity index 100% rename from tosca-controlloop/models/src/test/resources/json/ControlLoopNoOrderedState.json rename to models/src/test/resources/json/ControlLoopNoOrderedState.json diff --git a/tosca-controlloop/models/src/test/resources/providers/TestClElementStatistics.json b/models/src/test/resources/providers/TestClElementStatistics.json similarity index 100% rename from tosca-controlloop/models/src/test/resources/providers/TestClElementStatistics.json rename to models/src/test/resources/providers/TestClElementStatistics.json diff --git a/tosca-controlloop/models/src/test/resources/providers/TestControlLoops.json b/models/src/test/resources/providers/TestControlLoops.json similarity index 100% rename from tosca-controlloop/models/src/test/resources/providers/TestControlLoops.json rename to models/src/test/resources/providers/TestControlLoops.json diff --git a/tosca-controlloop/models/src/test/resources/providers/TestParticipant.json b/models/src/test/resources/providers/TestParticipant.json similarity index 100% rename from tosca-controlloop/models/src/test/resources/providers/TestParticipant.json rename to models/src/test/resources/providers/TestParticipant.json diff --git a/tosca-controlloop/models/src/test/resources/providers/TestParticipantStatistics.json b/models/src/test/resources/providers/TestParticipantStatistics.json similarity index 100% rename from tosca-controlloop/models/src/test/resources/providers/TestParticipantStatistics.json rename to models/src/test/resources/providers/TestParticipantStatistics.json diff --git a/tosca-controlloop/models/src/test/resources/providers/UpdateControlLoops.json b/models/src/test/resources/providers/UpdateControlLoops.json similarity index 100% rename from tosca-controlloop/models/src/test/resources/providers/UpdateControlLoops.json rename to models/src/test/resources/providers/UpdateControlLoops.json diff --git a/participant/participant-impl/participant-impl-dcae/pom.xml b/participant/participant-impl/participant-impl-dcae/pom.xml index 6186ced61..308084255 100644 --- a/participant/participant-impl/participant-impl-dcae/pom.xml +++ b/participant/participant-impl/participant-impl-dcae/pom.xml @@ -31,4 +31,23 @@ policy-clamp-participant-impl-dcae ${project.artifactId} DCAE participant, that allows DCAE to partake in control loops + + + 5.11.2 + + + + + org.mock-server + mockserver-netty + ${mockserver.version} + test + + + org.mock-server + mockserver-client-java + ${mockserver.version} + test + + diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/AbstractHttpClient.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/AbstractHttpClient.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/AbstractHttpClient.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/AbstractHttpClient.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClient.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClient.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClient.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClient.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ConsulDcaeHttpClient.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ConsulDcaeHttpClient.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ConsulDcaeHttpClient.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ConsulDcaeHttpClient.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandler.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandler.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeHandler.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeHandler.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeProvider.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeProvider.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeProvider.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/DcaeProvider.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameterHandler.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameterHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameterHandler.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameterHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameters.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameters.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameters.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/ParticipantDcaeParameters.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/Main.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/Main.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/Main.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/Main.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeActivator.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeActivator.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeActivator.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeActivator.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeCommandLineArguments.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeCommandLineArguments.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeCommandLineArguments.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/ParticipantDcaeCommandLineArguments.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponent.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponent.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponent.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponent.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponentState.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponentState.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponentState.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/ExternalComponentState.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/Loop.java b/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/Loop.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/Loop.java rename to participant/participant-impl/participant-impl-dcae/src/main/java/org/onap/policy/clamp/controlloop/participant/dcae/model/Loop.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/resources/config/DCAEParticipantConfig.json b/participant/participant-impl/participant-impl-dcae/src/main/resources/config/DCAEParticipantConfig.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/resources/config/DCAEParticipantConfig.json rename to participant/participant-impl/participant-impl-dcae/src/main/resources/config/DCAEParticipantConfig.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/resources/version.txt b/participant/participant-impl/participant-impl-dcae/src/main/resources/version.txt similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/main/resources/version.txt rename to participant/participant-impl/participant-impl-dcae/src/main/resources/version.txt diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClientTest.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClientTest.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClientTest.java rename to participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/httpclient/ClampHttpClientTest.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/CommonTestData.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/CommonTestData.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/CommonTestData.java rename to participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/CommonTestData.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameterHandler.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameterHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameterHandler.java rename to participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameterHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameters.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameters.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameters.java rename to participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/parameters/TestParticipantDcaeParameters.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/rest/TestListenerUtils.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/rest/TestListenerUtils.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/rest/TestListenerUtils.java rename to participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/rest/TestListenerUtils.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestMain.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestMain.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestMain.java rename to participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestMain.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestParticipantDcaeActivator.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestParticipantDcaeActivator.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestParticipantDcaeActivator.java rename to participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/startstop/TestParticipantDcaeActivator.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/InvalidParameters.json b/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/InvalidParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/InvalidParameters.json rename to participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/InvalidParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/MinimumParametersH2.json b/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/MinimumParametersH2.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/MinimumParametersH2.json rename to participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/MinimumParametersH2.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/NoParameters.json b/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/NoParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/NoParameters.json rename to participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/NoParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestCLParams.json b/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestCLParams.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestCLParams.json rename to participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestCLParams.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParameters.json b/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParameters.json rename to participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParametersStd.json b/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParametersStd.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParametersStd.json rename to participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/TestParametersStd.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/Unreadable.json b/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/Unreadable.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/Unreadable.json rename to participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/Unreadable.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/logback-test.xml b/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/logback-test.xml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/logback-test.xml rename to participant/participant-impl/participant-impl-dcae/src/test/resources/parameters/logback-test.xml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml b/participant/participant-impl/participant-impl-dcae/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml rename to participant/participant-impl/participant-impl-dcae/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/rest/status.json b/participant/participant-impl/participant-impl-dcae/src/test/resources/rest/status.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-dcae/src/test/resources/rest/status.json rename to participant/participant-impl/participant-impl-dcae/src/test/resources/rest/status.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java rename to participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/ControlLoopElementHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyHandler.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyHandler.java rename to participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyProvider.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyProvider.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyProvider.java rename to participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/PolicyProvider.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameterHandler.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameterHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameterHandler.java rename to participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameterHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameters.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameters.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameters.java rename to participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/ParticipantPolicyParameters.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/Main.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/Main.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/Main.java rename to participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/Main.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyActivator.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyActivator.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyActivator.java rename to participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyActivator.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyCommandLineArguments.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyCommandLineArguments.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyCommandLineArguments.java rename to participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/ParticipantPolicyCommandLineArguments.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml b/participant/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml rename to participant/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/resources/config/PolicyParticipantConfig.json b/participant/participant-impl/participant-impl-policy/src/main/resources/config/PolicyParticipantConfig.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/resources/config/PolicyParticipantConfig.json rename to participant/participant-impl/participant-impl-policy/src/main/resources/config/PolicyParticipantConfig.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/resources/version.txt b/participant/participant-impl/participant-impl-policy/src/main/resources/version.txt similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/main/resources/version.txt rename to participant/participant-impl/participant-impl-policy/src/main/resources/version.txt diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/TestPolicyHandler.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/TestPolicyHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/TestPolicyHandler.java rename to participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/handler/TestPolicyHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java rename to participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameterHandler.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameterHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameterHandler.java rename to participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameterHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameters.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameters.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameters.java rename to participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/TestParticipantPolicyParameters.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestMain.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestMain.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestMain.java rename to participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestMain.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestParticipantPolicyActivator.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestParticipantPolicyActivator.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestParticipantPolicyActivator.java rename to participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/startstop/TestParticipantPolicyActivator.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java rename to participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/InvalidParameters.json b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/InvalidParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/InvalidParameters.json rename to participant/participant-impl/participant-impl-policy/src/test/resources/parameters/InvalidParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/MinimumParametersH2.json b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/MinimumParametersH2.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/MinimumParametersH2.json rename to participant/participant-impl/participant-impl-policy/src/test/resources/parameters/MinimumParametersH2.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/NoParameters.json b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/NoParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/NoParameters.json rename to participant/participant-impl/participant-impl-policy/src/test/resources/parameters/NoParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestCLParams.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestCLParams.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestCLParams.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestCLParams.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParameters.json b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParameters.json rename to participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParametersStd.json b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParametersStd.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParametersStd.json rename to participant/participant-impl/participant-impl-policy/src/test/resources/parameters/TestParametersStd.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/Unreadable.json b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/Unreadable.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/Unreadable.json rename to participant/participant-impl/participant-impl-policy/src/test/resources/parameters/Unreadable.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/logback-test.xml b/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/logback-test.xml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/parameters/logback-test.xml rename to participant/participant-impl/participant-impl-policy/src/test/resources/parameters/logback-test.xml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policies/vCPE.policies.optimization.input.tosca.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policies/vCPE.policies.optimization.input.tosca.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policies/vCPE.policies.optimization.input.tosca.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policies/vCPE.policies.optimization.input.tosca.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Match.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Match.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Match.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Match.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Naming.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Naming.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Naming.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Naming.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Optimization.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Optimization.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Optimization.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.Optimization.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.Common.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.Common.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.Common.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.Common.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Filter.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Filter.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Filter.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.Filter.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.Common.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.Common.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.Common.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.Common.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-mapper.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-pm-subscription-handler.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.tcagen2.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.tcagen2.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.tcagen2.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.monitoring.tcagen2.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Apex.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Apex.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Apex.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Apex.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Drools.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Drools.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Drools.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Drools.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Xacml.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Xacml.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Xacml.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.native.Xacml.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Resource.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Resource.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Resource.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Resource.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Service.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Service.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Service.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.Service.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/utils/servicetemplates/pm_control_loop_tosca.yaml b/participant/participant-impl/participant-impl-policy/src/test/resources/utils/servicetemplates/pm_control_loop_tosca.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-policy/src/test/resources/utils/servicetemplates/pm_control_loop_tosca.yaml rename to participant/participant-impl/participant-impl-policy/src/test/resources/utils/servicetemplates/pm_control_loop_tosca.yaml diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameterHandler.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameterHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameterHandler.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameterHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameters.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameters.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameters.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/ParticipantSimulatorParameters.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantSimulatorAafFilter.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantSimulatorAafFilter.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantSimulatorAafFilter.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/ParticipantSimulatorAafFilter.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestController.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestController.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestController.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestController.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/Main.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/Main.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/Main.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/Main.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorActivator.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorActivator.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorActivator.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorActivator.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorCommandLineArguments.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorCommandLineArguments.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorCommandLineArguments.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/ParticipantSimulatorCommandLineArguments.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationHandler.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationHandler.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationProvider.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationProvider.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationProvider.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/SimulationProvider.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationElementController.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationElementController.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationElementController.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationElementController.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationParticipantController.java b/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationParticipantController.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationParticipantController.java rename to participant/participant-impl/participant-impl-simulator/src/main/java/org/onap/policy/clamp/controlloop/participant/simulator/simulation/rest/SimulationParticipantController.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/resources/config/CDSParticipantConfig.json b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/CDSParticipantConfig.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/resources/config/CDSParticipantConfig.json rename to participant/participant-impl/participant-impl-simulator/src/main/resources/config/CDSParticipantConfig.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/resources/config/DCAEParticipantConfig.json b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/DCAEParticipantConfig.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/resources/config/DCAEParticipantConfig.json rename to participant/participant-impl/participant-impl-simulator/src/main/resources/config/DCAEParticipantConfig.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/resources/config/PolicyParticipantConfig.json b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/PolicyParticipantConfig.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/resources/config/PolicyParticipantConfig.json rename to participant/participant-impl/participant-impl-simulator/src/main/resources/config/PolicyParticipantConfig.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/resources/version.txt b/participant/participant-impl/participant-impl-simulator/src/main/resources/version.txt similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/main/resources/version.txt rename to participant/participant-impl/participant-impl-simulator/src/main/resources/version.txt diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/intermediary/TestControlLoopUpdateListener.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/intermediary/TestControlLoopUpdateListener.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/intermediary/TestControlLoopUpdateListener.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/intermediary/TestControlLoopUpdateListener.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/CommonTestData.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameterHandler.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/parameters/TestParticipantSimulatorParameters.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/CommonParticipantRestServer.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/CommonParticipantRestServer.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/CommonParticipantRestServer.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/CommonParticipantRestServer.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestControllerTest.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestControllerTest.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestControllerTest.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/RestControllerTest.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestSimulationRestController.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestSimulationRestController.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestSimulationRestController.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestSimulationRestController.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestMain.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestMain.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestMain.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestMain.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestParticipantSimulatorActivator.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestParticipantSimulatorActivator.java similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestParticipantSimulatorActivator.java rename to participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/startstop/TestParticipantSimulatorActivator.java diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/EmptyParameters.json b/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/EmptyParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/EmptyParameters.json rename to participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/EmptyParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/InvalidParameters.json b/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/InvalidParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/InvalidParameters.json rename to participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/InvalidParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/NoParameters.json b/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/NoParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/NoParameters.json rename to participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/NoParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParameters.json b/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParameters.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParameters.json rename to participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParameters.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParametersStd.json b/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParametersStd.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParametersStd.json rename to participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/TestParametersStd.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/Unreadable.json b/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/Unreadable.json similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/Unreadable.json rename to participant/participant-impl/participant-impl-simulator/src/test/resources/parameters/Unreadable.json diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml b/participant/participant-impl/participant-impl-simulator/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml similarity index 100% rename from tosca-controlloop/participant/participant-impl/participant-impl-simulator/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml rename to participant/participant-impl/participant-impl-simulator/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml diff --git a/participant/participant-impl/pom.xml b/participant/participant-impl/pom.xml index 6c67bfa51..8afd81045 100644 --- a/participant/participant-impl/pom.xml +++ b/participant/participant-impl/pom.xml @@ -40,4 +40,12 @@ participant-impl-cds participant-impl-kubernetes + + + + org.onap.policy.clamp.participant + policy-clamp-participant-intermediary + ${project.version} + + diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ControlLoopElementListener.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ControlLoopElementListener.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ControlLoopElementListener.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ControlLoopElementListener.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryApi.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryApi.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryApi.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryApi.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryFactory.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryFactory.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryFactory.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/ParticipantIntermediaryFactory.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopStateChangeListener.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopStateChangeListener.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopStateChangeListener.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopStateChangeListener.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopUpdateListener.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopUpdateListener.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopUpdateListener.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ControlLoopUpdateListener.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/MessageSender.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/MessageSender.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/MessageSender.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/MessageSender.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantHealthCheckListener.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantHealthCheckListener.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantHealthCheckListener.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantHealthCheckListener.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStateChangeListener.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStateChangeListener.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStateChangeListener.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStateChangeListener.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStatusPublisher.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStatusPublisher.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStatusPublisher.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/comm/ParticipantStatusPublisher.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandler.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivator.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivator.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivator.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivator.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java diff --git a/tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/parameters/ParticipantIntermediaryParameters.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/parameters/ParticipantIntermediaryParameters.java similarity index 100% rename from tosca-controlloop/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/parameters/ParticipantIntermediaryParameters.java rename to participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/parameters/ParticipantIntermediaryParameters.java diff --git a/participant/pom.xml b/participant/pom.xml index c18ee14d0..b0ee3c084 100644 --- a/participant/pom.xml +++ b/participant/pom.xml @@ -39,4 +39,36 @@ participant-intermediary participant-impl + + + + org.onap.policy.clamp + policy-clamp-common + ${project.version} + + + org.onap.policy.clamp + policy-clamp-models + ${project.version} + + + + + + + maven-assembly-plugin + + + + org.onap.policy.clamp.controlloop.participant.simulator.main.startstop.Main + + + + jar-with-dependencies + + + + + + diff --git a/pom.xml b/pom.xml index 6f86ff513..d9640b45d 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,7 @@ common models runtime + runtime-controlloop participant @@ -67,5 +68,74 @@ junit test + + commons-cli + commons-cli + + + org.onap.policy.common + common-parameters + ${policy.common.version} + + + org.onap.policy.common + utils + ${policy.common.version} + + + org.onap.policy.common + policy-endpoints + ${policy.common.version} + + + org.onap.policy.common + gson + ${policy.common.version} + + + org.onap.policy.models + policy-models-provider + ${policy.models.version} + + + org.apache.commons + commons-lang3 + + + org.onap.policy.common + utils-test + ${policy.common.version} + test + + + org.assertj + assertj-core + test + + + org.mockito + mockito-core + test + + + org.powermock + powermock-api-mockito2 + test + + + org.powermock + powermock-module-junit4 + test + + + org.awaitility + awaitility + test + + + com.h2database + h2 + test + diff --git a/tosca-controlloop/runtime/pom.xml b/runtime-controlloop/pom.xml similarity index 76% rename from tosca-controlloop/runtime/pom.xml rename to runtime-controlloop/pom.xml index 8433438ff..ab72deb91 100644 --- a/tosca-controlloop/runtime/pom.xml +++ b/runtime-controlloop/pom.xml @@ -25,24 +25,24 @@ 4.0.0 - org.onap.policy.clamp.controlloop - controlloop - 6.1.0-SNAPSHOT + org.onap.policy.clamp + policy-clamp + 6.1.2-SNAPSHOT - controlloop-runtime + policy-clamp-runtime-controlloop ${project.artifactId} - org.onap.policy.clamp.controlloop - controlloop-common + org.onap.policy.clamp + policy-clamp-common ${project.version} - org.onap.policy.clamp.controlloop - controlloop-models + org.onap.policy.clamp + policy-clamp-models ${project.version} - \ No newline at end of file + diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningHandler.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningHandler.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningHandler.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningHandler.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningController.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningController.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningController.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningController.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProvider.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationHandler.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationHandler.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationHandler.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationHandler.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationController.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationController.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationController.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationController.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterGroup.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterHandler.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterHandler.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterHandler.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ClRuntimeParameterHandler.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantParameters.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantParameters.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantParameters.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantParameters.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantStateChangeParameters.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantStateChangeParameters.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantStateChangeParameters.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantStateChangeParameters.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantUpdateParameters.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantUpdateParameters.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantUpdateParameters.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/parameters/ParticipantUpdateParameters.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/ControlLoopAafFilter.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/ControlLoopAafFilter.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/ControlLoopAafFilter.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/ControlLoopAafFilter.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestController.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestController.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestController.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestController.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeCommandLineArguments.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeCommandLineArguments.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeCommandLineArguments.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeCommandLineArguments.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/Main.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/Main.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/Main.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/Main.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringHandler.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringHandler.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringHandler.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringHandler.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryController.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryController.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryController.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryController.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandler.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionScanner.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopStateChangePublisher.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopStateChangePublisher.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopStateChangePublisher.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopStateChangePublisher.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopUpdatePublisher.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopUpdatePublisher.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopUpdatePublisher.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantControlLoopUpdatePublisher.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStateChangePublisher.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStateChangePublisher.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStateChangePublisher.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStateChangePublisher.java diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStatusListener.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStatusListener.java similarity index 100% rename from tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStatusListener.java rename to runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantStatusListener.java diff --git a/tosca-controlloop/runtime/src/main/resources/META-INF/persistence.xml b/runtime-controlloop/src/main/resources/META-INF/persistence.xml similarity index 100% rename from tosca-controlloop/runtime/src/main/resources/META-INF/persistence.xml rename to runtime-controlloop/src/main/resources/META-INF/persistence.xml diff --git a/tosca-controlloop/runtime/src/main/resources/version.txt b/runtime-controlloop/src/main/resources/version.txt similarity index 100% rename from tosca-controlloop/runtime/src/main/resources/version.txt rename to runtime-controlloop/src/main/resources/version.txt diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningControllerTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningControllerTest.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningControllerTest.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/rest/CommissioningControllerTest.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationUtils.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationUtils.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationUtils.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/InstantiationUtils.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationControllerTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationControllerTest.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationControllerTest.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/rest/InstantiationControllerTest.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestControllerTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestControllerTest.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestControllerTest.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/rest/RestControllerTest.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivatorTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivatorTest.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivatorTest.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivatorTest.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/MainTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/MainTest.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/MainTest.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/MainTest.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/CommonTestData.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/CommonTestData.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/CommonTestData.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/CommonTestData.java diff --git a/tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/rest/CommonRestController.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/rest/CommonRestController.java similarity index 100% rename from tosca-controlloop/runtime/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/rest/CommonRestController.java rename to runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/util/rest/CommonRestController.java diff --git a/tosca-controlloop/runtime/src/test/resources/META-INF/persistence.xml b/runtime-controlloop/src/test/resources/META-INF/persistence.xml similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/META-INF/persistence.xml rename to runtime-controlloop/src/test/resources/META-INF/persistence.xml diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/CommissioningConfig.json b/runtime-controlloop/src/test/resources/parameters/CommissioningConfig.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/CommissioningConfig.json rename to runtime-controlloop/src/test/resources/parameters/CommissioningConfig.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/EmptyParameters.json b/runtime-controlloop/src/test/resources/parameters/EmptyParameters.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/EmptyParameters.json rename to runtime-controlloop/src/test/resources/parameters/EmptyParameters.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParametersStd.json b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParametersStd.json rename to runtime-controlloop/src/test/resources/parameters/InstantiationConfigParametersStd.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json rename to runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParameters_sim.json b/runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_sim.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParameters_sim.json rename to runtime-controlloop/src/test/resources/parameters/InstantiationConfigParameters_sim.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/InvalidParameters.json b/runtime-controlloop/src/test/resources/parameters/InvalidParameters.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/InvalidParameters.json rename to runtime-controlloop/src/test/resources/parameters/InvalidParameters.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/MinimumParametersH2.json b/runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/MinimumParametersH2.json rename to runtime-controlloop/src/test/resources/parameters/MinimumParametersH2.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/NoParameters.json b/runtime-controlloop/src/test/resources/parameters/NoParameters.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/NoParameters.json rename to runtime-controlloop/src/test/resources/parameters/NoParameters.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/TestParameters.json b/runtime-controlloop/src/test/resources/parameters/TestParameters.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/TestParameters.json rename to runtime-controlloop/src/test/resources/parameters/TestParameters.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/TestParametersMariaDB.json b/runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/TestParametersMariaDB.json rename to runtime-controlloop/src/test/resources/parameters/TestParametersMariaDB.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/Unreadable.json b/runtime-controlloop/src/test/resources/parameters/Unreadable.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/Unreadable.json rename to runtime-controlloop/src/test/resources/parameters/Unreadable.json diff --git a/tosca-controlloop/runtime/src/test/resources/parameters/logback-test.xml b/runtime-controlloop/src/test/resources/parameters/logback-test.xml similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/parameters/logback-test.xml rename to runtime-controlloop/src/test/resources/parameters/logback-test.xml diff --git a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopElementsNotFound.json b/runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopElementsNotFound.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopElementsNotFound.json rename to runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopElementsNotFound.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoops.json b/runtime-controlloop/src/test/resources/rest/controlloops/ControlLoops.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoops.json rename to runtime-controlloop/src/test/resources/rest/controlloops/ControlLoops.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsNotFound.json b/runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsNotFound.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsNotFound.json rename to runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsNotFound.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsUpdate.json b/runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsUpdate.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsUpdate.json rename to runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsUpdate.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsVersionNotMatches.json b/runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsVersionNotMatches.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsVersionNotMatches.json rename to runtime-controlloop/src/test/resources/rest/controlloops/ControlLoopsVersionNotMatches.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/PassiveCommand.json b/runtime-controlloop/src/test/resources/rest/controlloops/PassiveCommand.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/controlloops/PassiveCommand.json rename to runtime-controlloop/src/test/resources/rest/controlloops/PassiveCommand.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestClElementStatistics.json b/runtime-controlloop/src/test/resources/rest/monitoring/TestClElementStatistics.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestClElementStatistics.json rename to runtime-controlloop/src/test/resources/rest/monitoring/TestClElementStatistics.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestClElementStatistics_Invalid.json b/runtime-controlloop/src/test/resources/rest/monitoring/TestClElementStatistics_Invalid.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestClElementStatistics_Invalid.json rename to runtime-controlloop/src/test/resources/rest/monitoring/TestClElementStatistics_Invalid.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestParticipantStatistics.json b/runtime-controlloop/src/test/resources/rest/monitoring/TestParticipantStatistics.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestParticipantStatistics.json rename to runtime-controlloop/src/test/resources/rest/monitoring/TestParticipantStatistics.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestParticipantStatistics_Invalid.json b/runtime-controlloop/src/test/resources/rest/monitoring/TestParticipantStatistics_Invalid.json similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestParticipantStatistics_Invalid.json rename to runtime-controlloop/src/test/resources/rest/monitoring/TestParticipantStatistics_Invalid.json diff --git a/tosca-controlloop/runtime/src/test/resources/rest/servicetemplates/PMSHMultipleCLTosca.yaml b/runtime-controlloop/src/test/resources/rest/servicetemplates/PMSHMultipleCLTosca.yaml similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/servicetemplates/PMSHMultipleCLTosca.yaml rename to runtime-controlloop/src/test/resources/rest/servicetemplates/PMSHMultipleCLTosca.yaml diff --git a/tosca-controlloop/runtime/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml b/runtime-controlloop/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml rename to runtime-controlloop/src/test/resources/rest/servicetemplates/pm_control_loop_tosca.yaml diff --git a/tosca-controlloop/runtime/src/test/resources/rest/servicetemplates/pmsh_multiple_cl_tosca.yaml b/runtime-controlloop/src/test/resources/rest/servicetemplates/pmsh_multiple_cl_tosca.yaml similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/rest/servicetemplates/pmsh_multiple_cl_tosca.yaml rename to runtime-controlloop/src/test/resources/rest/servicetemplates/pmsh_multiple_cl_tosca.yaml diff --git a/tosca-controlloop/runtime/src/test/resources/testscripts/listenOnTopic.sh b/runtime-controlloop/src/test/resources/testscripts/listenOnTopic.sh similarity index 100% rename from tosca-controlloop/runtime/src/test/resources/testscripts/listenOnTopic.sh rename to runtime-controlloop/src/test/resources/testscripts/listenOnTopic.sh diff --git a/runtime/pom.xml b/runtime/pom.xml index 66d555ac7..f0277575e 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -647,7 +647,7 @@ - ${project.basedir}/docs/swagger/swagger.json + ${project.basedir}/../docs/swagger/swagger.json ${project.build.directory}/asciidoc/generated ASCIIDOC diff --git a/runtime/src/main/resources/META-INF/resources/swagger.html b/runtime/src/main/resources/META-INF/resources/swagger.html index f7fbeb039..08774701d 100644 --- a/runtime/src/main/resources/META-INF/resources/swagger.html +++ b/runtime/src/main/resources/META-INF/resources/swagger.html @@ -4501,8 +4501,8 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b - + \ No newline at end of file diff --git a/tosca-controlloop/common/pom.xml b/tosca-controlloop/common/pom.xml deleted file mode 100755 index 35c32cc69..000000000 --- a/tosca-controlloop/common/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - controlloop - 6.1.0-SNAPSHOT - - - controlloop-common - ${project.artifactId} - Common utilities and code for the TOSCA Control Loop system - diff --git a/tosca-controlloop/design/pom.xml b/tosca-controlloop/design/pom.xml deleted file mode 100755 index 44684ab44..000000000 --- a/tosca-controlloop/design/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - controlloop - 6.1.0-SNAPSHOT - - - controlloop-design - ${project.artifactId} - Design time part of the TOSCA Control Loop system - diff --git a/tosca-controlloop/models/pom.xml b/tosca-controlloop/models/pom.xml deleted file mode 100755 index d577cc029..000000000 --- a/tosca-controlloop/models/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - controlloop - 6.1.0-SNAPSHOT - - - controlloop-models - ${project.artifactId} - diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-cds/pom.xml b/tosca-controlloop/participant/participant-impl/participant-impl-cds/pom.xml deleted file mode 100644 index c16efbd74..000000000 --- a/tosca-controlloop/participant/participant-impl/participant-impl-cds/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - participant-impl - 6.1.0-SNAPSHOT - - - participant-impl-cds - ${project.artifactId} - CDS participant, that allows CDS to partake in control loops - diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/pom.xml b/tosca-controlloop/participant/participant-impl/participant-impl-dcae/pom.xml deleted file mode 100644 index 7b0e531ce..000000000 --- a/tosca-controlloop/participant/participant-impl/participant-impl-dcae/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - participant-impl - 6.1.0-SNAPSHOT - - - participant-impl-dcae - ${project.artifactId} - DCAE participant, that allows DCAE to partake in control loops - - - 5.11.2 - - - - - org.onap.policy.clamp.controlloop - participant-intermediary - ${project.version} - - - org.mock-server - mockserver-netty - ${mockserver.version} - test - - - org.mock-server - mockserver-client-java - ${mockserver.version} - test - - - diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-kubernetes/pom.xml b/tosca-controlloop/participant/participant-impl/participant-impl-kubernetes/pom.xml deleted file mode 100644 index ef048a3cf..000000000 --- a/tosca-controlloop/participant/participant-impl/participant-impl-kubernetes/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - participant-impl - 6.1.0-SNAPSHOT - - - participant-impl-kubernetes - ${project.artifactId} - Kubernetes participant, that allows microservices running in Kubernetes to partake in control loops - diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-policy/pom.xml b/tosca-controlloop/participant/participant-impl/participant-impl-policy/pom.xml deleted file mode 100644 index 27bb6cfe4..000000000 --- a/tosca-controlloop/participant/participant-impl/participant-impl-policy/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - participant-impl - 6.1.0-SNAPSHOT - - - participant-impl-policy - ${project.artifactId} - Policy participant, that allows Policy to partake in control loops - - - - org.onap.policy.clamp.controlloop - participant-intermediary - ${project.version} - - - diff --git a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/pom.xml b/tosca-controlloop/participant/participant-impl/participant-impl-simulator/pom.xml deleted file mode 100644 index 3d51e8e9c..000000000 --- a/tosca-controlloop/participant/participant-impl/participant-impl-simulator/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - participant-impl - 6.1.0-SNAPSHOT - - - participant-impl-simulator - ${project.artifactId} - Participant simulator, used to test control loops - - - - org.onap.policy.clamp.controlloop - participant-intermediary - ${project.version} - - - diff --git a/tosca-controlloop/participant/participant-impl/pom.xml b/tosca-controlloop/participant/participant-impl/pom.xml deleted file mode 100644 index 84c7e1015..000000000 --- a/tosca-controlloop/participant/participant-impl/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - participant - 6.1.0-SNAPSHOT - - - participant-impl - ${project.artifactId} - pom - - - participant-impl-simulator - participant-impl-dcae - participant-impl-policy - participant-impl-cds - participant-impl-kubernetes - - diff --git a/tosca-controlloop/participant/participant-intermediary/pom.xml b/tosca-controlloop/participant/participant-intermediary/pom.xml deleted file mode 100644 index 037dae93c..000000000 --- a/tosca-controlloop/participant/participant-intermediary/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - participant - 6.1.0-SNAPSHOT - - - participant-intermediary - ${project.artifactId} - Common intermediary library for managing DMaaP participant messaging and holding participant and control - loop state - - diff --git a/tosca-controlloop/participant/pom.xml b/tosca-controlloop/participant/pom.xml deleted file mode 100644 index 9942b536a..000000000 --- a/tosca-controlloop/participant/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.clamp.controlloop - controlloop - 6.1.0-SNAPSHOT - - - participant - ${project.artifactId} - pom - participants that communicate with the runtime server to handle control loops - - - participant-intermediary - participant-impl - - - - - org.onap.policy.clamp.controlloop - controlloop-common - ${project.version} - - - org.onap.policy.clamp.controlloop - controlloop-models - ${project.version} - - - - - - - maven-assembly-plugin - - - - org.onap.policy.clamp.controlloop.participant.simulator.main.startstop.Main - - - - jar-with-dependencies - - - - - - diff --git a/tosca-controlloop/pom.xml b/tosca-controlloop/pom.xml deleted file mode 100755 index 812b31965..000000000 --- a/tosca-controlloop/pom.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.parent - integration - 3.4.0-SNAPSHOT - - - - org.onap.policy.clamp.controlloop - controlloop - 6.1.0-SNAPSHOT - ${project.artifactId} - pom - - - 1.9.0-SNAPSHOT - 2.5.0-SNAPSHOT - - - - common - models - design - runtime - participant - - - - - commons-cli - commons-cli - - - org.onap.policy.common - common-parameters - ${policy.common.version} - - - org.onap.policy.common - utils - ${policy.common.version} - - - org.onap.policy.common - policy-endpoints - ${policy.common.version} - - - org.onap.policy.common - gson - ${policy.common.version} - - - org.onap.policy.models - policy-models-provider - ${policy.models.version} - - - org.apache.commons - commons-lang3 - - - org.onap.policy.common - utils-test - ${policy.common.version} - test - - - org.assertj - assertj-core - test - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.powermock - powermock-api-mockito2 - test - - - org.powermock - powermock-module-junit4 - test - - - org.awaitility - awaitility - test - - - com.h2database - h2 - test - - - - - - - - src/main/resources - true - - **/version.txt - - - - src/main/resources - false - - **/version.txt - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - 1C - true - false - methods - true - - - - - - diff --git a/tosca-controlloop/postman/HonoluluDTFForum_Postman_collection.json b/tosca-controlloop/postman/HonoluluDTFForum_Postman_collection.json deleted file mode 100644 index 9c4529eaa..000000000 --- a/tosca-controlloop/postman/HonoluluDTFForum_Postman_collection.json +++ /dev/null @@ -1,583 +0,0 @@ -{ - "info": { - "_postman_id": "193b3b58-1daa-4b66-9783-7530cf47356b", - "name": "Tosca POC", - "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" - }, - "item": [ - { - "name": "TOSCA Control Loop Instantiation", - "item": [ - { - "name": "Put instantiation command 1", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "PUT", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\r\n \"orderedState\": \"RUNNING\",\r\n \"controlLoopIdentifierList\": [\r\n {\r\n \"name\": \"PMSHInstance0\",\r\n \"version\": \"1.0.1\"\r\n },\r\n {\r\n \"name\": \"PMSHInstance1\",\r\n \"version\": \"1.0.1\"\r\n }\r\n ]\r\n}\r\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation/command", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation", - "command" - ] - } - }, - "response": [] - }, - { - "name": "Get instantiation by name and version 1", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation?name=name&version=1.001", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ], - "query": [ - { - "key": "name", - "value": "name" - }, - { - "key": "version", - "value": "1.001" - } - ] - } - }, - "response": [] - }, - { - "name": "Delete instantiation by name and version 1", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "DELETE", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation?name=name&version=1.001", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ], - "query": [ - { - "key": "name", - "value": "name" - }, - { - "key": "version", - "value": "1.001" - } - ] - } - }, - "response": [] - }, - { - "name": "Create instantiation 1", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\r\n \"controlLoops\": [\r\n {\r\n \"name\": \"PMSHInstance0\",\r\n \"version\": \"1.0.1\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 0\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c20\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c21\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c22\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c23\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 0 control loop\"\r\n }\r\n ]\r\n },\r\n {\r\n \"name\": \"PMSHInstance1\",\r\n \"version\": \"1.0.1\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 1\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c20\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c21\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c22\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c23\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 1 control loop\"\r\n }\r\n ]\r\n }\r\n ]\r\n}\r\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ] - } - }, - "response": [] - }, - { - "name": "Change instantiation 1", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "PUT", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\r\n \"controlLoops\": [\r\n {\r\n \"name\": \"PMSHInstance0\",\r\n \"version\": \"1.0.1\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 0\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c20\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c21\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy for Control Loop Element for the PMSH instance 0 control loop has been \"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c22\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c23\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 0 control loop\"\r\n }\r\n ]\r\n },\r\n {\r\n \"name\": \"PMSHInstance1\",\r\n \"version\": \"1.0.1\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 1\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c24\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c25\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c26\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c27\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 1 control loop\"\r\n }\r\n ]\r\n }\r\n ]\r\n}\r\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ] - } - }, - "response": [] - } - ] - }, - { - "name": "Get commissioned control loop definition with name and version", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ] - } - }, - "response": [] - }, - { - "name": "Delete commissioned control loop definition", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "" - } - }, - "response": [] - }, - { - "name": "Comission control loop definition", - "protocolProfileBehavior": { - "disabledSystemHeaders": { - "content-type": true - } - }, - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "appiication/yaml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "# ============LICENSE_START=======================================================\n# Copyright (C) 2021 Nordix Foundation.\n# ================================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\n# SPDX-License-Identifier: Apache-2.0\n# ============LICENSE_END=========================================================\n\ntosca_definitions_version: tosca_simple_yaml_1_3\ndata_types:\n onap.datatypes.ToscaConceptIdentifier:\n derived_from: tosca.datatypes.Root\n properties:\n name:\n type: string\n required: true\n version:\n type: string\n required: true\nnode_types:\n org.onap.policy.clamp.controlloop.Participant:\n version: 1.0.1\n derived_from: tosca.nodetypes.Root\n properties:\n provider:\n type: string\n requred: false\n org.onap.policy.clamp.controlloop.ControlLoopElement:\n version: 1.0.1\n derived_from: tosca.nodetypes.Root\n properties:\n provider:\n type: string\n requred: false\n participant_id:\n type: onap.datatypes.ToscaConceptIdentifier\n requred: true\n org.onap.policy.clamp.controlloop.ControlLoop:\n version: 1.0.1\n derived_from: tosca.nodetypes.Root\n properties:\n provider:\n type: string\n requred: false\n elements:\n type: list\n required: true\n entry_schema:\n type: onap.datatypes.ToscaConceptIdentifier\n org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement:\n version: 1.0.1\n derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement\n properties:\n dcae_blueprint_id:\n type: onap.datatypes.ToscaConceptIdentifier\n requred: true\n org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement:\n version: 1.0.1\n derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement\n properties:\n policy_type_id:\n type: onap.datatypes.ToscaConceptIdentifier\n requred: true\n org.onap.policy.clamp.controlloop.CDSControlLoopElement:\n version: 1.0.1\n derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement\n properties:\n cds_blueprint_id:\n type: onap.datatypes.ToscaConceptIdentifier\n requred: true\ntopology_template:\n node_templates:\n org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant:\n version: 2.3.4\n type: org.onap.policy.clamp.controlloop.Participant\n type_version: 1.0.1\n description: Participant for DCAE microservices\n properties:\n provider: ONAP\n org.onap.policy.controlloop.PolicyControlLoopParticipant:\n version: 2.3.1\n type: org.onap.policy.clamp.controlloop.Participant\n type_version: 1.0.1\n description: Participant for DCAE microservices\n properties:\n provider: ONAP\n org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant:\n version: 2.2.1\n type: org.onap.policy.clamp.controlloop.Participant\n type_version: 1.0.1\n description: Participant for DCAE microservices\n properties:\n provider: ONAP\n org.onap.domain.pmsh.PMSH_DCAEMicroservice:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement\n type_version: 1.0.0\n description: Control loop element for the DCAE microservice for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n participant_id:\n name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant\n version: 2.3.4\n dcae_blueprint_id:\n name: org.onap.dcae.blueprints.PMSHBlueprint\n version: 1.0.0\n org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement\n type_version: 1.0.0\n description: Control loop element for the monitoring policy for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n participant_id:\n name: org.onap.policy.controlloop.PolicyControlLoopParticipant\n version: 2.3.1\n policy_type_id:\n name: onap.policies.monitoring.pm-subscription-handler\n version: 1.0.0\n org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement\n type_version: 1.0.0\n description: Control loop element for the operational policy for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n participant_id:\n name: org.onap.policy.controlloop.PolicyControlLoopParticipant\n version: 2.2.1\n policy_type_id:\n name: onap.policies.operational.pm-subscription-handler\n version: 1.0.0\n org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.CDSControlLoopElement\n type_version: 1.0.0\n description: Control loop element for CDS for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n participant_Id:\n name: org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant\n version: 3.2.1\n cds_blueprint_id:\n name: org.onap.ccsdk.cds.PMSHCdsBlueprint\n version: 1.0.0\n org.onap.domain.pmsh.PMSHControlLoopDefinition:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.ControlLoop\n type_version: 1.0.0\n description: Control loop for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n elements:\n - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice\n version: 1.2.3\n - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\n version: 1.2.3\n - name: org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\n version: 1.2.3\n - name: org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\n version: 1.2.3" - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ] - } - }, - "response": [] - }, - { - "name": "Update commissioned control loop definition", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "PUT", - "header": [ - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "tosca_definitions_version: tosca_simple_yaml_1_3\ncapability_types:\n org.onap.EventProducer:\n properties:\n carrier_protocol_type:\n type: string\n required: true\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n data_format:\n type: string\n required: true\n constraints:\n - valid_values:\n - JSON\n - YAML\n - JMS\n event_format:\n type: string\n required: true\n event_format_version:\n type: string\n required: false\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key may be generated\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n version: 0.0.1\n derived_from: tosca.capabilities.Root\n org.onap.EventConsumer:\n properties:\n responding_capability:\n type: string\n required: false\n carrier_protocol_type:\n type: string\n required: true\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n data_format:\n type: string\n required: true\n constraints:\n - valid_values:\n - JSON\n - YAML\n - JMS\n - all valid values should be added here\n event_format:\n type: string\n description: 'examples for event_format: Ves_specification, LinkUp, VnfConfigured,\n etc.'\n required: true\n event_format_version:\n type: string\n description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'\n required: false\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key may be generated\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n version: 0.0.1\n derived_from: tosca.capabilities.Root\nnode_types:\n org.onap.DynamicConfig:\n properties:\n application_name:\n type: string\n description: Value used to tie the config to an application ? should we be\n using a relationship here instead?\n required: true\n application_version:\n type: string\n required: true\n application_provider:\n type: string\n required: false\n data_types:\n type: object\n required: false\n schema:\n type: object\n required: false\n version: 0.0.1\n derived_from: tosca.nodes.Root\n org.onap.APP:\n properties:\n application_name:\n type: string\n description: Human readable name for the application Product\n required: false\n provider:\n type: string\n description: Provider of the application and of the descriptor\n required: true\n application_version:\n type: string\n description: Software version of the application\n required: true\n blueprint_id:\n type: string\n description: A reference to the app blueprint\n required: false\n monitoring_policy:\n type: string\n description: A reference to the monitoring policy\n required: false\n requirements:\n - receive:\n capability: org.onap.EventProducer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0\n - UNBOUNDED\n - send:\n capability: org.onap.EventConsumer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0\n - UNBOUNDED\n version: 0.0.1\n derived_from: tosca.nodes.Root\n org.onap.EventRelay:\n properties:\n event_format:\n type: string\n description: 'examples for event_format: Ves_specification, etc.'\n required: true\n event_format_version:\n type: string\n description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'\n required: true\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key is relayed\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n supported_carrier_protocols:\n type: map\n description: 'A map describing supported carrier protocols and translations.\n The tuples define what protocol combinations are supported on the producer\n and consumer side: e.g. { REST: REST, DMAAP: REST, DMAAP: DMAAP}'\n required: true\n key_schema:\n type: string\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n - all valid values should be added here\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n - all valid values should be added here\n supported_data_formats:\n type: map\n description: 'Is a map describing supported data formats and translation.\n The tuples define what protocol combinations are supported on the producer\n and consumer side: e.g. { JSON: JSON, JMS: JSON, YAML:YAML }'\n required: true\n key_schema:\n type: string\n constraints:\n - valid_values:\n - JSON\n - JMS\n - YAML\n - etc\n - all valid values should be added here\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - JSON\n - JMS\n - YAML\n - etc\n - all valid values should be added here\n requirements:\n - receive:\n capability: org.onap.EventProducer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0\n - UNBOUNDED\n - send:\n capability: org.onap.EventConsumer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0\n - UNBOUNDED\n version: 0.0.1\n derived_from: tosca.nodes.Root\nrelationship_types:\n org.onap.PropagateEvent:\n properties:\n config_keys:\n type: list\n description: The relationship type used on requirements to org.onap.EventProducer\n and org.onap.EventConsumer capabilities. Filters events by specific config_keys\n to be transferred by this relationship. That is, any event with a specific\n config_key found in the list is transferred. If list is not defined or is\n empty, events with all config_keys are transferred.\n required: false\n entry_schema:\n type: string\n version: 0.0.1\n derived_from: tosca.relationships.Root\ntopology_template:\n inputs:\n pm_subscription_topic:\n type: string\n pm_subscription_response_topic:\n type: string\n pm_subscription_handler_blueprint_id:\n type: string\n pm_subscription_operational_policy_id:\n type: string\n pm_subscription_cds_blueprint_id:\n type: string\n enable_tls:\n type: string\n node_templates:\n org.onap.PM_Subscription_Handler:\n type: org.onap.APP\n properties:\n application_name: PM Subscription Handler\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_handler_blueprint_id\n description: Is this a reference to the DCAE Cloudify Blueprint that is\n already stored(or will be stored before CL configuration & instatiation)\n in DCAE Inventory?\n artifact_config:\n enable_tls:\n get_input: enable_tls\n pmsh_publish_topic_name:\n get_input: pm_subscription_topic\n capabilities:\n pm-subscription-event-publisher:\n properties:\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-format\n event_format_version: 1.0.0\n attributes:\n type: org.onap.EventProducer\n occurrences:\n - 0\n - UNBOUNDED\n pm-subscription-event-receiver:\n properties:\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-response-format\n event_format_version: 1.0.0\n relationships:\n - type: tosca.relationships.DependsOn\n - description: any ideas on a better realtionship ? or is it better to\n just use the root realtionship ?\n - target: org.onap.PM_Monitoring_Policy\n attributes:\n type: org.onap.EventConsumer\n occurrences:\n - 0\n - UNBOUNDED\n org.onap.PM_Monitoring_Policy:\n type: org.onap.DynamicConfig\n properties:\n application_name: PM Subscription Handler\n application_version: 1.0.0\n provider: Ericsson\n data_types:\n measurementType:\n type: string\n DN:\n type: string\n nfFilter:\n properties:\n nfNames:\n type: list\n entry_schema: string\n modelInvariantIDs:\n type: list\n entry_schema:\n type: string\n modelVersionIDs:\n type: list\n entry_schema:\n type: string\n measurementGroup:\n properties:\n masurementTypes:\n type: list\n entry_schema:\n type: measurementType\n managedObjectDNsBasic:\n type: list\n entry_schema:\n type: DN\n schema:\n subscription:\n subscriptionName:\n type: string\n required: true\n administrativeState:\n type: string\n required: true\n filebasedGP:\n type: integer\n required: true\n fileLocation:\n type: string\n required: true\n nfFilter:\n type: nfFilter\n measurementGroups:\n type: list\n entry_schema:\n type: measurementGroup\n description: Should I be showing a dependency between PM Subscription Handler\n and the PM Monitoring Policy\n org.onap.PM_Policy:\n type: org.onap.APP\n properties:\n application_name: PM Subscription Operational Policy\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_operational_policy_id\n artifact_config: NOT_DEFINED\n requirements:\n - receive_0:\n capability: pm-subscription-event-publisher\n node: org.onap.PM_Subscription_Handler\n relationship: NOT_DEFINED\n properties:\n config_keys:\n - topic_name:\n get_input: pm_subscription_topic\n - send_0:\n capability: cds-rest-receive\n node: org.onap.CDS\n - receive_1:\n capability: cds-rest-response\n node: org.onap.CDS\n - send_1:\n capability: pm-subscription-event-receiver\n node: org.onap.PM_Subscription_Handler\n relationship: NOT_DEFINED\n properties:\n config_keys:\n - topic_name:\n get_input: pm_subscription_response_topic\n capabilities:\n pm-subscription-response-event-publisher:\n properties:\n type: org.onap.EventProducer\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-response-format\n event_format_version: 1.0.0\n occurrences:\n - 0\n - UNBOUNDED\n org.onap.PM_CDS_Blueprint:\n type: org.onap.APP\n properties:\n application_name: PM Subscription CDS Blueprint\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_cds_blueprint_id\n capabilities:\n cds-rest-receive:\n properties:\n type: org.onap.EventConsumer\n protocol_type: REST\n data_format: JSON\n event_format: cds_action_format\n event_format_version: 1.0.0\n responding_capability: cds-rest-response\n occurrences:\n - 0\n - UNBOUNDED\n cds-rest-response:\n properties:\n type: org.onap.EventProducer\n protocol_type: REST\n data_format: JSON\n event_format: cds_action_response_format\n event_format_version: 1.0.0\n occurrences:\n - 0\n org.onap.controlloop0:\n type: org.onap.APP\n properties:\n application_name: Test Control Loop\n provider: Ericsson\n application_version: 1.0.0\n status: NOT_DEPLOYED\n" - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission/update", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission", - "update" - ] - } - }, - "response": [] - }, - { - "name": "POST ParticipantStatus from PolicyParticipant to DMaaP", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\n \"response\": {\n \"responseTo\": \"3742c95b-9c1f-4f46-8624-83e4655624b7\",\n \"responseStatus\": \"SUCCESS\",\n \"responseMessage\": \"Resonpse Message\"\n },\n \"state\": \"PASSIVE\",\n \"healthStatus\": \"HEALTHY\",\n \"elements\": [\n [\n {\n \"name\": \"PMSHInstance0\",\n \"version\": \"1.0.1\"\n },\n {\n \"709c62b3-8918-41b9-a747-d21eb79c6c21\": {\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c21\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"PolicyParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 0 control loop\"\n },\n \"709c62b3-8918-41b9-a747-d21eb79c6c22\": {\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c22\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"PolicyParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 0 control loop\"\n }\n }\n ],\n [\n {\n \"name\": \"PMSHInstance1\",\n \"version\": \"1.0.1\"\n },\n {\n \"709c62b3-8918-41b9-a747-e21eb79c6c25\": {\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c25\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"PolicyParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 1 control loop\"\n },\n \"709c62b3-8918-41b9-a747-e21eb79c6c26\": {\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c26\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"PolicyParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 1 control loop\"\n }\n }\n ]\n ],\n \"message\": \"Control Loop Elements passivated\",\n \"messageType\": \"PARTICIPANT_STATUS\",\n \"requestId\": \"3742c95b-9c1f-4f46-8624-83e4655624b8\",\n \"timestampMs\": 1612169281148,\n \"participantId\": {\n \"name\": \"PolicyParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"controlLoopId\": null\n}\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "http://localhost:3904/events/POLICY-CLRUNTIME-PARTICIPANT", - "protocol": "http", - "host": [ - "localhost" - ], - "port": "3904", - "path": [ - "events", - "POLICY-CLRUNTIME-PARTICIPANT" - ] - } - }, - "response": [] - }, - { - "name": "POST ParticipantStatus from DCAE to DMaaP", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\n \"response\": {\n \"responseTo\": \"3742c95b-9c1f-4f46-8624-83e4655624b7\",\n \"responseStatus\": \"SUCCESS\",\n \"responseMessage\": \"Resonpse Message\"\n },\n \"state\": \"PASSIVE\",\n \"healthStatus\": \"HEALTHY\",\n \"elements\": [\n [\n {\n \"name\": \"PMSHInstance0\",\n \"version\": \"1.0.1\"\n },\n {\n \"709c62b3-8918-41b9-a747-d21eb79c6c20\": {\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c20\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"DCAEParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"DCAE Control Loop Element for the PMSH instance 0 control loop\"\n }\n }\n ],\n [\n {\n \"name\": \"PMSHInstance1\",\n \"version\": \"1.0.1\"\n },\n {\n \"709c62b3-8918-41b9-a747-e21eb79c6c24\": {\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c24\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"DCAEParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"DCAE Control Loop Element for the PMSH instance 1 control loop\"\n }\n }\n ]\n ],\n \"message\": \"Control Loop Elements passivated\",\n \"messageType\": \"PARTICIPANT_STATUS\",\n \"requestId\": \"3742c95b-9c1f-4f46-8624-83e4655624b8\",\n \"timestampMs\": 1612169281148,\n \"participantId\": {\n \"name\": \"DCAEParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"controlLoopId\": null\n}\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "http://localhost:3904/events/POLICY-CLRUNTIME-PARTICIPANT", - "protocol": "http", - "host": [ - "localhost" - ], - "port": "3904", - "path": [ - "events", - "POLICY-CLRUNTIME-PARTICIPANT" - ] - } - }, - "response": [] - }, - { - "name": "POST ParticipantStatus from CDS to DMaaP", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\n \"response\": {\n \"responseTo\": \"3742c95b-9c1f-4f46-8624-83e4655624b7\",\n \"responseStatus\": \"SUCCESS\",\n \"responseMessage\": \"Resonpse Message\"\n },\n \"state\": \"PASSIVE\",\n \"healthStatus\": \"HEALTHY\",\n \"elements\": [\n [\n {\n \"name\": \"PMSHInstance0\",\n \"version\": \"1.0.1\"\n },\n {\n \"709c62b3-8918-41b9-a747-d21eb79c6c23\": {\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c23\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"CDSParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"CDS Control Loop Element for the PMSH instance 0 control loopp\"\n }\n }\n ],\n [\n {\n \"name\": \"PMSHInstance1\",\n \"version\": \"1.0.1\"\n },\n {\n \"709c62b3-8918-41b9-a747-e21eb79c6c27\": {\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c27\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"CDSParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"CDS Control Loop Element for the PMSH instance 1 control loop\"\n }\n }\n ]\n ],\n \"message\": \"Control Loop Elements passivated\",\n \"messageType\": \"PARTICIPANT_STATUS\",\n \"requestId\": \"3742c95b-9c1f-4f46-8624-83e4655624b8\",\n \"timestampMs\": 1612169281148,\n \"participantId\": {\n \"name\": \"CDSParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"controlLoopId\": null\n}\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "http://localhost:3904/events/POLICY-CLRUNTIME-PARTICIPANT", - "protocol": "http", - "host": [ - "localhost" - ], - "port": "3904", - "path": [ - "events", - "POLICY-CLRUNTIME-PARTICIPANT" - ] - } - }, - "response": [] - }, - { - "name": "POST ParticipantControlLoopUpdate from server to participant", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\n \"response\": {\n \"responseTo\": \"3742c95b-9c1f-4f46-8624-83e4655624b7\",\n \"responseStatus\": \"SUCCESS\",\n \"responseMessage\": \"Resonpse Message\"\n },\n \"state\": \"PASSIVE\",\n \"healthStatus\": \"HEALTHY\",\n \"elements\": [\n [\n {\n \"name\": \"PMSHInstance0\",\n \"version\": \"1.0.1\"\n },\n {\n \"709c62b3-8918-41b9-a747-d21eb79c6c23\": {\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c23\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"CDSParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"CDS Control Loop Element for the PMSH instance 0 control loopp\"\n }\n }\n ],\n [\n {\n \"name\": \"PMSHInstance1\",\n \"version\": \"1.0.1\"\n },\n {\n \"709c62b3-8918-41b9-a747-e21eb79c6c27\": {\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c27\",\n \"definition\": {\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\n \"version\": \"1.2.3\"\n },\n \"participantId\": {\n \"name\": \"CDSParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"state\": \"PASSIVE\",\n \"orderedState\": \"PASSIVE\",\n \"description\": \"CDS Control Loop Element for the PMSH instance 1 control loop\"\n }\n }\n ]\n ],\n \"message\": \"Control Loop Elements passivated\",\n \"messageType\": \"PARTICIPANT_STATUS\",\n \"requestId\": \"3742c95b-9c1f-4f46-8624-83e4655624b8\",\n \"timestampMs\": 1612169281148,\n \"participantId\": {\n \"name\": \"CDSParticipant0\",\n \"version\": \"1.0.0\"\n },\n \"controlLoopId\": null\n}\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "http://localhost:3904/events/POLICY-CLRUNTIME-PARTICIPANT", - "protocol": "http", - "host": [ - "localhost" - ], - "port": "3904", - "path": [ - "events", - "POLICY-CLRUNTIME-PARTICIPANT" - ] - } - }, - "response": [] - } - ] -} \ No newline at end of file diff --git a/tosca-controlloop/postman/Tosca POC.postman_collection.json b/tosca-controlloop/postman/Tosca POC.postman_collection.json deleted file mode 100644 index 6d7c9a3fb..000000000 --- a/tosca-controlloop/postman/Tosca POC.postman_collection.json +++ /dev/null @@ -1,1226 +0,0 @@ -{ - "info": { - "_postman_id": "cd54a2f7-4adc-4d3c-a9d8-41014af06370", - "name": "Tosca POC", - "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" - }, - "item": [ - { - "name": "TOSCA CL Instantiation API", - "item": [ - { - "name": "Create instantiation 1.0.1", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\r\n \"controlLoops\": [\r\n {\r\n \"name\": \"PMSHInstance0\",\r\n \"version\": \"1.0.1\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 0\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c20\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c21\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c22\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c23\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 0 control loop\"\r\n }\r\n ]\r\n },\r\n {\r\n \"name\": \"PMSHInstance1\",\r\n \"version\": \"1.0.1\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 1\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c20\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c21\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c22\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c23\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 1 control loop\"\r\n }\r\n ]\r\n }\r\n ]\r\n}\r\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ] - } - }, - "response": [] - }, - { - "name": "Create instantiation 1.0.2", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\r\n \"controlLoops\": [\r\n {\r\n \"name\": \"PMSHInstance0\",\r\n \"version\": \"1.0.2\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 0\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c20\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c21\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c22\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c23\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 0 control loop\"\r\n }\r\n ]\r\n },\r\n {\r\n \"name\": \"PMSHInstance1\",\r\n \"version\": \"1.0.2\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 1\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c20\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c21\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c22\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c23\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 1 control loop\"\r\n }\r\n ]\r\n }\r\n ]\r\n}\r\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ] - } - }, - "response": [] - }, - { - "name": "Get all instantiations", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ] - } - }, - "response": [] - }, - { - "name": "Get instantiations by name", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation?name=PMSHInstance0", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ], - "query": [ - { - "key": "name", - "value": "PMSHInstance0" - }, - { - "key": "version", - "value": "", - "disabled": true - } - ] - } - }, - "response": [] - }, - { - "name": "Get instantiation by name and version", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation?name=PMSHInstance0&version=1.0.1", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ], - "query": [ - { - "key": "name", - "value": "PMSHInstance0" - }, - { - "key": "version", - "value": "1.0.1" - } - ] - } - }, - "response": [] - }, - { - "name": "Change instantiation", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "PUT", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\r\n \"controlLoops\": [\r\n {\r\n \"name\": \"PMSHInstance0\",\r\n \"version\": \"1.0.2\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 1\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c21\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c22\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c23\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 0 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-d21eb79c6c24\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 0 control loop\"\r\n }\r\n ]\r\n },\r\n {\r\n \"name\": \"PMSHInstance1\",\r\n \"version\": \"1.0.2\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSHControlLoopDefinition\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"PMSH control loop instance 1\",\r\n \"elements\": [\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c25\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_DCAEMicroservice\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"DCAEParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"DCAE Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c26\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Monitoring Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c27\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"PolicyParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"Operational Policy Control Loop Element for the PMSH instance 1 control loop\"\r\n },\r\n {\r\n \"id\": \"709c62b3-8918-41b9-a747-e21eb79c6c28\",\r\n \"definition\": {\r\n \"name\": \"org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\",\r\n \"version\": \"1.2.3\"\r\n },\r\n \"participantId\": {\r\n \"name\": \"CDSParticipant0\",\r\n \"version\": \"1.0.0\"\r\n },\r\n \"state\": \"UNINITIALISED\",\r\n \"orderedState\": \"UNINITIALISED\",\r\n \"description\": \"CDS Control Loop Element for the PMSH instance 1 control loop\"\r\n }\r\n ]\r\n }\r\n ]\r\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ] - } - }, - "response": [] - }, - { - "name": "Change instantiation state", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "PUT", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\r\n \"orderedState\": \"PASSIVE\",\r\n \"controlLoopIdentifierList\": [\r\n {\r\n \"name\": \"PMSHInstance0\",\r\n \"version\": \"1.0.1\"\r\n },\r\n {\r\n \"name\": \"PMSHInstance1\",\r\n \"version\": \"1.0.1\"\r\n }\r\n ]\r\n}\r\n", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation/command", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation", - "command" - ] - } - }, - "response": [] - }, - { - "name": "Delete instantiation PMSHInstance0 1.0.1", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "DELETE", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation?name=PMSHInstance0&version=1.0.1", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ], - "query": [ - { - "key": "name", - "value": "PMSHInstance0" - }, - { - "key": "version", - "value": "1.0.1" - } - ] - } - }, - "response": [] - }, - { - "name": "Delete instantiation PMSHInstance1 1.0.1", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "DELETE", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation?name=PMSHInstance1&version=1.0.1", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ], - "query": [ - { - "key": "name", - "value": "PMSHInstance1" - }, - { - "key": "version", - "value": "1.0.1" - } - ] - } - }, - "response": [] - }, - { - "name": "Delete instantiation PMSHInstance0 1.0.2", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "DELETE", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation?name=PMSHInstance0&version=1.0.2", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ], - "query": [ - { - "key": "name", - "value": "PMSHInstance0" - }, - { - "key": "version", - "value": "1.0.2" - } - ] - } - }, - "response": [] - }, - { - "name": "Delete instantiation PMSHInstance1 1.0.2", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "username", - "value": "healthcheck", - "type": "string" - }, - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - } - ] - }, - "method": "DELETE", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - }, - { - "key": "", - "value": "", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/instantiation?name=PMSHInstance1&version=1.0.2", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "instantiation" - ], - "query": [ - { - "key": "name", - "value": "PMSHInstance1" - }, - { - "key": "version", - "value": "1.0.2" - } - ] - } - }, - "response": [] - } - ] - }, - { - "name": "TOSCA Commissioning", - "item": [ - { - "name": "Get all commissions", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ] - } - }, - "response": [] - }, - { - "name": "Get all commissions by name and version", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission?name=MyTemplate&version=1.0.0", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ], - "query": [ - { - "key": "name", - "value": "MyTemplate" - }, - { - "key": "version", - "value": "1.0.0" - } - ] - } - }, - "response": [] - }, - { - "name": "Get all commissioned partecipants", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission/participants?name=ToscaServiceTemplateSimple&version=1.0.0", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission", - "participants" - ], - "query": [ - { - "key": "name", - "value": "ToscaServiceTemplateSimple" - }, - { - "key": "version", - "value": "1.0.0" - } - ] - } - }, - "response": [] - }, - { - "name": "Get all commissioned control loop definitions", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "GET", - "header": [ - { - "key": "Accept", - "value": "application/json", - "type": "text" - } - ], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission/loop-elements?name=ToscaServiceTemplateSimple&version=1.0.0", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission", - "loop-elements" - ], - "query": [ - { - "key": "name", - "value": "ToscaServiceTemplateSimple" - }, - { - "key": "version", - "value": "1.0.0" - } - ] - } - }, - "response": [] - }, - { - "name": "Comission org.onap.APP", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/yaml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "tosca_definitions_version: tosca_simple_yaml_1_3\nname: ToscaServiceTemplateSimple\nversion: 1.0.0\ncapability_types:\n org.onap.EventProducer:\n properties:\n carrier_protocol_type:\n type: string\n required: true\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n data_format:\n type: string\n required: true\n constraints:\n - valid_values:\n - JSON\n - YAML\n - JMS\n event_format:\n type: string\n required: true\n event_format_version:\n type: string\n required: false\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key may be generated\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n version: 0.0.1\n derived_from: tosca.capabilities.Root\n org.onap.EventConsumer:\n properties:\n responding_capability:\n type: string\n required: false\n carrier_protocol_type:\n type: string\n required: true\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n data_format:\n type: string\n required: true\n constraints:\n - valid_values:\n - JSON\n - YAML\n - JMS\n - all valid values should be added here\n event_format:\n type: string\n description: 'examples for event_format: Ves_specification, LinkUp, VnfConfigured,\n etc.'\n required: true\n event_format_version:\n type: string\n description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'\n required: false\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key may be generated\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n version: 0.0.1\n derived_from: tosca.capabilities.Root\nnode_types:\n org.onap.DynamicConfig:\n properties:\n application_name:\n type: string\n description: Value used to tie the config to an application ? should we be\n using a relationship here instead?\n required: true\n application_version:\n type: string\n required: true\n application_provider:\n type: string\n required: false\n data_types:\n type: object\n required: false\n schema:\n type: object\n required: false\n version: 0.0.1\n derived_from: tosca.nodes.Root\n org.onap.APP:\n properties:\n application_name:\n type: string\n description: Human readable name for the application Product\n required: false\n provider:\n type: string\n description: Provider of the application and of the descriptor\n required: true\n application_version:\n type: string\n description: Software version of the application\n required: true\n blueprint_id:\n type: string\n description: A reference to the app blueprint\n required: false\n monitoring_policy:\n type: string\n description: A reference to the monitoring policy\n required: false\n requirements:\n - receive:\n capability: org.onap.EventProducer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0.0\n - UNBOUNDED\n version: 0.0.0\n - send:\n capability: org.onap.EventConsumer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0.0\n - UNBOUNDED\n version: 0.0.0\n version: 0.0.1\n derived_from: tosca.nodes.Root\n org.onap.EventRelay:\n properties:\n event_format:\n type: string\n description: 'examples for event_format: Ves_specification, etc.'\n required: true\n event_format_version:\n type: string\n description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'\n required: true\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key is relayed\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n supported_carrier_protocols:\n type: map\n description: 'A map describing supported carrier protocols and translations.\n The tuples define what protocol combinations are supported on the producer\n and consumer side: e.g. { REST: REST, DMAAP: REST, DMAAP: DMAAP}'\n required: true\n key_schema:\n type: string\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n - all valid values should be added here\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n - all valid values should be added here\n supported_data_formats:\n type: map\n description: 'Is a map describing supported data formats and translation.\n The tuples define what protocol combinations are supported on the producer\n and consumer side: e.g. { JSON: JSON, JMS: JSON, YAML:YAML }'\n required: true\n key_schema:\n type: string\n constraints:\n - valid_values:\n - JSON\n - JMS\n - YAML\n - etc\n - all valid values should be added here\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - JSON\n - JMS\n - YAML\n - etc\n - all valid values should be added here\n requirements:\n - receive:\n capability: org.onap.EventProducer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0.0\n - UNBOUNDED\n version: 0.0.0\n - send:\n capability: org.onap.EventConsumer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0.0\n - UNBOUNDED\n version: 0.0.0\n version: 0.0.1\n derived_from: tosca.nodes.Root\nrelationship_types:\n org.onap.PropagateEvent:\n properties:\n config_keys:\n type: list\n description: The relationship type used on requirements to org.onap.EventProducer\n and org.onap.EventConsumer capabilities. Filters events by specific config_keys\n to be transferred by this relationship. That is, any event with a specific\n config_key found in the list is transferred. If list is not defined or is\n empty, events with all config_keys are transferred.\n required: false\n entry_schema:\n type: string\n version: 0.0.1\n derived_from: tosca.relationships.Root\ntopology_template:\n inputs:\n pm_subscription_topic:\n type: string\n pm_subscription_response_topic:\n type: string\n pm_subscription_handler_blueprint_id:\n type: string\n pm_subscription_operational_policy_id:\n type: string\n pm_subscription_cds_blueprint_id:\n type: string\n enable_tls:\n type: string\n node_templates:\n org.onap.PM_Subscription_Handler:\n type: org.onap.APP\n properties:\n application_name: PM Subscription Handler\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_handler_blueprint_id\n description: Is this a reference to the DCAE Cloudify Blueprint that is\n already stored(or will be stored before CL configuration & instatiation)\n in DCAE Inventory?\n artifact_config:\n enable_tls:\n get_input: enable_tls\n pmsh_publish_topic_name:\n get_input: pm_subscription_topic\n capabilities:\n pm-subscription-event-publisher:\n properties:\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-format\n event_format_version: 1.0.0\n attributes:\n type: org.onap.EventProducer\n occurrences:\n - 0.0\n - UNBOUNDED\n version: 0.0.0\n pm-subscription-event-receiver:\n properties:\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-response-format\n event_format_version: 1.0.0\n relationships:\n - type: tosca.relationships.DependsOn\n - description: any ideas on a better realtionship ? or is it better to\n just use the root realtionship ?\n - target: org.onap.PM_Monitoring_Policy\n attributes:\n type: org.onap.EventConsumer\n occurrences:\n - 0.0\n - UNBOUNDED\n version: 0.0.0\n version: 0.0.0\n org.onap.PM_Monitoring_Policy:\n type: org.onap.DynamicConfig\n properties:\n application_name: PM Subscription Handler\n application_version: 1.0.0\n provider: Ericsson\n data_types:\n measurementType:\n type: string\n DN:\n type: string\n nfFilter:\n properties:\n nfNames:\n type: list\n entry_schema: string\n modelInvariantIDs:\n type: list\n entry_schema:\n type: string\n modelVersionIDs:\n type: list\n entry_schema:\n type: string\n measurementGroup:\n properties:\n masurementTypes:\n type: list\n entry_schema:\n type: measurementType\n managedObjectDNsBasic:\n type: list\n entry_schema:\n type: DN\n schema:\n subscription:\n subscriptionName:\n type: string\n required: true\n administrativeState:\n type: string\n required: true\n filebasedGP:\n type: integer\n required: true\n fileLocation:\n type: string\n required: true\n nfFilter:\n type: nfFilter\n measurementGroups:\n type: list\n entry_schema:\n type: measurementGroup\n version: 0.0.0\n description: Should I be showing a dependency between PM Subscription Handler\n and the PM Monitoring Policy\n org.onap.PM_Policy:\n type: org.onap.APP\n properties:\n application_name: PM Subscription Operational Policy\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_operational_policy_id\n artifact_config: NOT_DEFINED\n requirements:\n - receive_0:\n capability: pm-subscription-event-publisher\n node: org.onap.PM_Subscription_Handler\n relationship: NOT_DEFINED\n properties:\n config_keys:\n - topic_name:\n get_input: pm_subscription_topic\n version: 0.0.0\n - send_0:\n capability: cds-rest-receive\n node: org.onap.CDS\n version: 0.0.0\n - receive_1:\n capability: cds-rest-response\n node: org.onap.CDS\n version: 0.0.0\n - send_1:\n capability: pm-subscription-event-receiver\n node: org.onap.PM_Subscription_Handler\n relationship: NOT_DEFINED\n properties:\n config_keys:\n - topic_name:\n get_input: pm_subscription_response_topic\n version: 0.0.0\n capabilities:\n pm-subscription-response-event-publisher:\n properties:\n type: org.onap.EventProducer\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-response-format\n event_format_version: 1.0.0\n occurrences:\n - 0.0\n - UNBOUNDED\n version: 0.0.0\n version: 0.0.0\n org.onap.PM_CDS_Blueprint:\n type: org.onap.APP\n properties:\n application_name: PM Subscription CDS Blueprint\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_cds_blueprint_id\n capabilities:\n cds-rest-receive:\n properties:\n type: org.onap.EventConsumer\n protocol_type: REST\n data_format: JSON\n event_format: cds_action_format\n event_format_version: 1.0.0\n responding_capability: cds-rest-response\n occurrences:\n - 0.0\n - UNBOUNDED\n version: 0.0.0\n cds-rest-response:\n properties:\n type: org.onap.EventProducer\n protocol_type: REST\n data_format: JSON\n event_format: cds_action_response_format\n event_format_version: 1.0.0\n occurrences:\n - 0.0\n version: 0.0.0\n version: 0.0.0\n org.onap.controlloop0:\n type: org.onap.APP\n properties:\n application_name: Test Control Loop\n provider: Ericsson\n application_version: 1.0.0\n status: NOT_DEPLOYED\n version: 0.0.0\n", - "options": { - "raw": { - "language": "text" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ] - } - }, - "response": [] - }, - { - "name": "Comission ControlLoop", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/yaml", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "tosca_definitions_version: tosca_simple_yaml_1_3\nname: ToscaServiceTemplateSimple\nversion: 1.0.0\ndata_types:\n onap.datatypes.ToscaConceptIdentifier:\n derived_from: tosca.datatypes.Root\n properties:\n name:\n type: string\n required: true\n version:\n type: string\n required: true\nnode_types:\n org.onap.policy.clamp.controlloop.Participant:\n version: 1.0.1\n derived_from: tosca.nodetypes.Root\n properties:\n provider:\n type: string\n requred: false\n org.onap.policy.clamp.controlloop.ControlLoopElement:\n version: 1.0.1\n derived_from: tosca.nodetypes.Root\n properties:\n provider:\n type: string\n requred: false\n participant_id:\n type: onap.datatypes.ToscaConceptIdentifier\n requred: true\n org.onap.policy.clamp.controlloop.ControlLoop:\n version: 1.0.1\n derived_from: tosca.nodetypes.Root\n properties:\n provider:\n type: string\n requred: false\n elements:\n type: list\n required: true\n entry_schema:\n type: onap.datatypes.ToscaConceptIdentifier\n org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement:\n version: 1.0.1\n derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement\n properties:\n dcae_blueprint_id:\n type: onap.datatypes.ToscaConceptIdentifier\n requred: true\n org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement:\n version: 1.0.1\n derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement\n properties:\n policy_type_id:\n type: onap.datatypes.ToscaConceptIdentifier\n requred: true\n org.onap.policy.clamp.controlloop.CDSControlLoopElement:\n version: 1.0.1\n derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement\n properties:\n cds_blueprint_id:\n type: onap.datatypes.ToscaConceptIdentifier\n requred: true\ntopology_template:\n node_templates:\n org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant:\n version: 2.3.4\n type: org.onap.policy.clamp.controlloop.Participant\n type_version: 1.0.1\n description: Participant for DCAE microservices\n properties:\n provider: ONAP\n org.onap.policy.controlloop.MonitoringPolicyControlLoopParticipant:\n version: 2.3.1\n type: org.onap.policy.clamp.controlloop.Participant\n type_version: 1.0.1\n description: Participant for DCAE microservices\n properties:\n provider: ONAP\n org.onap.policy.controlloop.OperationalPolicyControlLoopParticipant:\n version: 3.2.1\n type: org.onap.policy.clamp.controlloop.Participant\n type_version: 1.0.1\n description: Participant for DCAE microservices\n properties:\n provider: ONAP\n org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant:\n version: 2.2.1\n type: org.onap.policy.clamp.controlloop.Participant\n type_version: 1.0.1\n description: Participant for DCAE microservices\n properties:\n provider: ONAP\n org.onap.domain.pmsh.PMSH_DCAEMicroservice:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement\n type_version: 1.0.0\n description: Control loop element for the DCAE microservice for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n participant_id:\n name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant\n version: 2.3.4\n dcae_blueprint_id:\n name: org.onap.dcae.blueprints.PMSHBlueprint\n version: 1.0.0\n org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement\n type_version: 1.0.0\n description: Control loop element for the monitoring policy for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n participant_id:\n name: org.onap.policy.controlloop.MonitoringPolicyControlLoopParticipant\n version: 2.3.1\n policy_type_id:\n name: onap.policies.monitoring.pm-subscription-handler\n version: 1.0.0\n org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement\n type_version: 1.0.0\n description: Control loop element for the operational policy for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n participant_id:\n name: org.onap.policy.controlloop.OperationalPolicyControlLoopParticipant\n version: 2.2.1\n policy_type_id:\n name: onap.policies.operational.pm-subscription-handler\n version: 1.0.0\n org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.ControlLoopElement\n type_version: 1.0.0\n description: Control loop element for CDS for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n participant_Id:\n name: org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant\n version: 3.2.1\n cds_blueprint_id:\n name: org.onap.ccsdk.cds.PMSHCdsBlueprint\n version: 1.0.0\n org.onap.domain.pmsh.PMSHControlLoopDefinition:\n version: 1.2.3\n type: org.onap.policy.clamp.controlloop.ControlLoop\n type_version: 1.0.0\n description: Control loop for Performance Management Subscription Handling\n properties:\n provider: Ericsson\n elements:\n - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice\n version: 1.2.3\n - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement\n version: 1.2.3\n - name: org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement\n version: 1.2.3\n - name: org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement\n version: 1.2.3\n", - "options": { - "raw": { - "language": "text" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ] - } - }, - "response": [] - } - ] - }, - { - "name": "Get commissioned control loop definition with name and version", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ] - } - }, - "response": [] - }, - { - "name": "Get instantiated control loops", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ] - } - }, - "response": [] - }, - { - "name": "Delete commissioned control loop definition", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "" - } - }, - "response": [] - }, - { - "name": "Comission control loop definition", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "POST", - "header": [ - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - }, - { - "key": "Accept", - "value": "application/json", - "type": "text" - }, - { - "key": "Content-Type", - "value": "application/json", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "{\n \"name\": \"Hello\"\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission" - ] - } - }, - "response": [] - }, - { - "name": "Update commissioned control loop definition", - "request": { - "auth": { - "type": "basic", - "basic": [ - { - "key": "password", - "value": "zb!XztG34", - "type": "string" - }, - { - "key": "username", - "value": "healthcheck", - "type": "string" - } - ] - }, - "method": "PUT", - "header": [ - { - "key": "X-ONAP-RequestID", - "value": "709c62b3-8918-41b9-a747-d21eb79c6c20", - "type": "text" - } - ], - "body": { - "mode": "raw", - "raw": "tosca_definitions_version: tosca_simple_yaml_1_3\ncapability_types:\n org.onap.EventProducer:\n properties:\n carrier_protocol_type:\n type: string\n required: true\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n data_format:\n type: string\n required: true\n constraints:\n - valid_values:\n - JSON\n - YAML\n - JMS\n event_format:\n type: string\n required: true\n event_format_version:\n type: string\n required: false\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key may be generated\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n version: 0.0.1\n derived_from: tosca.capabilities.Root\n org.onap.EventConsumer:\n properties:\n responding_capability:\n type: string\n required: false\n carrier_protocol_type:\n type: string\n required: true\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n data_format:\n type: string\n required: true\n constraints:\n - valid_values:\n - JSON\n - YAML\n - JMS\n - all valid values should be added here\n event_format:\n type: string\n description: 'examples for event_format: Ves_specification, LinkUp, VnfConfigured,\n etc.'\n required: true\n event_format_version:\n type: string\n description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'\n required: false\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key may be generated\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n version: 0.0.1\n derived_from: tosca.capabilities.Root\nnode_types:\n org.onap.DynamicConfig:\n properties:\n application_name:\n type: string\n description: Value used to tie the config to an application ? should we be\n using a relationship here instead?\n required: true\n application_version:\n type: string\n required: true\n application_provider:\n type: string\n required: false\n data_types:\n type: object\n required: false\n schema:\n type: object\n required: false\n version: 0.0.1\n derived_from: tosca.nodes.Root\n org.onap.APP:\n properties:\n application_name:\n type: string\n description: Human readable name for the application Product\n required: false\n provider:\n type: string\n description: Provider of the application and of the descriptor\n required: true\n application_version:\n type: string\n description: Software version of the application\n required: true\n blueprint_id:\n type: string\n description: A reference to the app blueprint\n required: false\n monitoring_policy:\n type: string\n description: A reference to the monitoring policy\n required: false\n requirements:\n - receive:\n capability: org.onap.EventProducer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0\n - UNBOUNDED\n - send:\n capability: org.onap.EventConsumer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0\n - UNBOUNDED\n version: 0.0.1\n derived_from: tosca.nodes.Root\n org.onap.EventRelay:\n properties:\n event_format:\n type: string\n description: 'examples for event_format: Ves_specification, etc.'\n required: true\n event_format_version:\n type: string\n description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'\n required: true\n config_keys:\n type: list\n required: false\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - all valid values should be added here\n - if not specified, events of any config key is relayed\n - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,\n etc.'\n supported_carrier_protocols:\n type: map\n description: 'A map describing supported carrier protocols and translations.\n The tuples define what protocol combinations are supported on the producer\n and consumer side: e.g. { REST: REST, DMAAP: REST, DMAAP: DMAAP}'\n required: true\n key_schema:\n type: string\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n - all valid values should be added here\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - DMAAP_message_router\n - SOMETHING_ELSE\n - REST\n - all valid values should be added here\n supported_data_formats:\n type: map\n description: 'Is a map describing supported data formats and translation.\n The tuples define what protocol combinations are supported on the producer\n and consumer side: e.g. { JSON: JSON, JMS: JSON, YAML:YAML }'\n required: true\n key_schema:\n type: string\n constraints:\n - valid_values:\n - JSON\n - JMS\n - YAML\n - etc\n - all valid values should be added here\n entry_schema:\n type: string\n constraints:\n - valid_values:\n - JSON\n - JMS\n - YAML\n - etc\n - all valid values should be added here\n requirements:\n - receive:\n capability: org.onap.EventProducer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0\n - UNBOUNDED\n - send:\n capability: org.onap.EventConsumer\n relationship: org.onap.PropagateEvent\n occurrences:\n - 0\n - UNBOUNDED\n version: 0.0.1\n derived_from: tosca.nodes.Root\nrelationship_types:\n org.onap.PropagateEvent:\n properties:\n config_keys:\n type: list\n description: The relationship type used on requirements to org.onap.EventProducer\n and org.onap.EventConsumer capabilities. Filters events by specific config_keys\n to be transferred by this relationship. That is, any event with a specific\n config_key found in the list is transferred. If list is not defined or is\n empty, events with all config_keys are transferred.\n required: false\n entry_schema:\n type: string\n version: 0.0.1\n derived_from: tosca.relationships.Root\ntopology_template:\n inputs:\n pm_subscription_topic:\n type: string\n pm_subscription_response_topic:\n type: string\n pm_subscription_handler_blueprint_id:\n type: string\n pm_subscription_operational_policy_id:\n type: string\n pm_subscription_cds_blueprint_id:\n type: string\n enable_tls:\n type: string\n node_templates:\n org.onap.PM_Subscription_Handler:\n type: org.onap.APP\n properties:\n application_name: PM Subscription Handler\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_handler_blueprint_id\n description: Is this a reference to the DCAE Cloudify Blueprint that is\n already stored(or will be stored before CL configuration & instatiation)\n in DCAE Inventory?\n artifact_config:\n enable_tls:\n get_input: enable_tls\n pmsh_publish_topic_name:\n get_input: pm_subscription_topic\n capabilities:\n pm-subscription-event-publisher:\n properties:\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-format\n event_format_version: 1.0.0\n attributes:\n type: org.onap.EventProducer\n occurrences:\n - 0\n - UNBOUNDED\n pm-subscription-event-receiver:\n properties:\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-response-format\n event_format_version: 1.0.0\n relationships:\n - type: tosca.relationships.DependsOn\n - description: any ideas on a better realtionship ? or is it better to\n just use the root realtionship ?\n - target: org.onap.PM_Monitoring_Policy\n attributes:\n type: org.onap.EventConsumer\n occurrences:\n - 0\n - UNBOUNDED\n org.onap.PM_Monitoring_Policy:\n type: org.onap.DynamicConfig\n properties:\n application_name: PM Subscription Handler\n application_version: 1.0.0\n provider: Ericsson\n data_types:\n measurementType:\n type: string\n DN:\n type: string\n nfFilter:\n properties:\n nfNames:\n type: list\n entry_schema: string\n modelInvariantIDs:\n type: list\n entry_schema:\n type: string\n modelVersionIDs:\n type: list\n entry_schema:\n type: string\n measurementGroup:\n properties:\n masurementTypes:\n type: list\n entry_schema:\n type: measurementType\n managedObjectDNsBasic:\n type: list\n entry_schema:\n type: DN\n schema:\n subscription:\n subscriptionName:\n type: string\n required: true\n administrativeState:\n type: string\n required: true\n filebasedGP:\n type: integer\n required: true\n fileLocation:\n type: string\n required: true\n nfFilter:\n type: nfFilter\n measurementGroups:\n type: list\n entry_schema:\n type: measurementGroup\n description: Should I be showing a dependency between PM Subscription Handler\n and the PM Monitoring Policy\n org.onap.PM_Policy:\n type: org.onap.APP\n properties:\n application_name: PM Subscription Operational Policy\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_operational_policy_id\n artifact_config: NOT_DEFINED\n requirements:\n - receive_0:\n capability: pm-subscription-event-publisher\n node: org.onap.PM_Subscription_Handler\n relationship: NOT_DEFINED\n properties:\n config_keys:\n - topic_name:\n get_input: pm_subscription_topic\n - send_0:\n capability: cds-rest-receive\n node: org.onap.CDS\n - receive_1:\n capability: cds-rest-response\n node: org.onap.CDS\n - send_1:\n capability: pm-subscription-event-receiver\n node: org.onap.PM_Subscription_Handler\n relationship: NOT_DEFINED\n properties:\n config_keys:\n - topic_name:\n get_input: pm_subscription_response_topic\n capabilities:\n pm-subscription-response-event-publisher:\n properties:\n type: org.onap.EventProducer\n carrier_protocol_type: DMAAP_message_router\n data_format: JSON\n event_format: pm-subscription-event-response-format\n event_format_version: 1.0.0\n occurrences:\n - 0\n - UNBOUNDED\n org.onap.PM_CDS_Blueprint:\n type: org.onap.APP\n properties:\n application_name: PM Subscription CDS Blueprint\n provider: Ericsson\n application_version: 1.0.0\n artifact_id:\n get_input: pm_subscription_cds_blueprint_id\n capabilities:\n cds-rest-receive:\n properties:\n type: org.onap.EventConsumer\n protocol_type: REST\n data_format: JSON\n event_format: cds_action_format\n event_format_version: 1.0.0\n responding_capability: cds-rest-response\n occurrences:\n - 0\n - UNBOUNDED\n cds-rest-response:\n properties:\n type: org.onap.EventProducer\n protocol_type: REST\n data_format: JSON\n event_format: cds_action_response_format\n event_format_version: 1.0.0\n occurrences:\n - 0\n org.onap.controlloop0:\n type: org.onap.APP\n properties:\n application_name: Test Control Loop\n provider: Ericsson\n application_version: 1.0.0\n status: NOT_DEPLOYED\n" - }, - "url": { - "raw": "localhost:6969/onap/controlloop/v2/commission/update", - "host": [ - "localhost" - ], - "port": "6969", - "path": [ - "onap", - "controlloop", - "v2", - "commission", - "update" - ] - } - }, - "response": [] - }, - { - "name": "POST ParticipantStatus to DMaaP", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{ \n \"state\":\"TEST\",\n \"messageType\":\"PARTICIPANT_STATUS\",\n \"requestId\":\"22fa87e9-0ee7-446e-b4f2-c60724ff38b3\",\n \"timestampMs\":1611045725322\n}", - "options": { - "raw": { - "language": "json" - } - } - }, - "url": { - "raw": "http://localhost:3904/events/POLICY-CLRUNTIME-PARTICIPANT", - "protocol": "http", - "host": [ - "localhost" - ], - "port": "3904", - "path": [ - "events", - "POLICY-CLRUNTIME-PARTICIPANT" - ] - } - }, - "response": [] - } - ] -} \ No newline at end of file -- 2.16.6