From: Jim Hahn <jrh3@att.com>
Date: Thu, 2 Sep 2021 14:28:06 +0000 (+0000)
Subject: Merge "Verify alignment with Definition of TOSCA Control Loop Types"
X-Git-Tag: 6.1.2~21
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=adb8255b9706e09127d77bc072bef4e8b3a27cf1;p=policy%2Fclamp.git

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

adb8255b9706e09127d77bc072bef4e8b3a27cf1
diff --cc participant/participant-intermediary/src/main/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ParticipantHandler.java
index 56fddd6ff,134bda6bb..072a2ebc1
--- a/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;