1 files changed, 22 insertions, 8 deletions
diff --git a/sdnr/wt/devicemanager-core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java b/sdnr/wt/devicemanager-core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java
index 5d9a7dbb7..e9c5f7ab0 100644
--- a/sdnr/wt/devicemanager-core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java
+++ b/sdnr/wt/devicemanager-core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/DeviceManagerNetconfConnectHandler.java
@@ -89,14 +89,11 @@ public class DeviceManagerNetconfConnectHandler extends DeviceManagerNetconfNotC
         // update db with connect status
         NetconfNode netconfNode = acessor.getNetconfNode();
         sendUpdateNotification(acessor.getNodeId(), netconfNode.getConnectionStatus(), netconfNode);
-
-        for (NetworkElementFactory f : getFactoryList()) {
-            Optional<NetworkElement> optionalNe = f.create(acessor, getServiceProvider());
-            if (optionalNe.isPresent()) {
-                // sendUpdateNotification(mountPointNodeName, nNode.getConnectionStatus(), nNode);
-                handleNeStartup(acessor.getNodeId(), optionalNe.get());
-                break; // Use the first provided
-            }
+        // Start devicemanager if possible
+        Optional<NetworkElement> optionalNe = createNetworkElement(acessor);
+        // Startup device
+        if (optionalNe.isPresent()) {
+            handleNeStartup(acessor.getNodeId(), optionalNe.get());
         }
     }
 
@@ -136,6 +133,23 @@ public class DeviceManagerNetconfConnectHandler extends DeviceManagerNetconfNotC
      */
 
     /**
+     * Get the NetworkElement from list
+     *
+     * @param accessor
+     * @return Optional<NetowrkElement>
+     */
+    private Optional<NetworkElement> createNetworkElement(NetconfAccessor accessor) {
+        Optional<NetworkElement> optionalNe = Optional.empty();
+        for (NetworkElementFactory f : getFactoryList()) {
+            optionalNe = f.create(accessor, getServiceProvider());
+            if (optionalNe.isPresent()) {
+                return optionalNe; // Use the first provided
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
      * Do all tasks necessary to move from mountpoint state connected -> connecting
      *
      * @param mountPointNodeName provided