Merge "Verify alignment with Definition of TOSCA Control Loop Types"

diff --cc participant/participant-impl/participant-impl-dcae/src/test/java/org/onap/policy/clamp/controlloop/participant/dcae/main/rest/TestListenerUtils.java
Simple merge

diff --cc participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/utils/TestListenerUtils.java
Simple merge

diff --cc participant/participant-impl/participant-impl-simulator/src/test/java/org/onap/policy/clamp/controlloop/participant/simulator/main/rest/TestListenerUtils.java
Simple merge

diff --cc participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java
index 56fddd6,134bda6..072a2eb
--- 1/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java
--- 2/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java
+++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java
@@@ -289,10 -292,11 +289,10 @@@ public class ParticipantHandler 
              return;
          }
  
 -        toscaServiceTemplate = participantUpdateMsg.getToscaServiceTemplate();
 -        if (toscaServiceTemplate != null) {
 +        if (!participantUpdateMsg.getParticipantDefinitionUpdates().isEmpty()) {
              // This message is to commission the controlloop
              for (ParticipantDefinition participantDefinition : participantUpdateMsg.getParticipantDefinitionUpdates()) {
-                 if (participantDefinition.getParticipantId().equals(participantType)) {
+                 if (participantDefinition.getParticipantType().equals(participantType)) {
                      clElementDefsOnThisParticipant.clear();
                      clElementDefsOnThisParticipant.addAll(participantDefinition.getControlLoopElementDefinitionList());
                      break;

diff --cc runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/ParticipantUpdatePublisher.java
Simple merge

diff --cc runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java
Simple merge

diff --cc runtime-controlloop/src/test/resources/rest/servicetemplates/pmsh_multiple_cl_tosca.yaml
Simple merge