X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=netconf-server%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fnetconf%2Fserver%2FNetconfServerStarter.java;h=392b69388e75c6fbcc7bb080b2b94fe17d75dfcd;hb=ce4e2d38e3d42725f61c39dd172325d2def4bc44;hp=10ab6243922de6e613b4475842ffec268b11d892;hpb=597b7c7a33b3f636263fd7297e3d257eb6b56175;p=oam%2Ftr069-adapter.git

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