Move tosca-controlloop src directries to new modulestosca-poc

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 <liam.fallon@est.tech>

333 files changed, 141 insertions, 2451 deletions

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
index aa8b720bc..aa8b720bc 100644
--- 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
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
index 05b913b22..05b913b22 100644
--- 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
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
index b110a4362..b110a4362 100644
--- 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
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
index 1bbe5662f..1bbe5662f 100644
--- 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
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
index 3ef3d4cb0..3ef3d4cb0 100644
--- 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
diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/KubernetesHelm.yaml b/common/src/main/resources/examples/controlloop/KubernetesHelm.yaml
index 2a5f76082..2a5f76082 100644
--- a/tosca-controlloop/common/src/main/resources/examples/controlloop/KubernetesHelm.yaml
+++ b/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
index 9118e9a6f..9118e9a6f 100644
--- 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
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
index e90ded1c6..e90ded1c6 100644
--- a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSH/consul_url.txt
+++ b/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
index 7cdc6d5b9..7cdc6d5b9 100644
--- 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
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
index 5b64b5b6f..5b64b5b6f 100644
--- 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
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
index 6021f36bc..6021f36bc 100644
--- 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
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
index e282bf5ba..e282bf5ba 100644
--- 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
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
index 6bd681d71..6bd681d71 100644
--- 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
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
index faf579012..faf579012 100644
--- 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
diff --git a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSubscriptionHandling.yaml b/common/src/main/resources/examples/controlloop/PMSubscriptionHandling.yaml
index f9f97420a..f9f97420a 100644
--- a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSubscriptionHandling.yaml
+++ b/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
index 51e369696..51e369696 100644
--- a/tosca-controlloop/common/src/main/resources/examples/controlloop/PMSubscriptionHandling_GuilinFormat.yaml
+++ b/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
index 96ea133c2..96ea133c2 100644
--- 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
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
index 4f29e5635..4f29e5635 100644
--- 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
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
index 4629f6f75..4629f6f75 100644
--- 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
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
index 5f96cd5df..5f96cd5df 100644
--- 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
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
index d743f499f..d743f499f 100644
--- 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
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
index 3c1688582..3c1688582 100644
--- 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
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
index 845bc8df0..845bc8df0 100644
--- 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
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
index 1602fb6eb..1602fb6eb 100644
--- 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
diff --git a/tosca-controlloop/common/src/test/resources/demo/Notes.txt b/common/src/test/resources/demo/Notes.txt
index 21be91449..21be91449 100644
--- a/tosca-controlloop/common/src/test/resources/demo/Notes.txt
+++ b/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
index 0b4c1f2ce..0b4c1f2ce 100644
--- a/tosca-controlloop/common/src/test/resources/demo/config/DEMO.postman_collection.json
+++ b/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
index 48e89c5dc..48e89c5dc 100644
--- a/tosca-controlloop/common/src/test/resources/demo/config/PolicyAPIConfig.json
+++ b/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
index f02fbdd23..f02fbdd23 100644
--- a/tosca-controlloop/common/src/test/resources/demo/config/PolicyParticipantConfig.json
+++ b/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
index 2c0127b16..2c0127b16 100644
--- a/tosca-controlloop/common/src/test/resources/demo/config/RuntimeConfig.json
+++ b/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
index 4ef9bdcd9..4ef9bdcd9 100644
--- 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
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
index 166f1e48f..166f1e48f 100644
--- 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
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
index d0d79274c..d0d79274c 100644
--- 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
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
index 83f062c74..83f062c74 100644
--- 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
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
index 91f90275e..91f90275e 100644
--- 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
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
index ff0d553af..ff0d553af 100644
--- 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
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
index 8edcc3c11..8edcc3c11 100644
--- 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
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
index 3130b6c2f..3130b6c2f 100644
--- 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
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
index 0cf41c9cd..0cf41c9cd 100644
--- 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
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
index 1af32660d..1af32660d 100644
--- 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
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
index 3a7b21fa1..3a7b21fa1 100644
--- 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
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
index a69f96f85..a69f96f85 100644
--- 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
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
index c5ce99677..c5ce99677 100644
--- 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
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
index cac405abd..cac405abd 100644
--- 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
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
index 911a52089..911a52089 100644
--- 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
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
index 69b565266..69b565266 100644
--- 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
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
index b97f9ed69..b97f9ed69 100644
--- 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
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
index 8a06cbf1e..8a06cbf1e 100644
--- 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
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
index 520e9b864..520e9b864 100644
--- 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
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
index e82956f93..e82956f93 100644
--- 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
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
index 6b075278c..6b075278c 100644
--- 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
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
index c6bbd81d6..c6bbd81d6 100644
--- 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
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
index 033843e75..033843e75 100644
--- 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
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
index 1a9a891f6..1a9a891f6 100644
--- 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
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
index ed729a64b..ed729a64b 100644
--- 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
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
index e472e15fe..e472e15fe 100644
--- 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
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
index 3ca4d3d34..3ca4d3d34 100644
--- 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
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
index 77a50bd36..77a50bd36 100644
--- 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
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
index 4c771b405..4c771b405 100644
--- 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
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
index f014529b3..f014529b3 100644
--- 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
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
index 5f5150077..5f5150077 100644
--- 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
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
index 5b9284243..5b9284243 100644
--- 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
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
index 2bd09c632..2bd09c632 100644
--- 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
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
index 199ac8ee1..199ac8ee1 100644
--- 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
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
index 6363db8d2..6363db8d2 100644
--- 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
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
index 71b7ab92c..71b7ab92c 100644
--- 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
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
index d932f29ac..d932f29ac 100644
--- 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
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
index 0addc25ad..0addc25ad 100644
--- 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
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
index 908c91417..908c91417 100644
--- 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
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
index 2264f6dc2..2264f6dc2 100644
--- 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
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
index c865b76ab..c865b76ab 100644
--- 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
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
index 54eaca00e..54eaca00e 100644
--- 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
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
index 1eb80db09..1eb80db09 100644
--- 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
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
index b90ccba5b..b90ccba5b 100644
--- 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
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
index c4eb364d3..c4eb364d3 100644
--- 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
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
index 2082ff41c..2082ff41c 100644
--- 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
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
index e6bc92efb..e6bc92efb 100644
--- 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
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
index 74dd40034..74dd40034 100644
--- 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
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
index 16c302f94..16c302f94 100644
--- 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
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
index 032d655e3..032d655e3 100644
--- 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
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
index 01062b046..01062b046 100644
--- 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
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
index 7eedd245b..7eedd245b 100644
--- 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
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
index 5c96df6f1..5c96df6f1 100644
--- 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
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
index 9e21b216b..9e21b216b 100644
--- 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
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
index f5d094f9e..f5d094f9e 100644
--- 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
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
index 96b63a23d..96b63a23d 100644
--- 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
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
index 7a86a49dc..7a86a49dc 100644
--- 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
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
index d4bc9777a..d4bc9777a 100644
--- 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
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
index d1e3dcfcc..d1e3dcfcc 100644
--- 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
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
index d1ddbf4e6..d1ddbf4e6 100644
--- 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
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
index 6ea07be76..6ea07be76 100644
--- 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
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
index 06d6ecf77..06d6ecf77 100644
--- 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
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
index 4397bf158..4397bf158 100644
--- 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
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
index 1cc356627..1cc356627 100644
--- 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
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
index d27d3a22c..d27d3a22c 100644
--- 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
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
index dfbc25d1b..dfbc25d1b 100644
--- 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
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
index 301f9acc0..301f9acc0 100644
--- 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
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
index 235532681..235532681 100644
--- 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
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
index 9b5722bce..9b5722bce 100644
--- 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
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
index 299a580d3..299a580d3 100644
--- 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
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
index 6bda3b736..6bda3b736 100644
--- 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
diff --git a/tosca-controlloop/models/src/test/resources/META-INF/persistence.xml b/models/src/test/resources/META-INF/persistence.xml
index 078d534be..078d534be 100644
--- a/tosca-controlloop/models/src/test/resources/META-INF/persistence.xml
+++ b/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
index 33a63e604..33a63e604 100644
--- a/tosca-controlloop/models/src/test/resources/json/ControlLoopElementNoOrderedState.json
+++ b/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
index 6bff97580..6bff97580 100644
--- a/tosca-controlloop/models/src/test/resources/json/ControlLoopNoOrderedState.json
+++ b/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
index ae19e560d..ae19e560d 100644
--- a/tosca-controlloop/models/src/test/resources/providers/TestClElementStatistics.json
+++ b/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
index fedda9600..fedda9600 100644
--- a/tosca-controlloop/models/src/test/resources/providers/TestControlLoops.json
+++ b/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
index c6965ce62..c6965ce62 100644
--- a/tosca-controlloop/models/src/test/resources/providers/TestParticipant.json
+++ b/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
index 5cf626816..5cf626816 100644
--- a/tosca-controlloop/models/src/test/resources/providers/TestParticipantStatistics.json
+++ b/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
index 2d6bd0753..2d6bd0753 100644
--- a/tosca-controlloop/models/src/test/resources/providers/UpdateControlLoops.json
+++ b/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 @@
     <artifactId>policy-clamp-participant-impl-dcae</artifactId>
     <name>${project.artifactId}</name>
     <description>DCAE participant, that allows DCAE to partake in control loops</description>
+
+    <properties>
+        <mockserver.version>5.11.2</mockserver.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-netty</artifactId>
+            <version>${mockserver.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-client-java</artifactId>
+            <version>${mockserver.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
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
index b2d0b61d0..b2d0b61d0 100644
--- 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
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
index eb805054d..eb805054d 100644
--- 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
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
index cd84a2feb..cd84a2feb 100644
--- 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
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
index 96677f320..96677f320 100644
--- 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
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
index 1963e38b1..1963e38b1 100644
--- 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
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
index afaf1c754..afaf1c754 100644
--- 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
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
index 8d9bef98c..8d9bef98c 100644
--- 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
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
index beb273086..beb273086 100644
--- 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
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
index 2b47a2c13..2b47a2c13 100644
--- 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
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
index d485895cf..d485895cf 100644
--- 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
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
index 0bf382ab1..0bf382ab1 100644
--- 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
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
index 01a514f43..01a514f43 100644
--- 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
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
index da7360a9b..da7360a9b 100644
--- 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
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
index d84270500..d84270500 100644
--- 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
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
index 863c135d5..863c135d5 100644
--- 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
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
index dbd67585f..dbd67585f 100644
--- 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
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
index 040b33f5e..040b33f5e 100644
--- 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
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
index bcfaf8bb9..bcfaf8bb9 100644
--- 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
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
index 058a3dae4..058a3dae4 100644
--- 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
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
index edb429322..edb429322 100644
--- 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
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
index c3cc8b755..c3cc8b755 100644
--- 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
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
index f779f3a57..f779f3a57 100644
--- 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
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
index 1903868e2..1903868e2 100644
--- 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
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
index 1035ccb67..1035ccb67 100644
--- 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
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
index 1ee2955b9..1ee2955b9 100644
--- 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
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
index 7a73a41bf..7a73a41bf 100644
--- 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
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
index a4258622d..a4258622d 100644
--- 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
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
index 789fc7bbd..789fc7bbd 100644
--- 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
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
index 789fc7bbd..789fc7bbd 100644
--- 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
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
index 581ce8f4f..581ce8f4f 100644
--- 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
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
index cf6b89eb9..cf6b89eb9 100644
--- 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
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
index 01f825fc9..01f825fc9 100644
--- 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
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
index 143ef635d..143ef635d 100644
--- 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
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
index 932ebbece..932ebbece 100644
--- 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
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
index d62e5f9f3..d62e5f9f3 100644
--- 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
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
index 420c77ee3..420c77ee3 100644
--- 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
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
index 98cea821a..98cea821a 100644
--- 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
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
index 13d89faba..13d89faba 100644
--- 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
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
index 9a6bfdf7d..9a6bfdf7d 100644
--- 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
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
index 760f8267d..760f8267d 100644
--- 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
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
index af7a189f6..af7a189f6 100644
--- 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
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
index 46db712b6..46db712b6 100644
--- 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
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
index e6b3c8eb1..e6b3c8eb1 100644
--- 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
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
index dbd67585f..dbd67585f 100644
--- 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
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
index abc3e71b8..abc3e71b8 100644
--- 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
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
index e3d7e3aa5..e3d7e3aa5 100644
--- 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
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
index dd62dbfc4..dd62dbfc4 100644
--- 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
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
index 5ffe5101d..5ffe5101d 100644
--- 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
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
index f77b678c0..f77b678c0 100644
--- 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
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
index afb0f6cb4..afb0f6cb4 100644
--- 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
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
index 4f3d6d62c..4f3d6d62c 100644
--- 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
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
index 1035ccb67..1035ccb67 100644
--- 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
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
index 30250be68..30250be68 100644
--- 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
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
index 7a73a41bf..7a73a41bf 100644
--- 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
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
index c2ffb40a9..c2ffb40a9 100644
--- 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
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
index 30250be68..30250be68 100644
--- 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
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
index 79540631a..79540631a 100644
--- 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
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
index efbfbe29f..efbfbe29f 100644
--- 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
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
index cf6b89eb9..cf6b89eb9 100644
--- 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
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
index 126e8e6e2..126e8e6e2 100644
--- 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
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
index 88b870580..88b870580 100644
--- 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
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
index bde730cd7..bde730cd7 100644
--- 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
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
index 7fe0e59de..7fe0e59de 100644
--- 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
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
index 3dc979220..3dc979220 100644
--- 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
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
index f2b67e18f..f2b67e18f 100644
--- 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
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
index ea8e92aaf..ea8e92aaf 100644
--- 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
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
index 3e31ec218..3e31ec218 100644
--- 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
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
index 8f93572bf..8f93572bf 100644
--- 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
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
index eaeee605d..eaeee605d 100644
--- 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
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
index 9b3b057b8..9b3b057b8 100644
--- 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
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
index a0c5b2456..a0c5b2456 100644
--- 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
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
index 69d73db58..69d73db58 100644
--- 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
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
index c50392eca..c50392eca 100644
--- 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
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
index 8ac9b7484..8ac9b7484 100644
--- 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
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
index 58e60e98d..58e60e98d 100644
--- 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
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
index 408e8cd00..408e8cd00 100644
--- 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
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
index 04026b323..04026b323 100644
--- 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
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
index d2a7632f3..d2a7632f3 100644
--- 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
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
index 0ae96dbc2..0ae96dbc2 100644
--- 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
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
index eb25cdb91..eb25cdb91 100644
--- 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
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
index 6b3a2460d..6b3a2460d 100644
--- 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
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
index 8b37a67e7..8b37a67e7 100644
--- 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
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
index bb6adb0aa..bb6adb0aa 100644
--- 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
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
index f41dcfd6f..f41dcfd6f 100644
--- 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
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
index dfe30774b..dfe30774b 100644
--- 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
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
index b0f77d67e..b0f77d67e 100644
--- 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
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
index e636582df..e636582df 100644
--- 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
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
index cb387dda1..cb387dda1 100644
--- 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
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
index 30b8b7212..30b8b7212 100644
--- 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
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
index 2ff263b24..2ff263b24 100644
--- 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
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
index 81dea2c3c..81dea2c3c 100644
--- 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
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
index 7d92a0884..7d92a0884 100644
--- 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
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
index 42f458602..42f458602 100644
--- 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
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
index a4e62b446..a4e62b446 100644
--- 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
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
index f200f975a..f200f975a 100644
--- 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
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
index 444f37889..444f37889 100644
--- 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
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
index e6c93d55d..e6c93d55d 100644
--- 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
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
index 4daa0393f..4daa0393f 100644
--- 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
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
index 51ac3a4d5..51ac3a4d5 100644
--- 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
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
index df7f2a611..df7f2a611 100644
--- 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
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
index 1fcbba3af..1fcbba3af 100644
--- 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
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
index 1869047c9..1869047c9 100644
--- 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
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
index d6ca6d0d1..d6ca6d0d1 100644
--- 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
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
index 3eca87678..3eca87678 100644
--- 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
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
index e80570f93..e80570f93 100644
--- 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
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
index 8c8fa33cb..8c8fa33cb 100644
--- 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
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
index dbd67585f..dbd67585f 100644
--- 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
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
index a307d3457..a307d3457 100644
--- 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
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
index 0a8754256..0a8754256 100644
--- 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
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
index e94939af8..e94939af8 100644
--- 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
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
index 8027d6f08..8027d6f08 100644
--- 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
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
index ae004de49..ae004de49 100644
--- 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
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
index 1311eee35..1311eee35 100644
--- 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
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
index 9c20ffe22..9c20ffe22 100644
--- 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
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
index 472b4beee..472b4beee 100644
--- 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
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
index 5a5ad8931..5a5ad8931 100644
--- 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
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
index c695d5f24..c695d5f24 100644
--- 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
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
index e69de29bb..e69de29bb 100644
--- 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
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
index 1035ccb67..1035ccb67 100644
--- 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
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
index 7a73a41bf..7a73a41bf 100644
--- 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
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
index 8c594044b..8c594044b 100644
--- 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
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
index 0295a8f91..0295a8f91 100644
--- 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
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
index f11bd8c95..f11bd8c95 100644
--- 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
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
index 99dd0ed68..99dd0ed68 100644
--- 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
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 @@
         <module>participant-impl-cds</module>
         <module>participant-impl-kubernetes</module>
     </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.clamp.participant</groupId>
+            <artifactId>policy-clamp-participant-intermediary</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 </project>
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
index 9e5d2c663..9e5d2c663 100644
--- 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
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
index d31ae1082..d31ae1082 100644
--- 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
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
index d7cc4b2ed..d7cc4b2ed 100644
--- 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
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
index 839088d72..839088d72 100644
--- 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
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
index 50b8b9cdc..50b8b9cdc 100644
--- 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
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
index ab2437c1c..ab2437c1c 100644
--- 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
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
index 3128f1eaa..3128f1eaa 100644
--- 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
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
index e0e6be329..e0e6be329 100644
--- 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
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
index c1a8b5b4a..c1a8b5b4a 100644
--- 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
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
index bc53b4e9d..bc53b4e9d 100644
--- 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
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
index cc2a66b58..cc2a66b58 100644
--- 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
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
index be2fa1a30..be2fa1a30 100644
--- 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
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
index 980ab6ec1..980ab6ec1 100644
--- 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
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
index 8e3440e42..8e3440e42 100644
--- 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
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 @@
         <module>participant-intermediary</module>
         <module>participant-impl</module>
     </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.clamp</groupId>
+            <artifactId>policy-clamp-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.clamp</groupId>
+            <artifactId>policy-clamp-models</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.onap.policy.clamp.controlloop.participant.simulator.main.startstop.Main</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/pom.xml b/pom.xml
index 6f86ff513..d9640b45d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
         <module>common</module>
         <module>models</module>
         <module>runtime</module>
+        <module>runtime-controlloop</module>
         <module>participant</module>
     </modules>
 
@@ -67,5 +68,74 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>common-parameters</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>policy-endpoints</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>gson</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.models</groupId>
+            <artifactId>policy-models-provider</artifactId>
+            <version>${policy.models.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils-test</artifactId>
+            <version>${policy.common.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/tosca-controlloop/runtime/pom.xml b/runtime-controlloop/pom.xml
index 8433438ff..ab72deb91 100644
--- a/tosca-controlloop/runtime/pom.xml
+++ b/runtime-controlloop/pom.xml
@@ -25,24 +25,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>controlloop</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <groupId>org.onap.policy.clamp</groupId>
+        <artifactId>policy-clamp</artifactId>
+        <version>6.1.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>controlloop-runtime</artifactId>
+    <artifactId>policy-clamp-runtime-controlloop</artifactId>
     <name>${project.artifactId}</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.policy.clamp.controlloop</groupId>
-            <artifactId>controlloop-common</artifactId>
+            <groupId>org.onap.policy.clamp</groupId>
+            <artifactId>policy-clamp-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.clamp.controlloop</groupId>
-            <artifactId>controlloop-models</artifactId>
+            <groupId>org.onap.policy.clamp</groupId>
+            <artifactId>policy-clamp-models</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
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
index 88e8b1df9..88e8b1df9 100644
--- 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
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
index 50f6787b9..50f6787b9 100644
--- 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
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
index 18e1f7787..18e1f7787 100644
--- 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
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
index eb72d9219..eb72d9219 100644
--- 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
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
index d81e54ccf..d81e54ccf 100644
--- 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
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
index 7581aaf74..7581aaf74 100644
--- 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
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
index 4c99b8e57..4c99b8e57 100644
--- 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
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
index a463ad171..a463ad171 100644
--- 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
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
index dfc1b2806..dfc1b2806 100644
--- 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
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
index 2eea4ab51..2eea4ab51 100644
--- 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
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
index 2af5be534..2af5be534 100644
--- 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
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
index f166de5d6..f166de5d6 100644
--- 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
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
index dd3fa30fc..dd3fa30fc 100644
--- 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
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
index a4238a9c4..a4238a9c4 100644
--- 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
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
index f36bb858b..f36bb858b 100644
--- 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
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
index 8e60d68cf..8e60d68cf 100644
--- 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
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
index a7ad9180a..a7ad9180a 100644
--- 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
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
index 193f8d557..193f8d557 100644
--- 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
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
index 2e19ffe3a..2e19ffe3a 100644
--- 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
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
index 63bff00fc..63bff00fc 100644
--- 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
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
index 0ccfddff3..0ccfddff3 100644
--- 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
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
index c9c8ab851..c9c8ab851 100644
--- 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
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
index 3c5d230c5..3c5d230c5 100644
--- 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
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
index 099039115..099039115 100644
--- 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
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
index a05f4aa20..a05f4aa20 100644
--- 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
diff --git a/tosca-controlloop/runtime/src/main/resources/META-INF/persistence.xml b/runtime-controlloop/src/main/resources/META-INF/persistence.xml
index e5d2cab11..e5d2cab11 100644
--- a/tosca-controlloop/runtime/src/main/resources/META-INF/persistence.xml
+++ b/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
index e11449e5b..e11449e5b 100644
--- a/tosca-controlloop/runtime/src/main/resources/version.txt
+++ b/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
index 956b5e911..956b5e911 100644
--- 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
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
index 4dbb3ea02..4dbb3ea02 100644
--- 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
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
index ccc54b93f..ccc54b93f 100644
--- 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
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
index 958d91dff..958d91dff 100644
--- 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
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
index 71e762455..71e762455 100644
--- 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
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
index 4f68b4f8c..4f68b4f8c 100644
--- 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
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
index da71c239d..da71c239d 100644
--- 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
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
index b06383c68..b06383c68 100644
--- 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
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
index 44096eecd..44096eecd 100644
--- 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
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
index 118199a2d..118199a2d 100644
--- 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
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
index 77f802d61..77f802d61 100644
--- 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
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
index 0d668f139..0d668f139 100644
--- 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
diff --git a/tosca-controlloop/runtime/src/test/resources/META-INF/persistence.xml b/runtime-controlloop/src/test/resources/META-INF/persistence.xml
index 6e31cca47..6e31cca47 100644
--- a/tosca-controlloop/runtime/src/test/resources/META-INF/persistence.xml
+++ b/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
index bda9da6a1..bda9da6a1 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/CommissioningConfig.json
+++ b/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
index e69de29bb..e69de29bb 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/EmptyParameters.json
+++ b/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
index 7682a1812..7682a1812 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParametersStd.json
+++ b/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
index b0c322cb9..b0c322cb9 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParameters_InvalidName.json
+++ b/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
index 0977da9ad..0977da9ad 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/InstantiationConfigParameters_sim.json
+++ b/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
index 976ec2937..976ec2937 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/InvalidParameters.json
+++ b/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
index f784dcd16..f784dcd16 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/MinimumParametersH2.json
+++ b/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
index 2c63c0851..2c63c0851 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/NoParameters.json
+++ b/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
index c3be762d6..c3be762d6 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/TestParameters.json
+++ b/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
index 2c0127b16..2c0127b16 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/TestParametersMariaDB.json
+++ b/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
index 3d117f416..3d117f416 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/Unreadable.json
+++ b/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
index e00c36baa..e00c36baa 100644
--- a/tosca-controlloop/runtime/src/test/resources/parameters/logback-test.xml
+++ b/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
index faea7cd48..faea7cd48 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopElementsNotFound.json
+++ b/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
index 13ea1bfc4..13ea1bfc4 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoops.json
+++ b/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
index 9e9767472..9e9767472 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsNotFound.json
+++ b/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
index 025e2a1fb..025e2a1fb 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsUpdate.json
+++ b/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
index 76131afc1..76131afc1 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/ControlLoopsVersionNotMatches.json
+++ b/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
index 9c87e43b6..9c87e43b6 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/controlloops/PassiveCommand.json
+++ b/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
index 21a048ff0..21a048ff0 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestClElementStatistics.json
+++ b/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
index 2cf2619bf..2cf2619bf 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestClElementStatistics_Invalid.json
+++ b/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
index acd88e24b..acd88e24b 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestParticipantStatistics.json
+++ b/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
index 7281822f0..7281822f0 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/monitoring/TestParticipantStatistics_Invalid.json
+++ b/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
index 099e2e945..099e2e945 100644
--- a/tosca-controlloop/runtime/src/test/resources/rest/servicetemplates/PMSHMultipleCLTosca.yaml
+++ b/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
index 01f825fc9..01f825fc9 100644
--- 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
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
index 099e2e945..099e2e945 100644
--- 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
diff --git a/tosca-controlloop/runtime/src/test/resources/testscripts/listenOnTopic.sh b/runtime-controlloop/src/test/resources/testscripts/listenOnTopic.sh
index 5e661777b..5e661777b 100644
--- a/tosca-controlloop/runtime/src/test/resources/testscripts/listenOnTopic.sh
+++ b/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 @@
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput>
+                    <swaggerInput>${project.basedir}/../docs/swagger/swagger.json</swaggerInput>
                     <outputDir>${project.build.directory}/asciidoc/generated</outputDir>
                     <config>
                         <swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
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
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2021-05-10 12:05:55 IST
+Last updated 2021-05-20 16:43:12 IST
 </div>
 </div>
 </body>
-</html>
+</html>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>controlloop</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>controlloop-common</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Common utilities and code for the TOSCA Control Loop system</description>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>controlloop</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>controlloop-design</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Design time part of the TOSCA Control Loop system</description>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>controlloop</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>controlloop-models</artifactId>
-    <name>${project.artifactId}</name>
-</project>
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 @@
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>participant-impl</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>participant-impl-cds</artifactId>
-    <name>${project.artifactId}</name>
-    <description>CDS participant, that allows CDS to partake in control loops</description>
-</project>
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 @@
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>participant-impl</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>participant-impl-dcae</artifactId>
-    <name>${project.artifactId}</name>
-    <description>DCAE participant, that allows DCAE to partake in control loops</description>
-
-    <properties>
-        <mockserver.version>5.11.2</mockserver.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.clamp.controlloop</groupId>
-            <artifactId>participant-intermediary</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-netty</artifactId>
-            <version>${mockserver.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-client-java</artifactId>
-            <version>${mockserver.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
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 @@
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>participant-impl</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>participant-impl-kubernetes</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Kubernetes participant, that allows microservices running in Kubernetes to partake in control loops</description>
-</project>
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 @@
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>participant-impl</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>participant-impl-policy</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Policy participant, that allows Policy to partake in control loops</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.clamp.controlloop</groupId>
-            <artifactId>participant-intermediary</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
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 @@
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>participant-impl</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>participant-impl-simulator</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Participant simulator, used to test control loops</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.clamp.controlloop</groupId>
-            <artifactId>participant-intermediary</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>participant</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>participant-impl</artifactId>
-    <name>${project.artifactId}</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>participant-impl-simulator</module>
-        <module>participant-impl-dcae</module>
-        <module>participant-impl-policy</module>
-        <module>participant-impl-cds</module>
-        <module>participant-impl-kubernetes</module>
-    </modules>
-</project>
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 @@
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>participant</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>participant-intermediary</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Common intermediary library for managing DMaaP participant messaging and holding participant and control
-     loop state</description>
-
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.controlloop</groupId>
-        <artifactId>controlloop</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>participant</artifactId>
-    <name>${project.artifactId}</name>
-    <packaging>pom</packaging>
-    <description>participants that communicate with the runtime server to handle control loops</description>
-
-    <modules>
-        <module>participant-intermediary</module>
-        <module>participant-impl</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.clamp.controlloop</groupId>
-            <artifactId>controlloop-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.clamp.controlloop</groupId>
-            <artifactId>controlloop-models</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.onap.policy.clamp.controlloop.participant.simulator.main.startstop.Main</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.parent</groupId>
-        <artifactId>integration</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.policy.clamp.controlloop</groupId>
-    <artifactId>controlloop</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
-    <name>${project.artifactId}</name>
-    <packaging>pom</packaging>
-
-    <properties>
-        <policy.common.version>1.9.0-SNAPSHOT</policy.common.version>
-        <policy.models.version>2.5.0-SNAPSHOT</policy.models.version>
-    </properties>
-
-    <modules>
-        <module>common</module>
-        <module>models</module>
-        <module>design</module>
-        <module>runtime</module>
-        <module>participant</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>common-parameters</artifactId>
-            <version>${policy.common.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils</artifactId>
-            <version>${policy.common.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>policy-endpoints</artifactId>
-            <version>${policy.common.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>gson</artifactId>
-            <version>${policy.common.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.models</groupId>
-            <artifactId>policy-models-provider</artifactId>
-            <version>${policy.models.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils-test</artifactId>
-            <version>${policy.common.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <!-- Output the version of the control loop system -->
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/version.txt</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <excludes>
-                    <exclude>**/version.txt</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>1C</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <useSystemClassLoader>false</useSystemClassLoader>
-                    <parallel>methods</parallel>
-                    <useUnlimitedThreads>true</useUnlimitedThreads>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
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