Ties monitoring handler into the activator with runtime test classes.

Issue-ID: POLICY-3051
Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech>
Change-Id: I5b651a6a9d4605cabcb0a0b6db2ad4820160415e

2 files changed, 19 insertions, 12 deletions

diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java b/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java
index 0078f6129..5959586da 100644
--- a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java
+++ b/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/main/startstop/ClRuntimeActivator.java
@@ -31,6 +31,7 @@ import org.onap.policy.clamp.controlloop.runtime.commissioning.CommissioningHand
 import org.onap.policy.clamp.controlloop.runtime.instantiation.InstantiationHandler;
 import org.onap.policy.clamp.controlloop.runtime.main.parameters.ClRuntimeParameterGroup;
 import org.onap.policy.clamp.controlloop.runtime.main.rest.ControlLoopAafFilter;
+import org.onap.policy.clamp.controlloop.runtime.monitoring.MonitoringHandler;
 import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager;
 import org.onap.policy.common.endpoints.event.comm.TopicSink;
 import org.onap.policy.common.endpoints.event.comm.TopicSource;
@@ -85,6 +86,7 @@ public class ClRuntimeActivator extends ServiceManagerContainer {
 
         final AtomicReference<ControlLoopHandler> commissioningHandler = new AtomicReference<>();
         final AtomicReference<ControlLoopHandler> instantiationHandler = new AtomicReference<>();
+        final AtomicReference<ControlLoopHandler> monitoringHandler = new AtomicReference<>();
 
         final AtomicReference<RestServer> restServer = new AtomicReference<>();
         // @formatter:off
@@ -100,9 +102,13 @@ public class ClRuntimeActivator extends ServiceManagerContainer {
         addAction("Instantiation Handler",
                 () -> instantiationHandler.set(new InstantiationHandler(clRuntimeParameterGroup)),
                 () -> instantiationHandler.get().close());
+        addAction("Monitoring Handler",
+            () -> monitoringHandler.set(new MonitoringHandler(clRuntimeParameterGroup)),
+            () -> monitoringHandler.get().close());
 
         addHandlerActions("Commissioning", commissioningHandler);
         addHandlerActions("Instantiation", instantiationHandler);
+        addHandlerActions("Monitoring", monitoringHandler);
 
         addAction("Topic Message Dispatcher", this::registerMsgDispatcher, this::unregisterMsgDispatcher);
 
@@ -113,6 +119,7 @@ public class ClRuntimeActivator extends ServiceManagerContainer {
                     Set<Class<?>> providerClasses = new HashSet<>();
                     providerClasses.addAll(commissioningHandler.get().getProviderClasses());
                     providerClasses.addAll(instantiationHandler.get().getProviderClasses());
+                    providerClasses.addAll(monitoringHandler.get().getProviderClasses());
 
                     RestServer server = new RestServer(clRuntimeParameterGroup.getRestServerParameters(),
                             ControlLoopAafFilter.class,
diff --git a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java b/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java
index aeabce7a5..e46e66501 100644
--- a/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java
+++ b/tosca-controlloop/runtime/src/main/java/org/onap/policy/clamp/controlloop/runtime/monitoring/MonitoringProvider.java
@@ -205,19 +205,19 @@ public class MonitoringProvider implements Closeable {
             //Fetch all control loop elements for the control loop
             ControlLoop controlLoop = controlLoopProvider.getControlLoop(new ToscaConceptIdentifier(name,
                 version));
-            clElements.addAll(controlLoop.getElements());
-
-            //Collect control loop element statistics for each cl element.
-            for (ControlLoopElement clElement : clElements) {
-                clElementStats.addAll(fetchFilteredClElementStatistics(clElement.getParticipantId().getName(),
-                    clElement.getParticipantId().getVersion(), clElement.getId().toString(), null,
-                    null, 0).getClElementStatistics());
+            if (controlLoop != null) {
+                clElements.addAll(controlLoop.getElements());
+                //Collect control loop element statistics for each cl element.
+                for (ControlLoopElement clElement : clElements) {
+                    clElementStats.addAll(fetchFilteredClElementStatistics(clElement.getParticipantId().getName(),
+                        clElement.getParticipantId().getVersion(), clElement.getId().toString(), null,
+                        null, 0).getClElementStatistics());
+                }
             }
             clElementStatisticsList.setClElementStatistics(clElementStats);
         } catch (PfModelException e) {
             throw new PfModelRuntimeException(e);
         }
-
         return clElementStatisticsList;
     }
 
@@ -255,14 +255,14 @@ public class MonitoringProvider implements Closeable {
         throws PfModelException {
         Map<String, ToscaConceptIdentifier> clElementId = new HashMap<>();
         ControlLoop controlLoop = controlLoopProvider.getControlLoop(new ToscaConceptIdentifier(name, version));
-        for (ControlLoopElement clElement : controlLoop.getElements()) {
-            clElementId.put(clElement.getId().toString(), clElement.getParticipantId());
+        if (controlLoop != null) {
+            for (ControlLoopElement clElement : controlLoop.getElements()) {
+                clElementId.put(clElement.getId().toString(), clElement.getParticipantId());
+            }
         }
         return clElementId;
     }
 
-
-
     public void updateClElementStatistics(List<ClElementStatistics> clElementStatistics) {
         // TODO Auto-generated method stub
     }