Verify alignment with Definition of TOSCA Control Loop Types

Issue-ID: POLICY-3612
Change-Id: I818f80cdc1db98752a7791ef4aba7377add66516
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

1 files changed, 17 insertions, 17 deletions

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 83ef68e86..2759a9390 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
@@ -149,17 +149,17 @@ public class TestListenerUtils {
             if (toscaInputEntry.getValue().getType().contains(CONTROL_LOOP_ELEMENT)) {
                 ControlLoopElement clElement = new ControlLoopElement();
                 clElement.setId(UUID.randomUUID());
-                ToscaConceptIdentifier clParticipantId;
+                ToscaConceptIdentifier clParticipantType;
                 try {
-                    clParticipantId = CODER.decode(
-                            toscaInputEntry.getValue().getProperties().get("participant_id").toString(),
+                    clParticipantType = CODER.decode(
+                            toscaInputEntry.getValue().getProperties().get("participantType").toString(),
                             ToscaConceptIdentifier.class);
                 } catch (CoderException e) {
-                    throw new RuntimeException("cannot get ParticipantId from toscaNodeTemplate", e);
+                    throw new RuntimeException("cannot get ParticipantType from toscaNodeTemplate", e);
                 }
 
-                clElement.setParticipantId(clParticipantId);
-                clElement.setParticipantType(clParticipantId);
+                clElement.setParticipantId(clParticipantType);
+                clElement.setParticipantType(clParticipantType);
 
                 clElement.setDefinition(new ToscaConceptIdentifier(toscaInputEntry.getKey(),
                     toscaInputEntry.getValue().getVersion()));
@@ -229,15 +229,15 @@ public class TestListenerUtils {
         for (Map.Entry<String, ToscaNodeTemplate> toscaInputEntry :
             toscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates().entrySet()) {
             if (toscaInputEntry.getValue().getType().contains(CONTROL_LOOP_ELEMENT)) {
-                ToscaConceptIdentifier clParticipantId;
+                ToscaConceptIdentifier clParticipantType;
                 try {
-                    clParticipantId = CODER.decode(
-                            toscaInputEntry.getValue().getProperties().get("participant_id").toString(),
+                    clParticipantType = CODER.decode(
+                            toscaInputEntry.getValue().getProperties().get("participantType").toString(),
                             ToscaConceptIdentifier.class);
                 } catch (CoderException e) {
-                    throw new RuntimeException("cannot get ParticipantId from toscaNodeTemplate", e);
+                    throw new RuntimeException("cannot get ParticipantType from toscaNodeTemplate", e);
                 }
-                prepareParticipantDefinitionUpdate(clParticipantId, toscaInputEntry.getKey(),
+                prepareParticipantDefinitionUpdate(clParticipantType, toscaInputEntry.getKey(),
                     toscaInputEntry.getValue(), participantDefinitionUpdates);
             }
         }
@@ -247,7 +247,7 @@ public class TestListenerUtils {
         return participantUpdateMsg;
     }
 
-    private static void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantId, String entryKey,
+    private static void prepareParticipantDefinitionUpdate(ToscaConceptIdentifier clParticipantType, String entryKey,
         ToscaNodeTemplate entryValue, List<ParticipantDefinition> participantDefinitionUpdates) {
 
         var clDefinition = new ControlLoopElementDefinition();
@@ -257,28 +257,28 @@ public class TestListenerUtils {
         List<ControlLoopElementDefinition> controlLoopElementDefinitionList = new ArrayList<>();
 
         if (participantDefinitionUpdates.isEmpty()) {
-            participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantId,
+            participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantType,
                 controlLoopElementDefinitionList));
         } else {
             boolean participantExists = false;
             for (ParticipantDefinition participantDefinitionUpdate : participantDefinitionUpdates) {
-                if (participantDefinitionUpdate.getParticipantId().equals(clParticipantId)) {
+                if (participantDefinitionUpdate.getParticipantType().equals(clParticipantType)) {
                     participantDefinitionUpdate.getControlLoopElementDefinitionList().add(clDefinition);
                     participantExists = true;
                 }
             }
             if (!participantExists) {
-                participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantId,
+                participantDefinitionUpdates.add(getParticipantDefinition(clDefinition, clParticipantType,
                     controlLoopElementDefinitionList));
             }
         }
     }
 
     private static ParticipantDefinition getParticipantDefinition(ControlLoopElementDefinition clDefinition,
-        ToscaConceptIdentifier clParticipantId,
+        ToscaConceptIdentifier clParticipantType,
         List<ControlLoopElementDefinition> controlLoopElementDefinitionList) {
         ParticipantDefinition participantDefinition = new ParticipantDefinition();
-        participantDefinition.setParticipantId(clParticipantId);
+        participantDefinition.setParticipantType(clParticipantType);
         controlLoopElementDefinitionList.add(clDefinition);
         participantDefinition.setControlLoopElementDefinitionList(controlLoopElementDefinitionList);
         return participantDefinition;