3 files changed, 36 insertions, 51 deletions
diff --git a/participant/participant-impl/participant-impl-dcae/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-dcae/src/main/resources/config/application.yaml
index 115170e2c..a873f76b3 100644
--- a/participant/participant-impl/participant-impl-dcae/src/main/resources/config/application.yaml
+++ b/participant/participant-impl/participant-impl-dcae/src/main/resources/config/application.yaml
@@ -1,3 +1,5 @@
+server:
+  port: 8081
 
 participant:
   name: ControlLoopParticipantDcae
@@ -37,15 +39,19 @@ participant:
       name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant
       version: 2.3.4
     clampControlLoopTopics:
-      topicSources[0]:
-        topic: POLICY-CLRUNTIME-PARTICIPANT
-        servers[0]: ${topicServer:message-router}
-        topicCommInfrastructure: dmaap
-        fetchTimeout: 15000
-      topicSinks[0]:
-        topic: POLICY-CLRUNTIME-PARTICIPANT
-        servers[0]: ${topicServer:message-router}
-        topicCommInfrastructure: dmaap
+      topicSources:
+        -
+          topic: POLICY-CLRUNTIME-PARTICIPANT
+          servers:
+            - ${topicServer:localhost}
+          topicCommInfrastructure: dmaap
+          fetchTimeout: 15000
+      topicSinks:
+        -
+          topic: POLICY-CLRUNTIME-PARTICIPANT
+          servers:
+            - ${topicServer:localhost}
+          topicCommInfrastructure: dmaap
   checkCount: 10
   secCount: 10
   jsonBodyConsulPath: src/main/resources/parameters/consul.json
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 603d81860..a3fcfdd9e 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
@@ -32,8 +32,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 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.ParticipantControlLoopStateChange;
 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;
@@ -103,23 +103,23 @@ class ParticipantDcaeTest {
     }
 
     @Test
-    void testParticipantControlLoopStateChangeMessageListener() {
-        ParticipantControlLoopStateChange participantControlLoopStateChangeMsg =
+    void testControlLoopStateChangeMessageListener() {
+        ControlLoopStateChange controlLoopStateChangeMsg =
                 TestListenerUtils.createControlLoopStateChangeMsg(ControlLoopOrderedState.UNINITIALISED);
-        participantControlLoopStateChangeMsg.setOrderedState(ControlLoopOrderedState.PASSIVE);
+        controlLoopStateChangeMsg.setOrderedState(ControlLoopOrderedState.PASSIVE);
 
         ControlLoopStateChangeListener clStateChangeListener = new ControlLoopStateChangeListener(participantHandler);
 
-        clStateChangeListener.onTopicEvent(INFRA, TOPIC, null, participantControlLoopStateChangeMsg);
-        assertEquals(ControlLoopOrderedState.PASSIVE, participantControlLoopStateChangeMsg.getOrderedState());
+        clStateChangeListener.onTopicEvent(INFRA, TOPIC, null, controlLoopStateChangeMsg);
+        assertEquals(ControlLoopOrderedState.PASSIVE, controlLoopStateChangeMsg.getOrderedState());
 
-        participantControlLoopStateChangeMsg.setOrderedState(ControlLoopOrderedState.RUNNING);
-        clStateChangeListener.onTopicEvent(INFRA, TOPIC, null, participantControlLoopStateChangeMsg);
-        assertEquals(ControlLoopOrderedState.RUNNING, participantControlLoopStateChangeMsg.getOrderedState());
+        controlLoopStateChangeMsg.setOrderedState(ControlLoopOrderedState.RUNNING);
+        clStateChangeListener.onTopicEvent(INFRA, TOPIC, null, controlLoopStateChangeMsg);
+        assertEquals(ControlLoopOrderedState.RUNNING, controlLoopStateChangeMsg.getOrderedState());
 
-        participantControlLoopStateChangeMsg.setOrderedState(ControlLoopOrderedState.RUNNING);
-        clStateChangeListener.onTopicEvent(INFRA, TOPIC, null, participantControlLoopStateChangeMsg);
-        assertEquals(ControlLoopOrderedState.RUNNING, participantControlLoopStateChangeMsg.getOrderedState());
+        controlLoopStateChangeMsg.setOrderedState(ControlLoopOrderedState.RUNNING);
+        clStateChangeListener.onTopicEvent(INFRA, TOPIC, null, controlLoopStateChangeMsg);
+        assertEquals(ControlLoopOrderedState.RUNNING, controlLoopStateChangeMsg.getOrderedState());
     }
 
     @Test
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 7f8eb0937..ddcc05ca4 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
@@ -30,10 +30,9 @@ import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop
 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.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.ParticipantControlLoopStateChange;
 import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantHealthCheck;
-import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ParticipantStateChange;
 import org.onap.policy.common.utils.coder.Coder;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
@@ -88,35 +87,15 @@ public class TestListenerUtils {
     }
 
     /**
-     * Method to create ParticipantStateChange message from the arguments passed.
-     *
-     * @param participantState participant State
-     *
-     * @return ParticipantStateChange message
-     */
-    public static ParticipantStateChange createParticipantStateChangeMsg(final ParticipantState participantState) {
-        final ParticipantStateChange participantStateChangeMsg = new ParticipantStateChange();
-        ToscaConceptIdentifier participantId = new ToscaConceptIdentifier();
-        participantId.setName("DCAEParticipant0");
-        participantId.setVersion("1.0.0");
-
-        participantStateChangeMsg.setParticipantId(participantId);
-        participantStateChangeMsg.setTimestamp(Instant.now());
-        participantStateChangeMsg.setState(participantState);
-
-        return participantStateChangeMsg;
-    }
-
-    /**
      * Method to create ControlLoopStateChange message from the arguments passed.
      *
      * @param controlLoopOrderedState controlLoopOrderedState
      *
-     * @return ParticipantControlLoopStateChange message
+     * @return ControlLoopStateChange message
      */
-    public static ParticipantControlLoopStateChange createControlLoopStateChangeMsg(
+    public static ControlLoopStateChange createControlLoopStateChangeMsg(
             final ControlLoopOrderedState controlLoopOrderedState) {
-        final ParticipantControlLoopStateChange participantClStateChangeMsg = new ParticipantControlLoopStateChange();
+        final ControlLoopStateChange clStateChangeMsg = new ControlLoopStateChange();
 
         ToscaConceptIdentifier controlLoopId = new ToscaConceptIdentifier();
         controlLoopId.setName("PMSHInstance0");
@@ -126,12 +105,12 @@ public class TestListenerUtils {
         participantId.setName("DCAEParticipant0");
         participantId.setVersion("1.0.0");
 
-        participantClStateChangeMsg.setControlLoopId(controlLoopId);
-        participantClStateChangeMsg.setParticipantId(participantId);
-        participantClStateChangeMsg.setTimestamp(Instant.now());
-        participantClStateChangeMsg.setOrderedState(controlLoopOrderedState);
+        clStateChangeMsg.setControlLoopId(controlLoopId);
+        clStateChangeMsg.setParticipantId(participantId);
+        clStateChangeMsg.setTimestamp(Instant.now());
+        clStateChangeMsg.setOrderedState(controlLoopOrderedState);
 
-        return participantClStateChangeMsg;
+        return clStateChangeMsg;
     }
 
     /**