Device Software version management

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

diff --git a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/boot/NetConfServiceBooter.java b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/boot/NetConfServiceBooter.java
index 6394ba5..b4ea478 100644 (file)
--- a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/boot/NetConfServiceBooter.java
+++ b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/boot/NetConfServiceBooter.java
@@ -19,6 +19,8 @@
 package org.commscope.tr069adapter.netconf.boot;\r
 \r
 import org.commscope.tr069adapter.netconf.server.NetConfServerManagerImpl;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 import org.springframework.boot.SpringApplication;\r
 import org.springframework.boot.autoconfigure.SpringBootApplication;\r
 import org.springframework.boot.autoconfigure.domain.EntityScan;\r
@@ -28,12 +30,15 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.retry.annotation.EnableRetry;\r
 \r
 @SpringBootApplication\r
-@ComponentScan({"org.commscope.tr069adapter.netconf", "org.opendaylight.netconf.test", "org.commscope.tr069adapter.common"})\r
+@ComponentScan({"org.commscope.tr069adapter.netconf", "org.opendaylight.netconf.test",\r
+    "org.commscope.tr069adapter.common"})\r
 @EnableJpaRepositories("org.commscope.tr069adapter.netconf.dao")\r
 @EntityScan("org.commscope.tr069adapter.netconf.entity")\r
 @EnableRetry\r
 public class NetConfServiceBooter {\r
 \r
+  private static final Logger LOG = LoggerFactory.getLogger(NetConfServiceBooter.class);\r
+\r
   private static ApplicationContext appContext;\r
 \r
   public static void main(String[] args) {\r
@@ -41,7 +46,12 @@ public class NetConfServiceBooter {
       appContext = SpringApplication.run(NetConfServiceBooter.class, args);\r
     NetConfServerManagerImpl serverManager =\r
         NetConfServiceBooter.getApplicationContext().getBean(NetConfServerManagerImpl.class);\r
-    serverManager.restartServers(); // restart all netconf servers during startup.\r
+    boolean isSchemaLoaded = serverManager.loadSchemas();\r
+    if (!isSchemaLoaded) {\r
+      LOG.error("Loading the schema failed while starting the container");\r
+      System.exit(1);\r
+    }\r
+    serverManager.restartServers();\r
   }\r
 \r
   public static ApplicationContext getApplicationContext() {\r