From dfc4855437c0b72fcc115cbab1dab098ead41c38 Mon Sep 17 00:00:00 2001
From: Jordan Halterman <jordan@opennetworking.org>
Date: Fri, 2 Nov 2018 11:08:30 -0700
Subject: [PATCH] Update components monitor to check enabled component states

Change-Id: I1485df83fa793fcfc48adc3b8fe4c51b5dacb64c
---
 .../org/onosproject/cluster/impl/ComponentsMonitor.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/ComponentsMonitor.java b/core/net/src/main/java/org/onosproject/cluster/impl/ComponentsMonitor.java
index 7a0295e1ac..3dd5dda1dc 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/ComponentsMonitor.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/ComponentsMonitor.java
@@ -29,6 +29,7 @@ import org.onosproject.cluster.ClusterAdminService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
 import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -113,8 +114,12 @@ public class ComponentsMonitor {
 
     private boolean isFullyStarted(Bundle bundle) {
         for (ComponentDescriptionDTO component : scrService.getComponentDescriptionDTOs(bundle)) {
-            if (!scrService.isComponentEnabled(component)) {
-                return false;
+            if (scrService.isComponentEnabled(component)) {
+                for (ComponentConfigurationDTO config : scrService.getComponentConfigurationDTOs(component)) {
+                    if (config.state != ComponentConfigurationDTO.ACTIVE) {
+                        return false;
+                    }
+                }
             }
         }
         return true;