exchanging new version yang models on firmware upgrade

[oam/tr069-adapter.git] / netconf-server / src / main / java / org / commscope / tr069adapter / netconf / server / NetconfServerStarter.java

diff --git a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/server/NetconfServerStarter.java b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/server/NetconfServerStarter.java
index 10ab624..392b693 100644 (file)
--- a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/server/NetconfServerStarter.java
+++ b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/server/NetconfServerStarter.java
@@ -30,7 +30,6 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
-import org.apache.commons.io.FileUtils;\r
 import org.commscope.tr069adapter.common.deviceversion.DeviceVersionManager;\r
 import org.commscope.tr069adapter.netconf.config.NetConfServerProperties;\r
 import org.commscope.tr069adapter.netconf.operations.CustomOperationsCreator;\r
@@ -100,7 +99,7 @@ public class NetconfServerStarter {
     configuration.setSsh(Boolean.TRUE);\r
     configuration.setCapabilities(Configuration.DEFAULT_BASE_CAPABILITIES_EXI);\r
     configuration.setIp("0.0.0.0");\r
-    \r
+\r
     String versionPath = versionManager.getNetconfYangSchemaPath(swVersion, hwVersion);\r
     if (versionPath == null && swVersion != null) {\r
       LOG.error("Failed to get version path for software version {}, calling base version",\r
@@ -136,6 +135,7 @@ public class NetconfServerStarter {
       NetconfDevice netconf = serversMap.get(macID);\r
       netconf.setAutoClose(true);\r
       netconf.close();\r
+      serversMap.remove(macID);\r
       LOG.debug("Completed stopping Netconf server for MACID {}", macID);\r
       return true;\r
     } catch (Exception e) {\r
@@ -178,6 +178,14 @@ public class NetconfServerStarter {
     return true;\r
   }\r
 \r
+  public boolean isNetConfServerRunning(String deviceId) {\r
+    NetconfDevice nc = serversMap.get(deviceId);\r
+    if (null != nc)\r
+      return true;\r
+    else\r
+      return false;\r
+  }\r
+\r
   private void loadSchemaPattren(String line, File file, Pattern revisionregex) {\r
     if (line != null) {\r
       final Matcher m = revisionregex.matcher(line);\r