Updated ControlLoop component messages

Updated controlloop messages (ParticipantUpdate, ControlLoopUpdate,
ParticipantStatus) according to the following Wiki and added
implementation for the corresponding updates in runtime-controlloop and
participant components
https://wiki.onap.org/display/DW/The+CLAMP+Control+Loop+Participant+Protocol

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

19 files changed, 914 insertions, 1715 deletions

diff --git a/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 5a0ddabfd..08ebd194a 100644
--- a/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
@@ -36,7 +36,7 @@ import org.onap.policy.clamp.controlloop.participant.intermediary.api.ControlLoo
 import org.onap.policy.clamp.controlloop.participant.intermediary.api.ParticipantIntermediaryApi;
 import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.onap.policy.models.base.PfModelException;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -136,11 +136,11 @@ public class ControlLoopElementHandler implements ControlLoopElementListener {
      * Callback method to handle an update on a control loop element.
      *
      * @param element the information on the control loop element
-     * @param controlLoopDefinition toscaServiceTemplate
+     * @param nodeTemplate toscaNodeTemplate
      * @throws PfModelException in case of an exception
      */
     @Override
-    public void controlLoopElementUpdate(ControlLoopElement element, ToscaServiceTemplate controlLoopDefinition)
+    public void controlLoopElementUpdate(ControlLoopElement element, ToscaNodeTemplate nodeTemplate)
             throws PfModelException {
         try {
             Loop loop = getStatus();
diff --git a/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/endtoend/ParticipantDcaeTest.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/endtoend/ParticipantDcaeTest.java
index a3fcfdd9e..6e7f28735 100644
--- a/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/endtoend/ParticipantDcaeTest.java
+++ b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/endtoend/ParticipantDcaeTest.java
@@ -34,10 +34,12 @@ import org.mockserver.integration.ClientAndServer;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopStateChange;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate;
+import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdate;
 import org.onap.policy.clamp.controlloop.participant.dcae.main.parameters.CommonTestData;
 import org.onap.policy.clamp.controlloop.participant.dcae.main.rest.TestListenerUtils;
 import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ControlLoopStateChangeListener;
 import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ControlLoopUpdateListener;
+import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ParticipantUpdateListener;
 import org.onap.policy.clamp.controlloop.participant.intermediary.handler.ParticipantHandler;
 import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.common.utils.coder.CoderException;
@@ -54,6 +56,7 @@ class ParticipantDcaeTest {
 
     private static final CommInfrastructure INFRA = CommInfrastructure.NOOP;
     private static final String TOPIC = "my-topic";
+    private static final Object lockit = new Object();
 
     private static final String LOOP = "pmsh_loop";
     private static final String BLUEPRINT_DEPLOYED = "BLUEPRINT_DEPLOYED";
@@ -68,7 +71,7 @@ class ParticipantDcaeTest {
      * start Servers.
      */
     @BeforeAll
-    public static void startServers() {
+    public void startServers() {
 
         // Clamp
         mockClampServer = ClientAndServer.startClientAndServer(8443);
@@ -88,6 +91,12 @@ class ParticipantDcaeTest {
 
         mockConsulServer.when(request().withMethod("PUT").withPath("/v1/kv/dcae-pmsh:policy"))
                 .respond(response().withStatusCode(200));
+        ParticipantUpdate participantUpdateMsg = TestListenerUtils.createParticipantUpdateMsg();
+
+        synchronized (lockit) {
+            ParticipantUpdateListener participantUpdateListener = new ParticipantUpdateListener(participantHandler);
+            participantUpdateListener.onTopicEvent(INFRA, TOPIC, null, participantUpdateMsg);
+        }
     }
 
     /**
@@ -126,7 +135,6 @@ class ParticipantDcaeTest {
     void testControlLoopUpdateListener_ParticipantIdNoMatch() throws CoderException {
         ControlLoopUpdate controlLoopUpdateMsg = TestListenerUtils.createControlLoopUpdateMsg();
         controlLoopUpdateMsg.getParticipantId().setName("DummyName");
-        controlLoopUpdateMsg.getControlLoop().setOrderedState(ControlLoopOrderedState.PASSIVE);
 
         ControlLoopUpdateListener clUpdateListener = new ControlLoopUpdateListener(participantHandler);
         clUpdateListener.onTopicEvent(INFRA, TOPIC, null, controlLoopUpdateMsg);
@@ -139,7 +147,6 @@ class ParticipantDcaeTest {
     @Test
     void testControlLoopUpdateListenerPassive() throws CoderException {
         ControlLoopUpdate controlLoopUpdateMsg = TestListenerUtils.createControlLoopUpdateMsg();
-        controlLoopUpdateMsg.getControlLoop().setOrderedState(ControlLoopOrderedState.PASSIVE);
 
         ControlLoopUpdateListener clUpdateListener = new ControlLoopUpdateListener(participantHandler);
         clUpdateListener.onTopicEvent(INFRA, TOPIC, null, controlLoopUpdateMsg);
@@ -152,7 +159,6 @@ class ParticipantDcaeTest {
     @Test
     void testControlLoopUpdateListenerUninitialised() throws CoderException {
         ControlLoopUpdate controlLoopUpdateMsg = TestListenerUtils.createControlLoopUpdateMsg();
-        controlLoopUpdateMsg.getControlLoop().setOrderedState(ControlLoopOrderedState.UNINITIALISED);
 
         ControlLoopUpdateListener clUpdateListener = new ControlLoopUpdateListener(participantHandler);
         clUpdateListener.onTopicEvent(INFRA, TOPIC, null, controlLoopUpdateMsg);
@@ -165,7 +171,6 @@ class ParticipantDcaeTest {
     @Test
     void testControlLoopUpdateListenerString() throws CoderException {
         ControlLoopUpdate controlLoopUpdateMsg = TestListenerUtils.createControlLoopUpdateMsg();
-        controlLoopUpdateMsg.getControlLoop().setOrderedState(ControlLoopOrderedState.UNINITIALISED);
 
         assertThat(controlLoopUpdateMsg.toString()).contains("state=UNINITIALISED");
         ControlLoopUpdate copyControlLoopUpdateMsg =
diff --git a/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandlerTest.java b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandlerTest.java
index 40f2f5f7b..8a7f403f4 100644
--- a/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandlerTest.java
+++ b/participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/handler/ControlLoopElementHandlerTest.java
@@ -31,21 +31,28 @@ import static org.mockito.Mockito.when;
 
 import java.util.UUID;
 import org.json.JSONException;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState;
+import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdate;
 import org.onap.policy.clamp.controlloop.participant.dcae.httpclient.ClampHttpClient;
 import org.onap.policy.clamp.controlloop.participant.dcae.httpclient.ConsulDcaeHttpClient;
 import org.onap.policy.clamp.controlloop.participant.dcae.main.parameters.CommonTestData;
+import org.onap.policy.clamp.controlloop.participant.dcae.main.rest.TestListenerUtils;
 import org.onap.policy.clamp.controlloop.participant.dcae.model.Loop;
 import org.onap.policy.clamp.controlloop.participant.intermediary.api.ParticipantIntermediaryApi;
+import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ParticipantUpdateListener;
+import org.onap.policy.clamp.controlloop.participant.intermediary.handler.ParticipantHandler;
+import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.common.utils.coder.Coder;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
@@ -61,8 +68,27 @@ class ControlLoopElementHandlerTest {
     private static final String MICROSERVICE_INSTALLED_SUCCESSFULLY = "MICROSERVICE_INSTALLED_SUCCESSFULLY";
 
     public static final Coder CODER = new StandardCoder();
+    private static final Object lockit = new Object();
+    private static final CommInfrastructure INFRA = CommInfrastructure.NOOP;
+    private static final String TOPIC = "my-topic";
     private CommonTestData commonTestData = new CommonTestData();
 
+    @Autowired
+    private ParticipantHandler participantHandler;
+
+    /**
+     * Initial ParticipantUpdate message.
+     */
+    @BeforeAll
+    public void sendParticipantUpdate() {
+        ParticipantUpdate participantUpdateMsg = TestListenerUtils.createParticipantUpdateMsg();
+
+        synchronized (lockit) {
+            ParticipantUpdateListener participantUpdateListener = new ParticipantUpdateListener(participantHandler);
+            participantUpdateListener.onTopicEvent(INFRA, TOPIC, null, participantUpdateMsg);
+        }
+    }
+
     @Test
     void test_ControlLoopElementStateChange() {
         ClampHttpClient clampClient = spy(mock(ClampHttpClient.class));
@@ -109,7 +135,9 @@ class ControlLoopElementHandlerTest {
         element.setOrderedState(ControlLoopOrderedState.PASSIVE);
 
         final ToscaServiceTemplate controlLoopDefinition = new ToscaServiceTemplate();
-        controlLoopElementHandler.controlLoopElementUpdate(element, controlLoopDefinition);
+        controlLoopElementHandler.controlLoopElementUpdate(element,
+            controlLoopDefinition.getToscaTopologyTemplate().getNodeTemplates()
+            .get("org.onap.domain.pmsh.PMSH_DCAEMicroservice"));
 
         verify(clampClient).create(eq(LOOP), eq(TEMPLATE));
         verify(consulClient).deploy(any(String.class), any(String.class));
@@ -139,7 +167,9 @@ class ControlLoopElementHandlerTest {
         element.setOrderedState(ControlLoopOrderedState.PASSIVE);
 
         ToscaServiceTemplate controlLoopDefinition = new ToscaServiceTemplate();
-        controlLoopElementHandler.controlLoopElementUpdate(element, controlLoopDefinition);
+        controlLoopElementHandler.controlLoopElementUpdate(element,
+                controlLoopDefinition.getToscaTopologyTemplate().getNodeTemplates()
+                .get("org.onap.domain.pmsh.PMSH_DCAEMicroservice"));
 
         verify(clampClient, times(0)).create(eq(LOOP), eq(TEMPLATE));
         verify(consulClient).deploy(any(String.class), any(String.class));
diff --git a/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 136d0e500..c6dd927da 100644
--- a/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
@@ -22,16 +22,21 @@ package org.onap.policy.clamp.controlloop.participant.dcae.main.rest;
 
 import java.io.File;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState;
-import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantState;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantUpdates;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopStateChange;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate;
+import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdate;
 import org.onap.policy.common.utils.coder.Coder;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
@@ -46,6 +51,7 @@ public class TestListenerUtils {
     private static final YamlJsonTranslator yamlTranslator = new YamlJsonTranslator();
     private static final Coder CODER = new StandardCoder();
     private static final String TOSCA_TEMPLATE_YAML = "examples/controlloop/PMSubscriptionHandling.yaml";
+    private static final String CONTROL_LOOP_ELEMENT = "ControlLoopElement";
 
     /**
      * Method to create a controlLoop from a yaml file.
@@ -119,46 +125,158 @@ public class TestListenerUtils {
      */
     public static ControlLoopUpdate createControlLoopUpdateMsg() {
         final ControlLoopUpdate clUpdateMsg = new ControlLoopUpdate();
-        ToscaConceptIdentifier controlLoopId = new ToscaConceptIdentifier();
-        controlLoopId.setName("PMSHInstance0");
-        controlLoopId.setVersion("1.0.0");
-
-        ToscaConceptIdentifier participantId = new ToscaConceptIdentifier();
-        participantId.setName("DCAEParticipant0");
-        participantId.setVersion("1.0.0");
+        ToscaConceptIdentifier controlLoopId =
+            new ToscaConceptIdentifier("PMSHInstance0", "1.0.0");
+        ToscaConceptIdentifier participantId =
+            new ToscaConceptIdentifier("org.onap.PM_Policy", "0.0.0");
 
         clUpdateMsg.setControlLoopId(controlLoopId);
         clUpdateMsg.setParticipantId(participantId);
+        clUpdateMsg.setMessageId(UUID.randomUUID());
+        clUpdateMsg.setTimestamp(Instant.now());
 
-        ControlLoop controlLoop = new ControlLoop();
         Map<UUID, ControlLoopElement> elements = new LinkedHashMap<>();
         ToscaServiceTemplate toscaServiceTemplate = testControlLoopRead();
         Map<String, ToscaNodeTemplate> nodeTemplatesMap =
                 toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates();
         for (Map.Entry<String, ToscaNodeTemplate> toscaInputEntry : nodeTemplatesMap.entrySet()) {
-            ControlLoopElement clElement = new ControlLoopElement();
-            clElement.setId(UUID.randomUUID());
+            if (toscaInputEntry.getValue().getType().contains(CONTROL_LOOP_ELEMENT)) {
+                ControlLoopElement clElement = new ControlLoopElement();
+                clElement.setId(UUID.randomUUID());
+                ToscaConceptIdentifier clParticipantId;
+                try {
+                    clParticipantId = CODER.decode(
+                            toscaInputEntry.getValue().getProperties().get("participant_id").toString(),
+                            ToscaConceptIdentifier.class);
+                } catch (CoderException e) {
+                    throw new RuntimeException("cannot get ParticipantId from toscaNodeTemplate", e);
+                }
 
-            ToscaConceptIdentifier clElementParticipantId = new ToscaConceptIdentifier();
-            clElementParticipantId.setName(toscaInputEntry.getKey());
-            clElementParticipantId.setVersion(toscaInputEntry.getValue().getVersion());
-            clElement.setParticipantId(clElementParticipantId);
+                clElement.setParticipantId(clParticipantId);
+                clElement.setParticipantType(clParticipantId);
 
-            clElement.setDefinition(clElementParticipantId);
-            clElement.setState(ControlLoopState.UNINITIALISED);
-            clElement.setDescription(toscaInputEntry.getValue().getDescription());
-            clElement.setOrderedState(ControlLoopOrderedState.UNINITIALISED);
-            elements.put(clElement.getId(), clElement);
+                clElement.setDefinition(new ToscaConceptIdentifier(toscaInputEntry.getKey(),
+                    toscaInputEntry.getValue().getVersion()));
+                clElement.setState(ControlLoopState.UNINITIALISED);
+                clElement.setDescription(toscaInputEntry.getValue().getDescription());
+                clElement.setOrderedState(ControlLoopOrderedState.PASSIVE);
+                elements.put(clElement.getId(), clElement);
+            }
         }
-        controlLoop.setElements(elements);
-        controlLoop.setName("PMSHInstance0");
-        controlLoop.setVersion("1.0.0");
-        controlLoop.setDefinition(controlLoopId);
-        clUpdateMsg.setControlLoop(controlLoop);
 
+        List<ParticipantUpdates> participantUpdates = new ArrayList<>();
+        for (ControlLoopElement element : elements.values()) {
+            prepareParticipantUpdateForControlLoop(element, participantUpdates);
+        }
+        clUpdateMsg.setParticipantUpdatesList(participantUpdates);
         return clUpdateMsg;
     }
 
+    private static void prepareParticipantUpdateForControlLoop(ControlLoopElement clElement,
+        List<ParticipantUpdates> participantUpdates) {
+        if (participantUpdates.isEmpty()) {
+            participantUpdates.add(getControlLoopElementList(clElement));
+        } else {
+            boolean participantExists = false;
+            for (ParticipantUpdates participantUpdate : participantUpdates) {
+                if (participantUpdate.getParticipantId().equals(clElement.getParticipantId())) {
+                    participantUpdate.getControlLoopElementList().add(clElement);
+                    participantExists = true;
+                }
+            }
+            if (!participantExists) {
+                participantUpdates.add(getControlLoopElementList(clElement));
+            }
+        }
+    }
+
+    private static ParticipantUpdates getControlLoopElementList(ControlLoopElement clElement) {
+        ParticipantUpdates participantUpdate = new ParticipantUpdates();
+        List<ControlLoopElement> controlLoopElementList = new ArrayList<>();
+        participantUpdate.setParticipantId(clElement.getParticipantId());
+        controlLoopElementList.add(clElement);
+        participantUpdate.setControlLoopElementList(controlLoopElementList);
+        return participantUpdate;
+    }
+
+    /**
+     * Method to create participantUpdateMsg.
+     *
+     * @return ParticipantUpdate message
+     */
+    public static ParticipantUpdate createParticipantUpdateMsg() {
+        final ParticipantUpdate participantUpdateMsg = new ParticipantUpdate();
+        ToscaConceptIdentifier participantId = new ToscaConceptIdentifier("org.onap.PM_Policy", "1.0.0");
+        ToscaConceptIdentifier participantType = new ToscaConceptIdentifier(
+                "org.onap.policy.controlloop.PolicyControlLoopParticipant", "2.3.1");
+
+        participantUpdateMsg.setParticipantId(participantId);
+        participantUpdateMsg.setTimestamp(Instant.now());
+        participantUpdateMsg.setParticipantType(participantType);
+        participantUpdateMsg.setTimestamp(Instant.ofEpochMilli(3000));
+        participantUpdateMsg.setMessageId(UUID.randomUUID());
+
+        ToscaServiceTemplate toscaServiceTemplate = testControlLoopRead();
+
+        List<ParticipantDefinition> participantDefinitionUpdates = new ArrayList<>();
+        for (Map.Entry<String, ToscaNodeTemplate> toscaInputEntry :
+            toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates().entrySet()) {
+            if (toscaInputEntry.getValue().getType().contains(CONTROL_LOOP_ELEMENT)) {
+                ToscaConceptIdentifier clParticipantId;
+                try {
+                    clParticipantId = CODER.decode(
+                            toscaInputEntry.getValue().getProperties().get("participant_id").toString(),
+                            ToscaConceptIdentifier.class);
+                } catch (CoderException e) {
+                    throw new RuntimeException("cannot get ParticipantId from toscaNodeTemplate", e);
+                }
+                prepareParticipantDefinitionUpdate(clParticipantId, toscaInputEntry.getKey(),
+                    toscaInputEntry.getValue(), participantDefinitionUpdates);
+            }
+        }
+
+        participantUpdateMsg.setParticipantDefinitionUpdates(participantDefinitionUpdates);
+        participantUpdateMsg.setToscaServiceTemplate(toscaServiceTemplate);
+        return participantUpdateMsg;
+    }
+
+    private static void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantId, String entryKey,
+        ToscaNodeTemplate entryValue, List<ParticipantDefinition> participantDefinitionUpdates) {
+
+        var clDefinition = new ControlLoopElementDefinition();
+        clDefinition.setClElementDefinitionId(new ToscaConceptIdentifier(
+            entryKey, entryValue.getVersion()));
+        clDefinition.setControlLoopElementToscaNodeTemplate(entryValue);
+        List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>();
+
+        if (participantDefinitionUpdates.isEmpty()) {
+            participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantId,
+                controlLoopElementDefinitionList));
+        } else {
+            boolean participantExists = false;
+            for (ParticipantDefinition participantDefinitionUpdate : participantDefinitionUpdates) {
+                if (participantDefinitionUpdate.getParticipantId().equals(clParticipantId)) {
+                    participantDefinitionUpdate.getControlLoopElementDefinitionList().add(clDefinition);
+                    participantExists = true;
+                }
+            }
+            if (!participantExists) {
+                participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantId,
+                    controlLoopElementDefinitionList));
+            }
+        }
+    }
+
+    private static ParticipantDefinition getParticipantDefinition(ControlLoopElementDefinition clDefinition,
+        ToscaConceptIdentifier clParticipantId,
+        List<ControlLoopElementDefinition> controlLoopElementDefinitionList) {
+        ParticipantDefinition participantDefinition = new ParticipantDefinition();
+        participantDefinition.setParticipantId(clParticipantId);
+        controlLoopElementDefinitionList.add(clDefinition);
+        participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList);
+        return participantDefinition;
+    }
+
     /**
      * Method to create a deep copy of ControlLoopUpdateMsg.
      *
diff --git a/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..5785360c8 100644
--- a/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
@@ -136,7 +136,7 @@ topology_template:
       description: Control loop element for CDS for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participant_Id:
+        participant_id:
           name: org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant
           version: 3.2.1
         cds_blueprint_id:
diff --git a/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..8615bdbaa 100644
--- a/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
@@ -1,452 +1,153 @@
 tosca_definitions_version: tosca_simple_yaml_1_3
-capability_types:
-  org.onap.EventProducer:
+data_types:
+  onap.datatypes.ToscaConceptIdentifier:
+    derived_from: tosca.datatypes.Root
     properties:
-      carrier_protocol_type:
+      name:
         type: string
         required: true
-        constraints:
-        - valid_values:
-          - DMAAP_message_router
-          - SOMETHING_ELSE
-          - REST
-      data_format:
+      version:
         type: string
         required: true
-        constraints:
-        - valid_values:
-          - JSON
-          - YAML
-          - JMS
-      event_format:
-        type: string
-        required: true
-      event_format_version:
-        type: string
-        required: false
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key may be generated
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-    version: 0.0.1
-    derived_from: tosca.capabilities.Root
-  org.onap.EventConsumer:
-    properties:
-      responding_capability:
-        type: string
-        required: false
-      carrier_protocol_type:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - DMAAP_message_router
-          - SOMETHING_ELSE
-          - REST
-      data_format:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - JSON
-          - YAML
-          - JMS
-          - all valid values should be added here
-      event_format:
-        type: string
-        description: 'examples for event_format: Ves_specification, LinkUp, VnfConfigured,
-          etc.'
-        required: true
-      event_format_version:
-        type: string
-        description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'
-        required: false
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key may be generated
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-    version: 0.0.1
-    derived_from: tosca.capabilities.Root
 node_types:
-  org.onap.DynamicConfig:
+  org.onap.policy.clamp.controlloop.Participant:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      application_name:
-        type: string
-        description: Value used to tie the config to an application ? should we be
-          using a relationship here instead?
-        required: true
-      application_version:
-        type: string
-        required: true
-      application_provider:
+      provider:
         type: string
-        required: false
-      data_types:
-        type: object
-        required: false
-      schema:
-        type: object
-        required: false
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-  org.onap.APP:
+        requred: false
+  org.onap.policy.clamp.controlloop.ControlLoopElement:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      application_name:
-        type: string
-        description: Human readable name for the application Product
-        required: false
       provider:
         type: string
-        description: Provider of the application and of the descriptor
-        required: true
-      application_version:
-        type: string
-        description: Software version of the application
-        required: true
-      blueprint_id:
-        type: string
-        description: A reference to the app blueprint
-        required: false
-      monitoring_policy:
-        type: string
-        description: A reference to the monitoring policy
-        required: false
-    requirements:
-    - receive:
-        capability: org.onap.EventProducer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    - send:
-        capability: org.onap.EventConsumer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-  org.onap.EventRelay:
+        requred: false
+      participant_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.ControlLoop:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      event_format:
-        type: string
-        description: 'examples for event_format: Ves_specification, etc.'
-        required: true
-      event_format_version:
+      provider:
         type: string
-        description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'
-        required: true
-      config_keys:
+        requred: false
+      elements:
         type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key is relayed
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-      supported_carrier_protocols:
-        type: map
-        description: 'A map describing supported carrier protocols and translations.
-          The tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { REST: REST, DMAAP: REST, DMAAP: DMAAP}'
-        required: true
-        key_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - DMAAP_message_router
-            - SOMETHING_ELSE
-            - REST
-            - all valid values should be added here
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - DMAAP_message_router
-            - SOMETHING_ELSE
-            - REST
-            - all valid values should be added here
-      supported_data_formats:
-        type: map
-        description: 'Is a map describing supported data formats and translation.
-          The tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { JSON: JSON, JMS: JSON, YAML:YAML }'
         required: true
-        key_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - JSON
-            - JMS
-            - YAML
-            - etc
-            - all valid values should be added here
         entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - JSON
-            - JMS
-            - YAML
-            - etc
-            - all valid values should be added here
-    requirements:
-    - receive:
-        capability: org.onap.EventProducer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    - send:
-        capability: org.onap.EventConsumer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-relationship_types:
-  org.onap.PropagateEvent:
+          type: onap.datatypes.ToscaConceptIdentifier
+  org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
     properties:
-      config_keys:
-        type: list
-        description: The relationship type used on requirements to org.onap.EventProducer
-          and org.onap.EventConsumer capabilities. Filters events by specific config_keys
-          to be transferred by this relationship. That is, any event with a specific
-          config_key found in the list is transferred. If list is not defined or is
-          empty, events with all config_keys are transferred.
-        required: false
-        entry_schema:
-          type: string
-    version: 0.0.1
-    derived_from: tosca.relationships.Root
+      dcae_blueprint_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    properties:
+      policy_type_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.CDSControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    properties:
+      cds_blueprint_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
 topology_template:
-  inputs:
-    pm_subscription_topic:
-      type: string
-    pm_subscription_response_topic:
-      type: string
-    pm_subscription_handler_blueprint_id:
-      type: string
-    pm_subscription_operational_policy_id:
-      type: string
-    pm_subscription_cds_blueprint_id:
-      type: string
-    enable_tls:
-      type: string
   node_templates:
-    org.onap.PM_Subscription_Handler:
-      type: org.onap.APP
+    org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant:
+      version: 2.3.4
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.policy.controlloop.PolicyControlLoopParticipant:
+      version: 2.3.1
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant:
+      version: 2.2.1
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.domain.pmsh.PMSH_DCAEMicroservice:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the DCAE microservice for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Handler
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_handler_blueprint_id
-          description: Is this a reference to the DCAE Cloudify Blueprint that is
-            already stored(or will be stored before CL configuration & instatiation)
-            in DCAE Inventory?
-        artifact_config:
-          enable_tls:
-            get_input: enable_tls
-          pmsh_publish_topic_name:
-            get_input: pm_subscription_topic
-      capabilities:
-        pm-subscription-event-publisher:
-          properties:
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-format
-            event_format_version: 1.0.0
-          attributes:
-            type: org.onap.EventProducer
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-        pm-subscription-event-receiver:
-          properties:
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-response-format
-            event_format_version: 1.0.0
-            relationships:
-            - type: tosca.relationships.DependsOn
-            - description: any ideas on a better realtionship ? or is it better to
-                just use the root realtionship ?
-            - target: org.onap.PM_Monitoring_Policy
-          attributes:
-            type: org.onap.EventConsumer
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.PM_Monitoring_Policy:
-      type: org.onap.DynamicConfig
+        participant_id:
+          name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant
+          version: 2.3.4
+        dcae_blueprint_id:
+          name: org.onap.dcae.blueprints.PMSHBlueprint
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the monitoring policy for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Handler
-        application_version: 1.0.0
         provider: Ericsson
-        data_types:
-          measurementType:
-            type: string
-          DN:
-            type: string
-          nfFilter:
-            properties:
-              nfNames:
-                type: list
-                entry_schema: string
-              modelInvariantIDs:
-                type: list
-                entry_schema:
-                  type: string
-              modelVersionIDs:
-                type: list
-                entry_schema:
-                  type: string
-          measurementGroup:
-            properties:
-              masurementTypes:
-                type: list
-                entry_schema:
-                  type: measurementType
-              managedObjectDNsBasic:
-                type: list
-                entry_schema:
-                  type: DN
-        schema:
-          subscription:
-            subscriptionName:
-              type: string
-              required: true
-            administrativeState:
-              type: string
-              required: true
-            filebasedGP:
-              type: integer
-              required: true
-            fileLocation:
-              type: string
-              required: true
-            nfFilter:
-              type: nfFilter
-            measurementGroups:
-              type: list
-              entry_schema:
-                type: measurementGroup
-      version: 0.0.0
-      description: Should I be showing a dependency between PM Subscription Handler
-        and the PM Monitoring Policy
-    org.onap.PM_Policy:
-      type: org.onap.APP
+        participant_id:
+          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+          version: 2.3.1
+        policy_type_id:
+          name: onap.policies.monitoring.pm-subscription-handler
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the operational policy for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Operational Policy
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_operational_policy_id
-        artifact_config: NOT_DEFINED
-      requirements:
-      - receive_0:
-          capability: pm-subscription-event-publisher
-          node: org.onap.PM_Subscription_Handler
-          relationship: NOT_DEFINED
-          properties:
-            config_keys:
-            - topic_name:
-                get_input: pm_subscription_topic
-          version: 0.0.0
-      - send_0:
-          capability: cds-rest-receive
-          node: org.onap.CDS
-          version: 0.0.0
-      - receive_1:
-          capability: cds-rest-response
-          node: org.onap.CDS
-          version: 0.0.0
-      - send_1:
-          capability: pm-subscription-event-receiver
-          node: org.onap.PM_Subscription_Handler
-          relationship: NOT_DEFINED
-          properties:
-            config_keys:
-            - topic_name:
-                get_input: pm_subscription_response_topic
-          version: 0.0.0
-      capabilities:
-        pm-subscription-response-event-publisher:
-          properties:
-            type: org.onap.EventProducer
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-response-format
-            event_format_version: 1.0.0
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.PM_CDS_Blueprint:
-      type: org.onap.APP
+        participant_id:
+          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+          version: 2.3.1
+        policy_type_id:
+          name: onap.policies.operational.pm-subscription-handler
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.ControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for CDS for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription CDS Blueprint
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_cds_blueprint_id
-      capabilities:
-        cds-rest-receive:
-          properties:
-            type: org.onap.EventConsumer
-            protocol_type: REST
-            data_format: JSON
-            event_format: cds_action_format
-            event_format_version: 1.0.0
-            responding_capability: cds-rest-response
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-        cds-rest-response:
-          properties:
-            type: org.onap.EventProducer
-            protocol_type: REST
-            data_format: JSON
-            event_format: cds_action_response_format
-            event_format_version: 1.0.0
-          occurrences:
-          - 0.0
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.controlloop0:
-      type: org.onap.APP
+        participant_id:
+          name: org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant
+          version: 3.2.1
+        cds_blueprint_id:
+          name: org.onap.ccsdk.cds.PMSHCdsBlueprint
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSHControlLoopDefinition:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.ControlLoop
+      type_version: 1.0.0
+      description: Control loop for Performance Management Subscription Handling
       properties:
-        application_name: Test Control Loop
         provider: Ericsson
-        application_version: 1.0.0
-        status: NOT_DEPLOYED
-      version: 0.0.0
-version: 0.0.0
+        elements:
+          - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement
+            version: 1.2.3
diff --git a/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/controlloop/participant/http/main/handler/ControlLoopElementHandler.java b/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/controlloop/participant/http/main/handler/ControlLoopElementHandler.java
index 67948a95c..f18885f0f 100644
--- a/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/controlloop/participant/http/main/handler/ControlLoopElementHandler.java
+++ b/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/controlloop/participant/http/main/handler/ControlLoopElementHandler.java
@@ -32,7 +32,6 @@ import java.util.concurrent.Executors;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.ValidationException;
-import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.tuple.Pair;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement;
@@ -48,7 +47,6 @@ import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -99,29 +97,22 @@ public class ControlLoopElementHandler implements ControlLoopElementListener, Cl
      * Callback method to handle an update on a control loop element.
      *
      * @param element the information on the control loop element
-     * @param controlLoopDefinition toscaServiceTemplate
+     * @param nodeTemplate toscaNodeTemplate
      */
     @Override
-    public void controlLoopElementUpdate(ControlLoopElement element, ToscaServiceTemplate controlLoopDefinition) {
-
-        for (Map.Entry<String, ToscaNodeTemplate> nodeTemplate : controlLoopDefinition.getToscaTopologyTemplate()
-            .getNodeTemplates().entrySet()) {
-            // Fetching the node template of corresponding CL element
-            if (element.getDefinition().getName().equals(nodeTemplate.getKey())) {
-                try {
-                    var configRequest = CODER.convert(nodeTemplate.getValue().getProperties(), ConfigRequest.class);
-                    Set<ConstraintViolation<ConfigRequest>> violations = Validation.buildDefaultValidatorFactory()
-                        .getValidator().validate(configRequest);
-                    if (violations.isEmpty()) {
-                        invokeHttpClient(configRequest);
-                    } else {
-                        LOGGER.error("Violations found in the config request parameters: {}", violations);
-                        throw new ValidationException("Constraint violations in the config request");
-                    }
-                } catch (CoderException | ValidationException e) {
-                    LOGGER.error("Error invoking the http request for the config ", e);
-                }
+    public void controlLoopElementUpdate(ControlLoopElement element, ToscaNodeTemplate nodeTemplate) {
+        try {
+            var configRequest = CODER.convert(nodeTemplate.getProperties(), ConfigRequest.class);
+            Set<ConstraintViolation<ConfigRequest>> violations = Validation.buildDefaultValidatorFactory()
+                .getValidator().validate(configRequest);
+            if (violations.isEmpty()) {
+                invokeHttpClient(configRequest);
+            } else {
+                LOGGER.error("Violations found in the config request parameters: {}", violations);
+                throw new ValidationException("Constraint violations in the config request");
             }
+        } catch (CoderException | ValidationException e) {
+            LOGGER.error("Error invoking the http request for the config ", e);
         }
     }
 
diff --git a/participant/participant-impl/participant-impl-http/src/test/java/handler/ClElementHandlerTest.java b/participant/participant-impl/participant-impl-http/src/test/java/handler/ClElementHandlerTest.java
index 10b8103cb..46ed355de 100644
--- a/participant/participant-impl/participant-impl-http/src/test/java/handler/ClElementHandlerTest.java
+++ b/participant/participant-impl/participant-impl-http/src/test/java/handler/ClElementHandlerTest.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 
+import java.util.Map;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -32,6 +33,7 @@ import org.mockito.Spy;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement;
 import org.onap.policy.clamp.controlloop.participant.http.main.handler.ControlLoopElementHandler;
 import org.onap.policy.common.utils.coder.CoderException;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import utils.CommonTestData;
@@ -47,6 +49,8 @@ class ClElementHandlerTest {
     private CommonTestData commonTestData = new CommonTestData();
 
     private static ToscaServiceTemplate serviceTemplate;
+    private static final String HTTP_CONTROL_LOOP_ELEMENT =
+            "org.onap.domain.database.Http_PMSHMicroserviceControlLoopElement";
 
     @BeforeAll
     static void init() throws CoderException {
@@ -57,7 +61,11 @@ class ClElementHandlerTest {
     void test_ControlLoopElementUpdate() {
         doNothing().when(controlLoopElementHandler).invokeHttpClient(any());
         ControlLoopElement element = commonTestData.getControlLoopElement();
+
+        Map<String, ToscaNodeTemplate> nodeTemplatesMap =
+            serviceTemplate.getToscaTopologyTemplate().getNodeTemplates();
+
         assertDoesNotThrow(() -> controlLoopElementHandler
-            .controlLoopElementUpdate(element, serviceTemplate));
+            .controlLoopElementUpdate(element, nodeTemplatesMap.get(HTTP_CONTROL_LOOP_ELEMENT)));
     }
 }
diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java
index 20a23ca32..3f59c0822 100644
--- a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java
+++ b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/handler/ControlLoopElementHandler.java
@@ -44,7 +44,6 @@ import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,41 +121,31 @@ public class ControlLoopElementHandler implements ControlLoopElementListener {
      * Callback method to handle an update on a control loop element.
      *
      * @param element the information on the control loop element
-     * @param controlLoopDefinition toscaServiceTemplate
+     * @param nodeTemplate toscaNodeTemplate
      * @throws PfModelException in case of an exception
      */
     @Override
     public synchronized void controlLoopElementUpdate(ControlLoopElement element,
-                                                      ToscaServiceTemplate controlLoopDefinition)
-        throws PfModelException {
-
-        for (Map.Entry<String, ToscaNodeTemplate> nodeTemplate : controlLoopDefinition.getToscaTopologyTemplate()
-            .getNodeTemplates().entrySet()) {
-
-            // Fetching the node template of corresponding CL element
-            if (element.getDefinition().getName().equals(nodeTemplate.getKey())
-                && nodeTemplate.getValue().getProperties().containsKey("chart")) {
-                @SuppressWarnings("unchecked")
-                Map<String, Object> chartData =
-                    (Map<String, Object>) nodeTemplate.getValue().getProperties().get("chart");
-
-                LOGGER.info("Installation request received for the Helm Chart {} ", chartData);
-                try {
-                    var chartInfo =  CODER.decode(String.valueOf(chartData), ChartInfo.class);
-                    var repositoryValue = chartData.get("repository");
-                    if (repositoryValue != null) {
-                        chartInfo.setRepository(repositoryValue.toString());
-                    }
-                    chartService.installChart(chartInfo);
-                    chartMap.put(element.getId(), chartInfo);
+            ToscaNodeTemplate nodeTemplate) throws PfModelException {
+        @SuppressWarnings("unchecked")
+        Map<String, Object> chartData =
+            (Map<String, Object>) nodeTemplate.getProperties().get("chart");
+
+        LOGGER.info("Installation request received for the Helm Chart {} ", chartData);
+        try {
+            var chartInfo =  CODER.convert(chartData, ChartInfo.class);
+            var repositoryValue = chartData.get("repository");
+            if (repositoryValue != null) {
+                chartInfo.setRepository(repositoryValue.toString());
+            }
+            chartService.installChart(chartInfo);
+            chartMap.put(element.getId(), chartInfo);
 
-                    var config = CODER.convert(nodeTemplate.getValue().getProperties(), ThreadConfig.class);
-                    checkPodStatus(chartInfo, config.uninitializedToPassiveTimeout, config.podStatusCheckInterval);
+            var config = CODER.convert(nodeTemplate.getProperties(), ThreadConfig.class);
+            checkPodStatus(chartInfo, config.uninitializedToPassiveTimeout, config.podStatusCheckInterval);
 
-                } catch (ServiceException | CoderException | IOException e) {
-                    LOGGER.warn("Installation of Helm chart failed", e);
-                }
-            }
+        } catch (ServiceException | CoderException | IOException e) {
+            LOGGER.warn("Installation of Helm chart failed", e);
         }
     }
 
diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org.onap.policy.clamp.controlloop.participant.kubernetes/handler/ControlLoopElementHandlerTest.java b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org.onap.policy.clamp.controlloop.participant.kubernetes/handler/ControlLoopElementHandlerTest.java
index f8381ee7f..03d5b31f8 100644
--- a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org.onap.policy.clamp.controlloop.participant.kubernetes/handler/ControlLoopElementHandlerTest.java
+++ b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org.onap.policy.clamp.controlloop.participant.kubernetes/handler/ControlLoopElementHandlerTest.java
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.doThrow;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -52,6 +53,7 @@ import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
@@ -64,6 +66,8 @@ class ControlLoopElementHandlerTest {
     private static final String KEY_NAME = "org.onap.domain.database.HelloWorld_K8SMicroserviceControlLoopElement";
     private static List<ChartInfo> charts;
     private static ToscaServiceTemplate toscaServiceTemplate;
+    private static final String K8S_CONTROL_LOOP_ELEMENT =
+        "org.onap.domain.database.PMSH_K8SMicroserviceControlLoopElement";
 
 
     @InjectMocks
@@ -118,7 +122,9 @@ class ControlLoopElementHandlerTest {
         element.setDefinition(new ToscaConceptIdentifier(KEY_NAME, "1.0.1"));
         element.setOrderedState(ControlLoopOrderedState.PASSIVE);
 
-        controlLoopElementHandler.controlLoopElementUpdate(element, toscaServiceTemplate);
+        Map<String, ToscaNodeTemplate> nodeTemplatesMap =
+                toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates();
+        controlLoopElementHandler.controlLoopElementUpdate(element, nodeTemplatesMap.get(K8S_CONTROL_LOOP_ELEMENT));
 
         assertThat(controlLoopElementHandler.getChartMap()).hasSize(1).containsKey(elementId1);
 
@@ -127,7 +133,7 @@ class ControlLoopElementHandlerTest {
 
         UUID elementId2 = UUID.randomUUID();
         element.setId(elementId2);
-        controlLoopElementHandler.controlLoopElementUpdate(element, toscaServiceTemplate);
+        controlLoopElementHandler.controlLoopElementUpdate(element, nodeTemplatesMap.get(K8S_CONTROL_LOOP_ELEMENT));
 
         assertThat(controlLoopElementHandler.getChartMap().containsKey(elementId2)).isFalse();
     }
diff --git a/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 1b176f076..60515048e 100644
--- a/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
@@ -35,6 +35,7 @@ import org.onap.policy.clamp.controlloop.participant.intermediary.api.Participan
 import org.onap.policy.clamp.controlloop.participant.policy.client.PolicyApiHttpClient;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.base.PfModelRuntimeException;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
@@ -115,32 +116,35 @@ public class ControlLoopElementHandler implements ControlLoopElementListener {
      * Callback method to handle an update on a control loop element.
      *
      * @param element the information on the control loop element
-     * @param controlLoopDefinition toscaServiceTemplate
+     * @param clElementDefinition toscaNodeTemplate
      * @throws PfModelException in case of an exception
      */
     @Override
-    public void controlLoopElementUpdate(ControlLoopElement element, ToscaServiceTemplate controlLoopDefinition)
+    public void controlLoopElementUpdate(ControlLoopElement element, ToscaNodeTemplate clElementDefinition)
             throws PfModelException {
         intermediaryApi.updateControlLoopElementState(element.getId(), element.getOrderedState(),
                 ControlLoopState.PASSIVE);
-        if (controlLoopDefinition.getPolicyTypes() != null) {
-            for (ToscaPolicyType policyType : controlLoopDefinition.getPolicyTypes().values()) {
-                policyTypeMap.put(policyType.getName(), policyType.getVersion());
+        ToscaServiceTemplate controlLoopDefinition = intermediaryApi.getToscaServiceTemplate();
+        if (controlLoopDefinition.getToscaTopologyTemplate() != null) {
+            if (controlLoopDefinition.getPolicyTypes() != null) {
+                for (ToscaPolicyType policyType : controlLoopDefinition.getPolicyTypes().values()) {
+                    policyTypeMap.put(policyType.getName(), policyType.getVersion());
+                }
+                LOGGER.debug("Found Policy Types in control loop definition: {} , Creating Policy Types",
+                        controlLoopDefinition.getName());
+                apiHttpClient.createPolicyType(controlLoopDefinition);
             }
-            LOGGER.debug("Found Policy Types in control loop definition: {} , Creating Policy Types",
-                    controlLoopDefinition.getName());
-            apiHttpClient.createPolicyType(controlLoopDefinition);
-        }
-        if (controlLoopDefinition.getToscaTopologyTemplate().getPolicies() != null) {
-            for (Map<String, ToscaPolicy> foundPolicyMap : controlLoopDefinition.getToscaTopologyTemplate()
-                    .getPolicies()) {
-                for (ToscaPolicy policy : foundPolicyMap.values()) {
-                    policyMap.put(policy.getName(), policy.getVersion());
+            if (controlLoopDefinition.getToscaTopologyTemplate().getPolicies() != null) {
+                for (Map<String, ToscaPolicy> foundPolicyMap : controlLoopDefinition.getToscaTopologyTemplate()
+                        .getPolicies()) {
+                    for (ToscaPolicy policy : foundPolicyMap.values()) {
+                        policyMap.put(policy.getName(), policy.getVersion());
+                    }
                 }
+                LOGGER.debug("Found Policies in control loop definition: {} , Creating Policies",
+                        controlLoopDefinition.getName());
+                apiHttpClient.createPolicy(controlLoopDefinition);
             }
-            LOGGER.debug("Found Policies in control loop definition: {} , Creating Policies",
-                    controlLoopDefinition.getName());
-            apiHttpClient.createPolicy(controlLoopDefinition);
         }
     }
 
diff --git a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantMessagesTest.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantMessagesTest.java
index 08e7154bb..df9a4b259 100644
--- a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantMessagesTest.java
+++ b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantMessagesTest.java
@@ -21,8 +21,10 @@
 package org.onap.policy.clamp.controlloop.participant.policy.endtoend;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.junit.Assert.assertEquals;
 
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +38,8 @@ import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopInfo;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopStatistics;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition;
+import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantDeregister;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantDeregisterAck;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantRegister;
@@ -43,6 +47,7 @@ import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.Parti
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantStatus;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdate;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdateAck;
+import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ControlLoopUpdateListener;
 import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ParticipantDeregisterAckListener;
 import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ParticipantMessagePublisher;
 import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ParticipantRegisterAckListener;
@@ -52,7 +57,7 @@ import org.onap.policy.clamp.controlloop.participant.policy.main.utils.TestListe
 import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -135,6 +140,9 @@ class ParticipantMessagesTest {
             ParticipantUpdateListener participantUpdateListener = new ParticipantUpdateListener(participantHandler);
             participantUpdateListener.onTopicEvent(INFRA, TOPIC, null, participantUpdateMsg);
         }
+
+        // Verify the result of GET participants with what is stored
+        assertEquals("org.onap.PM_Policy", participantHandler.getParticipantId().getName());
     }
 
     @Test
@@ -156,13 +164,17 @@ class ParticipantMessagesTest {
         final ParticipantStatus heartbeat = new ParticipantStatus();
         heartbeat.setParticipantId(getParticipantId());
         ControlLoopInfo clInfo = getControlLoopInfo(getControlLoopId());
-        heartbeat.setControlLoopInfoMap(Map.of(getControlLoopId().toString(), clInfo));
+        clInfo.setControlLoopId(getControlLoopId());
+        heartbeat.setControlLoopInfoList(List.of(clInfo));
 
         ControlLoopElementDefinition clDefinition = getClElementDefinition();
-        Map<UUID, ControlLoopElementDefinition> clElementDefinitionMap = Map.of(UUID.randomUUID(), clDefinition);
-        Map<String, Map<UUID, ControlLoopElementDefinition>>
-            participantDefinitionUpdateMap = Map.of(getParticipantId().toString(), clElementDefinitionMap);
-        heartbeat.setParticipantDefinitionUpdateMap(participantDefinitionUpdateMap);
+        List<ControlLoopElementDefinition> controlLoopElementDefinitionList =
+            List.of(clDefinition);
+        ParticipantDefinition participantDefinition = new ParticipantDefinition();
+        participantDefinition.setParticipantId(getParticipantId());
+        participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList);
+        List<ParticipantDefinition> participantDefinitionUpdates = List.of(participantDefinition);
+        heartbeat.setParticipantDefinitionUpdates(participantDefinitionUpdates);
 
         synchronized (lockit) {
             ParticipantMessagePublisher publisher =
@@ -208,15 +220,15 @@ class ParticipantMessagesTest {
     }
 
     private ControlLoopElementDefinition getClElementDefinition() {
-        ToscaServiceTemplate toscaServiceTemplate = new ToscaServiceTemplate();
-        toscaServiceTemplate.setName("serviceTemplate");
-        toscaServiceTemplate.setDerivedFrom("parentServiceTemplate");
-        toscaServiceTemplate.setDescription("Description of serviceTemplate");
-        toscaServiceTemplate.setVersion("1.2.3");
+        ToscaNodeTemplate toscaNodeTemplate = new ToscaNodeTemplate();
+        toscaNodeTemplate.setName("serviceTemplate");
+        toscaNodeTemplate.setDerivedFrom("parentServiceTemplate");
+        toscaNodeTemplate.setDescription("Description of serviceTemplate");
+        toscaNodeTemplate.setVersion("1.2.3");
 
         ControlLoopElementDefinition clDefinition = new ControlLoopElementDefinition();
-        clDefinition.setId(UUID.randomUUID());
-        clDefinition.setControlLoopElementToscaServiceTemplate(toscaServiceTemplate);
+        clDefinition.setCommonPropertiesMap(Map.of("Prop1", "Prop1Value"));
+        clDefinition.setControlLoopElementToscaNodeTemplate(toscaNodeTemplate);
         Map<String, String> commonPropertiesMap = Map.of("Prop1", "PropValue");
         clDefinition.setCommonPropertiesMap(commonPropertiesMap);
         return clDefinition;
diff --git a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantPolicyTest.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantPolicyTest.java
deleted file mode 100644
index 10563cde2..000000000
--- a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/endtoend/ParticipantPolicyTest.java
+++ /dev/null
@@ -1,103 +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=========================================================
- */
-
-package org.onap.policy.clamp.controlloop.participant.policy.endtoend;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState;
-import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopStateChange;
-import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate;
-import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ControlLoopStateChangeListener;
-import org.onap.policy.clamp.controlloop.participant.intermediary.comm.ControlLoopUpdateListener;
-import org.onap.policy.clamp.controlloop.participant.intermediary.handler.ParticipantHandler;
-import org.onap.policy.clamp.controlloop.participant.policy.main.utils.TestListenerUtils;
-import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = {"classpath:application_test.properties"})
-class ParticipantPolicyTest {
-
-    private static final Object lockit = new Object();
-    private static final CommInfrastructure INFRA = CommInfrastructure.NOOP;
-    private static final String TOPIC = "my-topic";
-
-    @Autowired
-    private ParticipantHandler participantHandler;
-
-    @Test
-    void testUpdatePolicyTypes() {
-        ControlLoopUpdate controlLoopUpdateMsg = TestListenerUtils.createControlLoopUpdateMsg();
-        controlLoopUpdateMsg.getControlLoop().setOrderedState(ControlLoopOrderedState.PASSIVE);
-
-        synchronized (lockit) {
-            ControlLoopUpdateListener clUpdateListener = new ControlLoopUpdateListener(participantHandler);
-
-            clUpdateListener.onTopicEvent(INFRA, TOPIC, null, controlLoopUpdateMsg);
-        }
-        // Verify the result of GET participants with what is stored
-        assertEquals("org.onap.PM_Policy", participantHandler.getParticipantId().getName());
-    }
-
-    @Test
-    void testUpdatePolicies() throws Exception {
-        ControlLoopUpdate controlLoopUpdateMsg = TestListenerUtils.createControlLoopUpdateMsg();
-        controlLoopUpdateMsg.getControlLoop().setOrderedState(ControlLoopOrderedState.PASSIVE);
-
-        synchronized (lockit) {
-            ControlLoopUpdateListener clUpdateListener = new ControlLoopUpdateListener(participantHandler);
-
-            clUpdateListener.onTopicEvent(INFRA, TOPIC, null, controlLoopUpdateMsg);
-        }
-        // Verify the result of GET participants with what is stored
-        assertEquals("org.onap.PM_Policy", participantHandler.getParticipantId().getName());
-    }
-
-    @Test
-    void testDeletePoliciesAndPolicyTypes() throws Exception {
-        ControlLoopUpdate controlLoopUpdateMsg = TestListenerUtils.createControlLoopUpdateMsg();
-        controlLoopUpdateMsg.getControlLoop().setOrderedState(ControlLoopOrderedState.PASSIVE);
-
-        synchronized (lockit) {
-            ControlLoopUpdateListener clUpdateListener = new ControlLoopUpdateListener(participantHandler);
-
-            clUpdateListener.onTopicEvent(INFRA, TOPIC, null, controlLoopUpdateMsg);
-        }
-        // Verify the result of GET participants with what is stored
-        assertEquals("org.onap.PM_Policy", participantHandler.getParticipantId().getName());
-
-        ControlLoopStateChangeListener clStateChangeListener = new ControlLoopStateChangeListener(participantHandler);
-        ControlLoopStateChange controlLoopStateChangeMsg =
-                TestListenerUtils.createControlLoopStateChangeMsg(ControlLoopOrderedState.UNINITIALISED);
-        controlLoopStateChangeMsg.setOrderedState(ControlLoopOrderedState.UNINITIALISED);
-        clStateChangeListener.onTopicEvent(INFRA, TOPIC, null, controlLoopStateChangeMsg);
-
-        // Verify the result of GET participants with what is stored
-        assertEquals("org.onap.PM_Policy", participantHandler.getParticipantId().getName());
-    }
-}
diff --git a/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 f87714e0e..5984cf149 100644
--- a/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
@@ -25,7 +25,9 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -34,6 +36,8 @@ import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantUpdates;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopStateChange;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdate;
@@ -55,6 +59,7 @@ public class TestListenerUtils {
     private static final Coder CODER = new StandardCoder();
     static CommonTestData commonTestData = new CommonTestData();
     private static final Logger LOGGER = LoggerFactory.getLogger(TestListenerUtils.class);
+    private static final String CONTROL_LOOP_ELEMENT = "ControlLoopElement";
 
     private TestListenerUtils() {}
 
@@ -130,47 +135,80 @@ public class TestListenerUtils {
      */
     public static ControlLoopUpdate createControlLoopUpdateMsg() {
         final ControlLoopUpdate clUpdateMsg = new ControlLoopUpdate();
-        ToscaConceptIdentifier controlLoopId = new ToscaConceptIdentifier();
-        controlLoopId.setName("PMSHInstance0");
-        controlLoopId.setVersion("1.0.0");
-
-        ToscaConceptIdentifier participantId = new ToscaConceptIdentifier();
-        participantId.setName("org.onap.PM_Policy");
-        participantId.setVersion("0.0.0");
+        ToscaConceptIdentifier controlLoopId =
+            new ToscaConceptIdentifier("PMSHInstance0", "1.0.0");
+        ToscaConceptIdentifier participantId =
+            new ToscaConceptIdentifier("org.onap.PM_Policy", "0.0.0");
 
         clUpdateMsg.setControlLoopId(controlLoopId);
         clUpdateMsg.setParticipantId(participantId);
+        clUpdateMsg.setMessageId(UUID.randomUUID());
+        clUpdateMsg.setTimestamp(Instant.now());
 
-        ControlLoop controlLoop = new ControlLoop();
         Map<UUID, ControlLoopElement> elements = new LinkedHashMap<>();
         ToscaServiceTemplate toscaServiceTemplate = testControlLoopRead();
         Map<String, ToscaNodeTemplate> nodeTemplatesMap =
                 toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates();
         for (Map.Entry<String, ToscaNodeTemplate> toscaInputEntry : nodeTemplatesMap.entrySet()) {
-            ControlLoopElement clElement = new ControlLoopElement();
-            clElement.setId(UUID.randomUUID());
+            if (toscaInputEntry.getValue().getType().contains(CONTROL_LOOP_ELEMENT)) {
+                ControlLoopElement clElement = new ControlLoopElement();
+                clElement.setId(UUID.randomUUID());
+                ToscaConceptIdentifier clParticipantId;
+                try {
+                    clParticipantId = CODER.decode(
+                            toscaInputEntry.getValue().getProperties().get("participant_id").toString(),
+                            ToscaConceptIdentifier.class);
+                } catch (CoderException e) {
+                    throw new RuntimeException("cannot get ParticipantId from toscaNodeTemplate", e);
+                }
 
-            ToscaConceptIdentifier clElementParticipantId = new ToscaConceptIdentifier();
-            clElementParticipantId.setName(toscaInputEntry.getKey());
-            clElementParticipantId.setVersion(toscaInputEntry.getValue().getVersion());
-            clElement.setParticipantId(clElementParticipantId);
-            clElement.setParticipantType(clElementParticipantId);
+                clElement.setParticipantId(clParticipantId);
+                clElement.setParticipantType(clParticipantId);
 
-            clElement.setDefinition(clElementParticipantId);
-            clElement.setState(ControlLoopState.UNINITIALISED);
-            clElement.setDescription(toscaInputEntry.getValue().getDescription());
-            clElement.setOrderedState(ControlLoopOrderedState.UNINITIALISED);
-            elements.put(clElement.getId(), clElement);
+                clElement.setDefinition(new ToscaConceptIdentifier(toscaInputEntry.getKey(),
+                    toscaInputEntry.getValue().getVersion()));
+                clElement.setState(ControlLoopState.UNINITIALISED);
+                clElement.setDescription(toscaInputEntry.getValue().getDescription());
+                clElement.setOrderedState(ControlLoopOrderedState.PASSIVE);
+                elements.put(clElement.getId(), clElement);
+            }
         }
-        controlLoop.setElements(elements);
-        controlLoop.setName("PMSHInstance0");
-        controlLoop.setVersion("1.0.0");
-        controlLoop.setDefinition(controlLoopId);
-        clUpdateMsg.setControlLoop(controlLoop);
 
+        List<ParticipantUpdates> participantUpdates = new ArrayList<>();
+        for (ControlLoopElement element : elements.values()) {
+            prepareParticipantUpdateForControlLoop(element, participantUpdates);
+        }
+        clUpdateMsg.setParticipantUpdatesList(participantUpdates);
         return clUpdateMsg;
     }
 
+    private static void prepareParticipantUpdateForControlLoop(ControlLoopElement clElement,
+        List<ParticipantUpdates> participantUpdates) {
+        if (participantUpdates.isEmpty()) {
+            participantUpdates.add(getControlLoopElementList(clElement));
+        } else {
+            boolean participantExists = false;
+            for (ParticipantUpdates participantUpdate : participantUpdates) {
+                if (participantUpdate.getParticipantId().equals(clElement.getParticipantId())) {
+                    participantUpdate.getControlLoopElementList().add(clElement);
+                    participantExists = true;
+                }
+            }
+            if (!participantExists) {
+                participantUpdates.add(getControlLoopElementList(clElement));
+            }
+        }
+    }
+
+    private static ParticipantUpdates getControlLoopElementList(ControlLoopElement clElement) {
+        ParticipantUpdates participantUpdate = new ParticipantUpdates();
+        List<ControlLoopElement> controlLoopElementList = new ArrayList<>();
+        participantUpdate.setParticipantId(clElement.getParticipantId());
+        controlLoopElementList.add(clElement);
+        participantUpdate.setControlLoopElementList(controlLoopElementList);
+        return participantUpdate;
+    }
+
     /**
      * Method to create participantUpdateMsg.
      *
@@ -192,20 +230,63 @@ public class TestListenerUtils {
         // Add policies to the toscaServiceTemplate
         TestListenerUtils.addPoliciesToToscaServiceTemplate(toscaServiceTemplate);
 
-        ControlLoopElementDefinition clDefinition = new ControlLoopElementDefinition();
-        clDefinition.setId(UUID.randomUUID());
-        clDefinition.setControlLoopElementToscaServiceTemplate(toscaServiceTemplate);
-        Map<String, String> commonPropertiesMap = Map.of("Prop1", "PropValue");
-        clDefinition.setCommonPropertiesMap(commonPropertiesMap);
+        List<ParticipantDefinition> participantDefinitionUpdates = new ArrayList<>();
+        for (Map.Entry<String, ToscaNodeTemplate> toscaInputEntry :
+            toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates().entrySet()) {
+            if (toscaInputEntry.getValue().getType().contains(CONTROL_LOOP_ELEMENT)) {
+                ToscaConceptIdentifier clParticipantId;
+                try {
+                    clParticipantId = CODER.decode(
+                            toscaInputEntry.getValue().getProperties().get("participant_id").toString(),
+                            ToscaConceptIdentifier.class);
+                } catch (CoderException e) {
+                    throw new RuntimeException("cannot get ParticipantId from toscaNodeTemplate", e);
+                }
+                prepareParticipantDefinitionUpdate(clParticipantId, toscaInputEntry.getKey(),
+                    toscaInputEntry.getValue(), participantDefinitionUpdates);
+            }
+        }
 
-        Map<UUID, ControlLoopElementDefinition> controlLoopElementDefinitionMap =
-                Map.of(UUID.randomUUID(), clDefinition);
+        participantUpdateMsg.setParticipantDefinitionUpdates(participantDefinitionUpdates);
+        participantUpdateMsg.setToscaServiceTemplate(toscaServiceTemplate);
+        return participantUpdateMsg;
+    }
 
-        Map<String, Map<UUID, ControlLoopElementDefinition>> participantDefinitionUpdateMap =
-                Map.of(participantId.toString(), controlLoopElementDefinitionMap);
-        participantUpdateMsg.setParticipantDefinitionUpdateMap(participantDefinitionUpdateMap);
+    private static void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantId, String entryKey,
+        ToscaNodeTemplate entryValue, List<ParticipantDefinition> participantDefinitionUpdates) {
+
+        var clDefinition = new ControlLoopElementDefinition();
+        clDefinition.setClElementDefinitionId(new ToscaConceptIdentifier(
+            entryKey, entryValue.getVersion()));
+        clDefinition.setControlLoopElementToscaNodeTemplate(entryValue);
+        List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>();
+
+        if (participantDefinitionUpdates.isEmpty()) {
+            participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantId,
+                controlLoopElementDefinitionList));
+        } else {
+            boolean participantExists = false;
+            for (ParticipantDefinition participantDefinitionUpdate : participantDefinitionUpdates) {
+                if (participantDefinitionUpdate.getParticipantId().equals(clParticipantId)) {
+                    participantDefinitionUpdate.getControlLoopElementDefinitionList().add(clDefinition);
+                    participantExists = true;
+                }
+            }
+            if (!participantExists) {
+                participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantId,
+                    controlLoopElementDefinitionList));
+            }
+        }
+    }
 
-        return participantUpdateMsg;
+    private static ParticipantDefinition getParticipantDefinition(ControlLoopElementDefinition clDefinition,
+        ToscaConceptIdentifier clParticipantId,
+        List<ControlLoopElementDefinition> controlLoopElementDefinitionList) {
+        ParticipantDefinition participantDefinition = new ParticipantDefinition();
+        participantDefinition.setParticipantId(clParticipantId);
+        controlLoopElementDefinitionList.add(clDefinition);
+        participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList);
+        return participantDefinition;
     }
 
     /**
diff --git a/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..4b8e3592a 100644
--- a/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
@@ -136,7 +136,7 @@ topology_template:
       description: Control loop element for CDS for Performance Management Subscription Handling
       properties:
         provider: Ericsson
-        participant_Id:
+        participant_id:
           name: org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant
           version: 3.2.1
         cds_blueprint_id:
diff --git a/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..8615bdbaa 100644
--- a/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
@@ -1,614 +1,153 @@
 tosca_definitions_version: tosca_simple_yaml_1_3
-policy_types:
-   onap.policies.Monitoring:
-      derived_from: tosca.policies.Root
-      version: 1.0.0
-      name: onap.policies.Monitoring
-      description: a base policy type for all policies that govern monitoring provisioning
-   onap.policies.monitoring.dcae-pm-subscription-handler:
-      derived_from: onap.policies.Monitoring
-      version: 1.0.0
-      properties:
-         subscription:
-            type: map
-            description: PM Subscription Handler Subscription
-            entry_schema:
-               type: onap.datatypes.monitoring.subscription
 data_types:
-   onap.datatypes.monitoring.subscription:
-      derived_from: tosca.datatypes.Root
-      properties:
-         subscriptionName:
-            type: string
-            description: Name of the subscription
-            required: true
-         administrativeState:
-            type: string
-            description: State of the subscription
-            required: true
-            constraints:
-            -  valid_values:
-               - LOCKED
-               - UNLOCKED
-         fileBasedGP:
-            type: integer
-            description: File based granularity period
-            required: true
-         fileLocation:
-            type: string
-            description: ROP file location
-            required: true
-         nfTypeModelInvariantId:
-            type: string
-            description: Network function invariant ID
-            required: true
-         nfFilter:
-            type: map
-            description: Network function filter
-            required: true
-            entry_schema:
-               type: onap.datatypes.monitoring.nfFilter
-         measurementGroups:
-            type: list
-            description: Measurement Groups
-            required: true
-            entry_schema:
-               type: onap.datatypes.monitoring.measurementGroups
-   onap.datatypes.monitoring.nfFilter:
-      derived_from: tosca.datatypes.Root
-      properties:
-         nfNames:
-            type: list
-            description: List of network functions
-            required: true
-            #default: []
-            entry_schema:
-               type: string
-         swVersions:
-            type: list
-            description: List of software versions
-            required: true
-            #default: []
-            entry_schema:
-               type: string
-   onap.datatypes.monitoring.measurementGroups:
-      derived_from: tosca.datatypes.Root
-      properties:
-         measurementGroup:
-            type: map
-            description: Measurement Group
-            required: true
-            entry_schema:
-               type: onap.datatypes.monitoring.measurementGroup
-   onap.datatypes.monitoring.measurementGroup:
-      derived_from: tosca.datatypes.Root
-      properties:
-         measurementTypes:
-            type: list
-            description: List of measurement types
-            required: true
-            #default: []
-            entry_schema:
-               type: onap.datatypes.monitoring.measurementTypes
-         managedObjectDNsBasic:
-            type: list
-            description: List of managed object distinguished names
-            required: true
-            #default: []
-            entry_schema:
-               type: onap.datatypes.monitoring.managedObjectDNsBasics
-   onap.datatypes.monitoring.measurementTypes:
-      derived_from: tosca.datatypes.Root
-      properties:
-         measurementType:
-            type: map
-            description: Measurement type object
-            required: true
-            entry_schema:
-               type: onap.datatypes.monitoring.measurementType
-   onap.datatypes.monitoring.measurementType:
-      derived_from: tosca.datatypes.Root
-      properties:
-         measurementType:
-            type: string
-            description: Measurement type
-            required: true
-   onap.datatypes.monitoring.managedObjectDNsBasics:
-      derived_from: tosca.datatypes.Root
-      properties:
-         managedObjectDNsBasic:
-            type: map
-            description: Managed object distinguished name object
-            required: true
-            entry_schema:
-               type: onap.datatypes.monitoring.managedObjectDNsBasic
-   onap.datatypes.monitoring.managedObjectDNsBasic:
-      derived_from: tosca.datatypes.Root
-      properties:
-         DN:
-            type: string
-            description: Managed object distinguished name
-            required: true
-capability_types:
-  org.onap.EventProducer:
+  onap.datatypes.ToscaConceptIdentifier:
+    derived_from: tosca.datatypes.Root
     properties:
-      carrier_protocol_type:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - DMAAP_message_router
-          - SOMETHING_ELSE
-          - REST
-      data_format:
+      name:
         type: string
         required: true
-        constraints:
-        - valid_values:
-          - JSON
-          - YAML
-          - JMS
-      event_format:
+      version:
         type: string
         required: true
-      event_format_version:
-        type: string
-        required: false
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key may be generated
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-    version: 0.0.1
-    derived_from: tosca.capabilities.Root
-  org.onap.EventConsumer:
-    properties:
-      responding_capability:
-        type: string
-        required: false
-      carrier_protocol_type:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - DMAAP_message_router
-          - SOMETHING_ELSE
-          - REST
-      data_format:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - JSON
-          - YAML
-          - JMS
-          - all valid values should be added here
-      event_format:
-        type: string
-        description: 'examples for event_format: Ves_specification, LinkUp, VnfConfigured,
-          etc.'
-        required: true
-      event_format_version:
-        type: string
-        description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'
-        required: false
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key may be generated
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-    version: 0.0.1
-    derived_from: tosca.capabilities.Root
 node_types:
-  org.onap.DynamicConfig:
+  org.onap.policy.clamp.controlloop.Participant:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      application_name:
-        type: string
-        description: Value used to tie the config to an application ? should we be
-          using a relationship here instead?
-        required: true
-      application_version:
-        type: string
-        required: true
-      application_provider:
+      provider:
         type: string
-        required: false
-      data_types:
-        type: object
-        required: false
-      schema:
-        type: object
-        required: false
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-  org.onap.APP:
+        requred: false
+  org.onap.policy.clamp.controlloop.ControlLoopElement:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      application_name:
-        type: string
-        description: Human readable name for the application Product
-        required: false
       provider:
         type: string
-        description: Provider of the application and of the descriptor
-        required: true
-      application_version:
-        type: string
-        description: Software version of the application
-        required: true
-      blueprint_id:
-        type: string
-        description: A reference to the app blueprint
-        required: false
-      monitoring_policy:
-        type: string
-        description: A reference to the monitoring policy
-        required: false
-    requirements:
-    - receive:
-        capability: org.onap.EventProducer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        type: string
-        type_version: 0.0.0
-        version: 0.0.0
-    - send:
-        capability: org.onap.EventConsumer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        type: string
-        type_version: 0.0.0
-        version: 0.0.0
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-  org.onap.EventRelay:
+        requred: false
+      participant_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.ControlLoop:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      event_format:
-        type: string
-        description: 'examples for event_format: Ves_specification, etc.'
-        required: true
-      event_format_version:
+      provider:
         type: string
-        description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'
-        required: true
-      config_keys:
+        requred: false
+      elements:
         type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key is relayed
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-      supported_carrier_protocols:
-        type: map
-        description: 'A map describing supported carrier protocols and translations.
-          The tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { REST: REST, DMAAP: REST, DMAAP: DMAAP}'
-        required: true
-        key_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - DMAAP_message_router
-            - SOMETHING_ELSE
-            - REST
-            - all valid values should be added here
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - DMAAP_message_router
-            - SOMETHING_ELSE
-            - REST
-            - all valid values should be added here
-      supported_data_formats:
-        type: map
-        description: 'Is a map describing supported data formats and translation.
-          The tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { JSON: JSON, JMS: JSON, YAML:YAML }'
         required: true
-        key_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - JSON
-            - JMS
-            - YAML
-            - etc
-            - all valid values should be added here
         entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - JSON
-            - JMS
-            - YAML
-            - etc
-            - all valid values should be added here
-    requirements:
-    - receive:
-        capability: org.onap.EventProducer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        type: string
-        type_version: 0.0.0
-        version: 0.0.0
-    - send:
-        capability: org.onap.EventConsumer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        type: string
-        type_version: 0.0.0
-        version: 0.0.0
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-relationship_types:
-  org.onap.PropagateEvent:
+          type: onap.datatypes.ToscaConceptIdentifier
+  org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
     properties:
-      config_keys:
-        type: list
-        description: The relationship type used on requirements to org.onap.EventProducer
-          and org.onap.EventConsumer capabilities. Filters events by specific config_keys
-          to be transferred by this relationship. That is, any event with a specific
-          config_key found in the list is transferred. If list is not defined or is
-          empty, events with all config_keys are transferred.
-        required: false
-        entry_schema:
-          type: string
-    version: 0.0.1
-    derived_from: tosca.relationships.Root
+      dcae_blueprint_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    properties:
+      policy_type_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.CDSControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    properties:
+      cds_blueprint_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
 topology_template:
-  inputs:
-    pm_subscription_topic:
-      type: string
-    pm_subscription_response_topic:
-      type: string
-    pm_subscription_handler_blueprint_id:
-      type: string
-    pm_subscription_operational_policy_id:
-      type: string
-    pm_subscription_cds_blueprint_id:
-      type: string
-    enable_tls:
-      type: string
   node_templates:
-    org.onap.PM_Subscription_Handler:
-      type: org.onap.APP
-      type_version: 0.0.0
+    org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant:
+      version: 2.3.4
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.policy.controlloop.PolicyControlLoopParticipant:
+      version: 2.3.1
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant:
+      version: 2.2.1
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.domain.pmsh.PMSH_DCAEMicroservice:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the DCAE microservice for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Handler
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_handler_blueprint_id
-          description: Is this a reference to the DCAE Cloudify Blueprint that is
-            already stored(or will be stored before CL configuration & instatiation)
-            in DCAE Inventory?
-        artifact_config:
-          enable_tls:
-            get_input: enable_tls
-          pmsh_publish_topic_name:
-            get_input: pm_subscription_topic
-      capabilities:
-        pm-subscription-event-publisher:
-          properties:
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-format
-            event_format_version: 1.0.0
-          attributes:
-            type: org.onap.EventProducer
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-        pm-subscription-event-receiver:
-          properties:
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-response-format
-            event_format_version: 1.0.0
-            relationships:
-            - type: tosca.relationships.DependsOn
-            - description: any ideas on a better realtionship ? or is it better to
-                just use the root realtionship ?
-            - target: org.onap.PM_Monitoring_Policy
-          attributes:
-            type: org.onap.EventConsumer
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.PM_Monitoring_Policy:
-      type: org.onap.DynamicConfig
-      type_version: 0.0.0
+        participant_id:
+          name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant
+          version: 2.3.4
+        dcae_blueprint_id:
+          name: org.onap.dcae.blueprints.PMSHBlueprint
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the monitoring policy for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Handler
-        application_version: 1.0.0
         provider: Ericsson
-        data_types:
-          measurementType:
-            type: string
-          DN:
-            type: string
-          nfFilter:
-            properties:
-              nfNames:
-                type: list
-                entry_schema: string
-              modelInvariantIDs:
-                type: list
-                entry_schema:
-                  type: string
-              modelVersionIDs:
-                type: list
-                entry_schema:
-                  type: string
-          measurementGroup:
-            properties:
-              masurementTypes:
-                type: list
-                entry_schema:
-                  type: measurementType
-              managedObjectDNsBasic:
-                type: list
-                entry_schema:
-                  type: DN
-        schema:
-          subscription:
-            subscriptionName:
-              type: string
-              required: true
-            administrativeState:
-              type: string
-              required: true
-            filebasedGP:
-              type: integer
-              required: true
-            fileLocation:
-              type: string
-              required: true
-            nfFilter:
-              type: nfFilter
-            measurementGroups:
-              type: list
-              entry_schema:
-                type: measurementGroup
-      version: 0.0.0
-      description: Should I be showing a dependency between PM Subscription Handler
-        and the PM Monitoring Policy
-    org.onap.PM_Policy:
-      type: org.onap.APP
-      type_version: 0.0.0
+        participant_id:
+          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+          version: 2.3.1
+        policy_type_id:
+          name: onap.policies.monitoring.pm-subscription-handler
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the operational policy for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Operational Policy
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_operational_policy_id
-        artifact_config: NOT_DEFINED
-      requirements:
-      - receive_0:
-          capability: pm-subscription-event-publisher
-          node: org.onap.PM_Subscription_Handler
-          relationship: NOT_DEFINED
-          properties:
-            config_keys:
-            - topic_name:
-                get_input: pm_subscription_topic
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-      - send_0:
-          capability: cds-rest-receive
-          node: org.onap.CDS
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-      - receive_1:
-          capability: cds-rest-response
-          node: org.onap.CDS
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-      - send_1:
-          capability: pm-subscription-event-receiver
-          node: org.onap.PM_Subscription_Handler
-          relationship: NOT_DEFINED
-          properties:
-            config_keys:
-            - topic_name:
-                get_input: pm_subscription_response_topic
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-      capabilities:
-        pm-subscription-response-event-publisher:
-          properties:
-            type: org.onap.EventProducer
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-response-format
-            event_format_version: 1.0.0
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.PM_CDS_Blueprint:
-      type: org.onap.APP
-      type_version: 0.0.0
+        participant_id:
+          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+          version: 2.3.1
+        policy_type_id:
+          name: onap.policies.operational.pm-subscription-handler
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.ControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for CDS for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription CDS Blueprint
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_cds_blueprint_id
-      capabilities:
-        cds-rest-receive:
-          properties:
-            type: org.onap.EventConsumer
-            protocol_type: REST
-            data_format: JSON
-            event_format: cds_action_format
-            event_format_version: 1.0.0
-            responding_capability: cds-rest-response
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-        cds-rest-response:
-          properties:
-            type: org.onap.EventProducer
-            protocol_type: REST
-            data_format: JSON
-            event_format: cds_action_response_format
-            event_format_version: 1.0.0
-          occurrences:
-          - 0.0
-          type: string
-          type_version: 0.0.0
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.controlloop0:
-      type: org.onap.APP
-      type_version: 0.0.0
+        participant_id:
+          name: org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant
+          version: 3.2.1
+        cds_blueprint_id:
+          name: org.onap.ccsdk.cds.PMSHCdsBlueprint
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSHControlLoopDefinition:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.ControlLoop
+      type_version: 1.0.0
+      description: Control loop for Performance Management Subscription Handling
       properties:
-        application_name: Test Control Loop
         provider: Ericsson
-        application_version: 1.0.0
-        status: NOT_DEPLOYED
-      version: 0.0.0
-version: 0.0.0
-
+        elements:
+          - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement
+            version: 1.2.3
diff --git a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/endtoend/ParticipantSimulatorTest.java b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/endtoend/ParticipantSimulatorTest.java
index beb50da37..a9dea1748 100644
--- a/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/endtoend/ParticipantSimulatorTest.java
+++ b/participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/endtoend/ParticipantSimulatorTest.java
@@ -105,7 +105,6 @@ class ParticipantSimulatorTest {
 
                 ControlLoopUpdate controlLoopUpdateMsg =
                         TestListenerUtils.createControlLoopUpdateMsg();
-                controlLoopUpdateMsg.getControlLoop().setOrderedState(ControlLoopOrderedState.PASSIVE);
                 clUpdateListener.onTopicEvent(INFRA, TOPIC, null, controlLoopUpdateMsg);
 
             }
@@ -275,10 +274,6 @@ class ParticipantSimulatorTest {
         UUID uuid = controlLoopElements.keySet().iterator().next();
         ControlLoopElement controlLoopElement = controlLoopElements.get(uuid);
 
-        // Check the initial state on the ControlLoopElement, which is UNINITIALISED
-        assertEquals(ControlLoopOrderedState.UNINITIALISED, controlLoopElement.getOrderedState());
-
-        // Change the state of the ControlLoopElement to PASSIVE from UNINITIALISED
         controlLoopElement.setOrderedState(ControlLoopOrderedState.PASSIVE);
 
         // PUT REST call for updating ControlLoopElement
diff --git a/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 999feb1e1..2b8de6ae1 100644
--- a/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
@@ -25,17 +25,22 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElement;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState;
 import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState;
-import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantState;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantDefinition;
+import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantUpdates;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopStateChange;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate;
+import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantUpdate;
 import org.onap.policy.clamp.controlloop.participant.simulator.main.parameters.CommonTestData;
 import org.onap.policy.common.utils.coder.Coder;
 import org.onap.policy.common.utils.coder.CoderException;
@@ -54,6 +59,7 @@ public class TestListenerUtils {
     private static final Coder CODER = new StandardCoder();
     static CommonTestData commonTestData = new CommonTestData();
     private static final Logger LOGGER = LoggerFactory.getLogger(TestListenerUtils.class);
+    private static final String CONTROL_LOOP_ELEMENT = "ControlLoopElement";
 
     private TestListenerUtils() {}
 
@@ -125,43 +131,159 @@ public class TestListenerUtils {
      */
     public static ControlLoopUpdate createControlLoopUpdateMsg() {
         final ControlLoopUpdate clUpdateMsg = new ControlLoopUpdate();
-        ToscaConceptIdentifier controlLoopId = new ToscaConceptIdentifier("PMSHInstance0", "1.0.0");
-        ToscaConceptIdentifier participantId = new ToscaConceptIdentifier("org.onap.PM_CDS_Blueprint", "1.0.0");
+        ToscaConceptIdentifier controlLoopId =
+            new ToscaConceptIdentifier("PMSHInstance0", "1.0.0");
+        ToscaConceptIdentifier participantId =
+            new ToscaConceptIdentifier("org.onap.PM_Policy", "0.0.0");
 
         clUpdateMsg.setControlLoopId(controlLoopId);
         clUpdateMsg.setParticipantId(participantId);
-        clUpdateMsg.setParticipantType(participantId);
+        clUpdateMsg.setMessageId(UUID.randomUUID());
+        clUpdateMsg.setTimestamp(Instant.now());
 
-        ControlLoop controlLoop = new ControlLoop();
         Map<UUID, ControlLoopElement> elements = new LinkedHashMap<>();
         ToscaServiceTemplate toscaServiceTemplate = testControlLoopRead();
         Map<String, ToscaNodeTemplate> nodeTemplatesMap =
                 toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates();
         for (Map.Entry<String, ToscaNodeTemplate> toscaInputEntry : nodeTemplatesMap.entrySet()) {
-            ControlLoopElement clElement = new ControlLoopElement();
-            clElement.setId(UUID.randomUUID());
+            if (toscaInputEntry.getValue().getType().contains(CONTROL_LOOP_ELEMENT)) {
+                ControlLoopElement clElement = new ControlLoopElement();
+                clElement.setId(UUID.randomUUID());
+                ToscaConceptIdentifier clParticipantId;
+                try {
+                    clParticipantId = CODER.decode(
+                            toscaInputEntry.getValue().getProperties().get("participant_id").toString(),
+                            ToscaConceptIdentifier.class);
+                } catch (CoderException e) {
+                    throw new RuntimeException("cannot get ParticipantId from toscaNodeTemplate", e);
+                }
 
-            ToscaConceptIdentifier clElementParticipantId = new ToscaConceptIdentifier();
-            clElementParticipantId.setName(toscaInputEntry.getKey());
-            clElementParticipantId.setVersion(toscaInputEntry.getValue().getVersion());
-            clElement.setParticipantId(clElementParticipantId);
-            clElement.setParticipantType(clElementParticipantId);
+                clElement.setParticipantId(clParticipantId);
+                clElement.setParticipantType(clParticipantId);
 
-            clElement.setDefinition(clElementParticipantId);
-            clElement.setState(ControlLoopState.UNINITIALISED);
-            clElement.setDescription(toscaInputEntry.getValue().getDescription());
-            clElement.setOrderedState(ControlLoopOrderedState.UNINITIALISED);
-            elements.put(clElement.getId(), clElement);
+                clElement.setDefinition(new ToscaConceptIdentifier(toscaInputEntry.getKey(),
+                    toscaInputEntry.getValue().getVersion()));
+                clElement.setState(ControlLoopState.UNINITIALISED);
+                clElement.setDescription(toscaInputEntry.getValue().getDescription());
+                clElement.setOrderedState(ControlLoopOrderedState.PASSIVE);
+                elements.put(clElement.getId(), clElement);
+            }
         }
-        controlLoop.setElements(elements);
-        controlLoop.setName("PMSHInstance0");
-        controlLoop.setVersion("1.0.0");
-        controlLoop.setDefinition(controlLoopId);
-        clUpdateMsg.setControlLoop(controlLoop);
 
+        List<ParticipantUpdates> participantUpdates = new ArrayList<>();
+        for (ControlLoopElement element : elements.values()) {
+            prepareParticipantUpdateForControlLoop(element, participantUpdates);
+        }
+        clUpdateMsg.setParticipantUpdatesList(participantUpdates);
         return clUpdateMsg;
     }
 
+    private static void prepareParticipantUpdateForControlLoop(ControlLoopElement clElement,
+        List<ParticipantUpdates> participantUpdates) {
+        if (participantUpdates.isEmpty()) {
+            participantUpdates.add(getControlLoopElementList(clElement));
+        } else {
+            boolean participantExists = false;
+            for (ParticipantUpdates participantUpdate : participantUpdates) {
+                if (participantUpdate.getParticipantId().equals(clElement.getParticipantId())) {
+                    participantUpdate.getControlLoopElementList().add(clElement);
+                    participantExists = true;
+                }
+            }
+            if (!participantExists) {
+                participantUpdates.add(getControlLoopElementList(clElement));
+            }
+        }
+    }
+
+    private static ParticipantUpdates getControlLoopElementList(ControlLoopElement clElement) {
+        ParticipantUpdates participantUpdate = new ParticipantUpdates();
+        List<ControlLoopElement> controlLoopElementList = new ArrayList<>();
+        participantUpdate.setParticipantId(clElement.getParticipantId());
+        controlLoopElementList.add(clElement);
+        participantUpdate.setControlLoopElementList(controlLoopElementList);
+        return participantUpdate;
+    }
+
+    /**
+     * Method to create participantUpdateMsg.
+     *
+     * @return ParticipantUpdate message
+     */
+    public static ParticipantUpdate createParticipantUpdateMsg() {
+        final ParticipantUpdate participantUpdateMsg = new ParticipantUpdate();
+        ToscaConceptIdentifier participantId = new ToscaConceptIdentifier("org.onap.PM_Policy", "1.0.0");
+        ToscaConceptIdentifier participantType = new ToscaConceptIdentifier(
+                "org.onap.policy.controlloop.PolicyControlLoopParticipant", "2.3.1");
+
+        participantUpdateMsg.setParticipantId(participantId);
+        participantUpdateMsg.setTimestamp(Instant.now());
+        participantUpdateMsg.setParticipantType(participantType);
+        participantUpdateMsg.setTimestamp(Instant.ofEpochMilli(3000));
+        participantUpdateMsg.setMessageId(UUID.randomUUID());
+
+        ToscaServiceTemplate toscaServiceTemplate = testControlLoopRead();
+        // Add policies to the toscaServiceTemplate
+
+        List<ParticipantDefinition> participantDefinitionUpdates = new ArrayList<>();
+        for (Map.Entry<String, ToscaNodeTemplate> toscaInputEntry :
+            toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates().entrySet()) {
+            if (toscaInputEntry.getValue().getType().contains(CONTROL_LOOP_ELEMENT)) {
+                ToscaConceptIdentifier clParticipantId;
+                try {
+                    clParticipantId = CODER.decode(
+                            toscaInputEntry.getValue().getProperties().get("participant_id").toString(),
+                            ToscaConceptIdentifier.class);
+                } catch (CoderException e) {
+                    throw new RuntimeException("cannot get ParticipantId from toscaNodeTemplate", e);
+                }
+                prepareParticipantDefinitionUpdate(clParticipantId, toscaInputEntry.getKey(),
+                    toscaInputEntry.getValue(), participantDefinitionUpdates);
+            }
+        }
+
+        participantUpdateMsg.setParticipantDefinitionUpdates(participantDefinitionUpdates);
+        participantUpdateMsg.setToscaServiceTemplate(toscaServiceTemplate);
+        return participantUpdateMsg;
+    }
+
+    private static void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantId, String entryKey,
+        ToscaNodeTemplate entryValue, List<ParticipantDefinition> participantDefinitionUpdates) {
+
+        var clDefinition = new ControlLoopElementDefinition();
+        clDefinition.setClElementDefinitionId(new ToscaConceptIdentifier(
+            entryKey, entryValue.getVersion()));
+        clDefinition.setControlLoopElementToscaNodeTemplate(entryValue);
+        List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>();
+
+        if (participantDefinitionUpdates.isEmpty()) {
+            participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantId,
+                controlLoopElementDefinitionList));
+        } else {
+            boolean participantExists = false;
+            for (ParticipantDefinition participantDefinitionUpdate : participantDefinitionUpdates) {
+                if (participantDefinitionUpdate.getParticipantId().equals(clParticipantId)) {
+                    participantDefinitionUpdate.getControlLoopElementDefinitionList().add(clDefinition);
+                    participantExists = true;
+                }
+            }
+            if (!participantExists) {
+                participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantId,
+                    controlLoopElementDefinitionList));
+            }
+        }
+    }
+
+    private static ParticipantDefinition getParticipantDefinition(ControlLoopElementDefinition clDefinition,
+        ToscaConceptIdentifier clParticipantId,
+        List<ControlLoopElementDefinition> controlLoopElementDefinitionList) {
+        ParticipantDefinition participantDefinition = new ParticipantDefinition();
+        participantDefinition.setParticipantId(clParticipantId);
+        controlLoopElementDefinitionList.add(clDefinition);
+        participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList);
+        return participantDefinition;
+    }
+
     /**
      * Method to create ControlLoopUpdate using the arguments passed.
      *
diff --git a/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..c2a68d7a2 100644
--- a/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
@@ -1,452 +1,153 @@
 tosca_definitions_version: tosca_simple_yaml_1_3
-capability_types:
-  org.onap.EventProducer:
+data_types:
+  onap.datatypes.ToscaConceptIdentifier:
+    derived_from: tosca.datatypes.Root
     properties:
-      carrier_protocol_type:
+      name:
         type: string
         required: true
-        constraints:
-        - valid_values:
-          - DMAAP_message_router
-          - SOMETHING_ELSE
-          - REST
-      data_format:
+      version:
         type: string
         required: true
-        constraints:
-        - valid_values:
-          - JSON
-          - YAML
-          - JMS
-      event_format:
-        type: string
-        required: true
-      event_format_version:
-        type: string
-        required: false
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key may be generated
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-    version: 0.0.1
-    derived_from: tosca.capabilities.Root
-  org.onap.EventConsumer:
-    properties:
-      responding_capability:
-        type: string
-        required: false
-      carrier_protocol_type:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - DMAAP_message_router
-          - SOMETHING_ELSE
-          - REST
-      data_format:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - JSON
-          - YAML
-          - JMS
-          - all valid values should be added here
-      event_format:
-        type: string
-        description: 'examples for event_format: Ves_specification, LinkUp, VnfConfigured,
-          etc.'
-        required: true
-      event_format_version:
-        type: string
-        description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'
-        required: false
-      config_keys:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key may be generated
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-    version: 0.0.1
-    derived_from: tosca.capabilities.Root
 node_types:
-  org.onap.DynamicConfig:
+  org.onap.policy.clamp.controlloop.Participant:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      application_name:
-        type: string
-        description: Value used to tie the config to an application ? should we be
-          using a relationship here instead?
-        required: true
-      application_version:
-        type: string
-        required: true
-      application_provider:
+      provider:
         type: string
-        required: false
-      data_types:
-        type: object
-        required: false
-      schema:
-        type: object
-        required: false
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-  org.onap.APP:
+        requred: false
+  org.onap.policy.clamp.controlloop.ControlLoopElement:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      application_name:
-        type: string
-        description: Human readable name for the application Product
-        required: false
       provider:
         type: string
-        description: Provider of the application and of the descriptor
-        required: true
-      application_version:
-        type: string
-        description: Software version of the application
-        required: true
-      blueprint_id:
-        type: string
-        description: A reference to the app blueprint
-        required: false
-      monitoring_policy:
-        type: string
-        description: A reference to the monitoring policy
-        required: false
-    requirements:
-    - receive:
-        capability: org.onap.EventProducer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    - send:
-        capability: org.onap.EventConsumer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-  org.onap.EventRelay:
+        requred: false
+      participant_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.ControlLoop:
+    version: 1.0.1
+    derived_from: tosca.nodetypes.Root
     properties:
-      event_format:
-        type: string
-        description: 'examples for event_format: Ves_specification, etc.'
-        required: true
-      event_format_version:
+      provider:
         type: string
-        description: 'examples for event_format_version: 5.28.4, 7.30.1, etc.'
-        required: true
-      config_keys:
+        requred: false
+      elements:
         type: list
-        required: false
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - all valid values should be added here
-            - if not specified, events of any config key is relayed
-            - 'examples for config_key: ves-measurement, ves-syslog, tca_handle_out,
-              etc.'
-      supported_carrier_protocols:
-        type: map
-        description: 'A map describing supported carrier protocols and translations.
-          The tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { REST: REST, DMAAP: REST, DMAAP: DMAAP}'
-        required: true
-        key_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - DMAAP_message_router
-            - SOMETHING_ELSE
-            - REST
-            - all valid values should be added here
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - DMAAP_message_router
-            - SOMETHING_ELSE
-            - REST
-            - all valid values should be added here
-      supported_data_formats:
-        type: map
-        description: 'Is a map describing supported data formats and translation.
-          The tuples define what protocol combinations are supported on the producer
-          and consumer side: e.g. { JSON: JSON, JMS: JSON, YAML:YAML }'
         required: true
-        key_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - JSON
-            - JMS
-            - YAML
-            - etc
-            - all valid values should be added here
         entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - JSON
-            - JMS
-            - YAML
-            - etc
-            - all valid values should be added here
-    requirements:
-    - receive:
-        capability: org.onap.EventProducer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    - send:
-        capability: org.onap.EventConsumer
-        relationship: org.onap.PropagateEvent
-        occurrences:
-        - 0.0
-        - UNBOUNDED
-        version: 0.0.0
-    version: 0.0.1
-    derived_from: tosca.nodes.Root
-relationship_types:
-  org.onap.PropagateEvent:
+          type: onap.datatypes.ToscaConceptIdentifier
+  org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
     properties:
-      config_keys:
-        type: list
-        description: The relationship type used on requirements to org.onap.EventProducer
-          and org.onap.EventConsumer capabilities. Filters events by specific config_keys
-          to be transferred by this relationship. That is, any event with a specific
-          config_key found in the list is transferred. If list is not defined or is
-          empty, events with all config_keys are transferred.
-        required: false
-        entry_schema:
-          type: string
-    version: 0.0.1
-    derived_from: tosca.relationships.Root
+      dcae_blueprint_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    properties:
+      policy_type_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
+  org.onap.policy.clamp.controlloop.CDSControlLoopElement:
+    version: 1.0.1
+    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    properties:
+      cds_blueprint_id:
+        type: onap.datatypes.ToscaConceptIdentifier
+        requred: true
 topology_template:
-  inputs:
-    pm_subscription_topic:
-      type: string
-    pm_subscription_response_topic:
-      type: string
-    pm_subscription_handler_blueprint_id:
-      type: string
-    pm_subscription_operational_policy_id:
-      type: string
-    pm_subscription_cds_blueprint_id:
-      type: string
-    enable_tls:
-      type: string
   node_templates:
-    org.onap.PM_Subscription_Handler:
-      type: org.onap.APP
+    org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant:
+      version: 2.3.4
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.policy.controlloop.PolicyControlLoopParticipant:
+      version: 2.3.1
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant:
+      version: 2.2.1
+      type: org.onap.policy.clamp.controlloop.Participant
+      type_version: 1.0.1
+      description: Participant for DCAE microservices
+      properties:
+        provider: ONAP
+    org.onap.domain.pmsh.PMSH_DCAEMicroservice:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the DCAE microservice for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Handler
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_handler_blueprint_id
-          description: Is this a reference to the DCAE Cloudify Blueprint that is
-            already stored(or will be stored before CL configuration & instatiation)
-            in DCAE Inventory?
-        artifact_config:
-          enable_tls:
-            get_input: enable_tls
-          pmsh_publish_topic_name:
-            get_input: pm_subscription_topic
-      capabilities:
-        pm-subscription-event-publisher:
-          properties:
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-format
-            event_format_version: 1.0.0
-          attributes:
-            type: org.onap.EventProducer
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-        pm-subscription-event-receiver:
-          properties:
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-response-format
-            event_format_version: 1.0.0
-            relationships:
-            - type: tosca.relationships.DependsOn
-            - description: any ideas on a better realtionship ? or is it better to
-                just use the root realtionship ?
-            - target: org.onap.PM_Monitoring_Policy
-          attributes:
-            type: org.onap.EventConsumer
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.PM_Monitoring_Policy:
-      type: org.onap.DynamicConfig
+        participant_id:
+          name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant
+          version: 2.3.4
+        dcae_blueprint_id:
+          name: org.onap.dcae.blueprints.PMSHBlueprint
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the monitoring policy for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Handler
-        application_version: 1.0.0
         provider: Ericsson
-        data_types:
-          measurementType:
-            type: string
-          DN:
-            type: string
-          nfFilter:
-            properties:
-              nfNames:
-                type: list
-                entry_schema: string
-              modelInvariantIDs:
-                type: list
-                entry_schema:
-                  type: string
-              modelVersionIDs:
-                type: list
-                entry_schema:
-                  type: string
-          measurementGroup:
-            properties:
-              masurementTypes:
-                type: list
-                entry_schema:
-                  type: measurementType
-              managedObjectDNsBasic:
-                type: list
-                entry_schema:
-                  type: DN
-        schema:
-          subscription:
-            subscriptionName:
-              type: string
-              required: true
-            administrativeState:
-              type: string
-              required: true
-            filebasedGP:
-              type: integer
-              required: true
-            fileLocation:
-              type: string
-              required: true
-            nfFilter:
-              type: nfFilter
-            measurementGroups:
-              type: list
-              entry_schema:
-                type: measurementGroup
-      version: 0.0.0
-      description: Should I be showing a dependency between PM Subscription Handler
-        and the PM Monitoring Policy
-    org.onap.PM_Policy:
-      type: org.onap.APP
+        participant_id:
+          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+          version: 2.3.1
+        policy_type_id:
+          name: onap.policies.monitoring.pm-subscription-handler
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.PolicyTypeControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for the operational policy for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription Operational Policy
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_operational_policy_id
-        artifact_config: NOT_DEFINED
-      requirements:
-      - receive_0:
-          capability: pm-subscription-event-publisher
-          node: org.onap.PM_Subscription_Handler
-          relationship: NOT_DEFINED
-          properties:
-            config_keys:
-            - topic_name:
-                get_input: pm_subscription_topic
-          version: 0.0.0
-      - send_0:
-          capability: cds-rest-receive
-          node: org.onap.CDS
-          version: 0.0.0
-      - receive_1:
-          capability: cds-rest-response
-          node: org.onap.CDS
-          version: 0.0.0
-      - send_1:
-          capability: pm-subscription-event-receiver
-          node: org.onap.PM_Subscription_Handler
-          relationship: NOT_DEFINED
-          properties:
-            config_keys:
-            - topic_name:
-                get_input: pm_subscription_response_topic
-          version: 0.0.0
-      capabilities:
-        pm-subscription-response-event-publisher:
-          properties:
-            type: org.onap.EventProducer
-            carrier_protocol_type: DMAAP_message_router
-            data_format: JSON
-            event_format: pm-subscription-event-response-format
-            event_format_version: 1.0.0
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-      version: 0.0.0
-    org.onap.PM_CDS_Blueprint:
-      type: org.onap.APP
+        participant_id:
+          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+          version: 2.3.1
+        policy_type_id:
+          name: onap.policies.operational.pm-subscription-handler
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.ControlLoopElement
+      type_version: 1.0.0
+      description: Control loop element for CDS for Performance Management Subscription Handling
       properties:
-        application_name: PM Subscription CDS Blueprint
         provider: Ericsson
-        application_version: 1.0.0
-        artifact_id:
-          get_input: pm_subscription_cds_blueprint_id
-      capabilities:
-        cds-rest-receive:
-          properties:
-            type: org.onap.EventConsumer
-            protocol_type: REST
-            data_format: JSON
-            event_format: cds_action_format
-            event_format_version: 1.0.0
-            responding_capability: cds-rest-response
-          occurrences:
-          - 0.0
-          - UNBOUNDED
-          version: 0.0.0
-        cds-rest-response:
-          properties:
-            type: org.onap.EventProducer
-            protocol_type: REST
-            data_format: JSON
-            event_format: cds_action_response_format
-            event_format_version: 1.0.0
-          occurrences:
-          - 0.0
-          version: 0.0.0
-      version: 1.0.0
-    org.onap.controlloop0:
-      type: org.onap.APP
+        participant_id:
+          name: org.onap.PM_CDS_Blueprint
+          version: 1.0.0
+        cds_blueprint_id:
+          name: org.onap.ccsdk.cds.PMSHCdsBlueprint
+          version: 1.0.0
+    org.onap.domain.pmsh.PMSHControlLoopDefinition:
+      version: 1.2.3
+      type: org.onap.policy.clamp.controlloop.ControlLoop
+      type_version: 1.0.0
+      description: Control loop for Performance Management Subscription Handling
       properties:
-        application_name: Test Control Loop
         provider: Ericsson
-        application_version: 1.0.0
-        status: NOT_DEPLOYED
-      version: 0.0.0
-version: 0.0.0
+        elements:
+          - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement
+            version: 1.2.3
+          - name: org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement
+            version: 1.2.3