exchanging new version yang models on firmware upgrade

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

diff --git a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/restapi/NetConfServerManagerRestApi.java b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/restapi/NetConfServerManagerRestApi.java
index c05e4ad..6057c67 100644 (file)
--- a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/restapi/NetConfServerManagerRestApi.java
+++ b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/restapi/NetConfServerManagerRestApi.java
@@ -42,14 +42,28 @@ public class NetConfServerManagerRestApi {
 \r
   @PostMapping("/createServer")\r
   public NetConfServerDetails createNetConfServerInstance(@RequestParam String deviceId,\r
-      @RequestParam String enodeBName) {\r
+      @RequestParam String enodeBName, @RequestParam String swVersion,\r
+      @RequestParam String hwVersion) {\r
+    LOG.info("Received Create NetConf Server request for deviceID: {}, enodeBName: {}, swversion: {}", deviceId,\r
+        enodeBName, swVersion);\r
+    NetConfServerDetails serverDetails =\r
+        manager.createServer(deviceId, enodeBName, swVersion, hwVersion);\r
+    LOG.info("Successfully processed NetConf Server wit server details : {}", serverDetails);\r
+    return serverDetails;\r
+  }\r
+\r
+  @PostMapping("/restartOnVersionChange")\r
+  public NetConfServerDetails restartOnVersionChange(@RequestParam String deviceId,\r
+      @RequestParam String enodeBName, @RequestParam String swVersion,\r
+      @RequestParam String hwVersion) {\r
     LOG.info("Received Create NetConf Server request for deviceID: {}, enodeBName: {}", deviceId,\r
         enodeBName);\r
-    NetConfServerDetails serverDetails = manager.createServer(deviceId, enodeBName);\r
+    NetConfServerDetails serverDetails =\r
+        manager.restartOnVersionChange(deviceId, enodeBName, swVersion, hwVersion);\r
     LOG.info("Successfully processed NetConf Server wit server details : {}", serverDetails);\r
     return serverDetails;\r
   }\r
-\r
+  \r
   @GetMapping("/listServers")\r
   public List<NetConfServerDetails> listNetConfServersInfo() {\r
     LOG.info("Received request to list all NetConf Servers information");\r
@@ -59,14 +73,14 @@ public class NetConfServerManagerRestApi {
   }\r
 \r
   @PostMapping("/unregisterServer")\r
-  public boolean unregisterNetConfServerInstance(@RequestParam String deviceId,\r
+  public String unregisterNetConfServerInstance(@RequestParam String deviceId,\r
       @RequestParam String enodeBName) {\r
-    LOG.info("Received request for Unregister NetConf Server for deviceID: {}, enodeBName: {}",\r
+    LOG.info("Received request for Unregister NetConf Server for deviceID: {}, enodeBName: {} ",\r
         deviceId, enodeBName);\r
-    boolean status = manager.unregister(deviceId, enodeBName);\r
-    LOG.info("Unregister request is processed. NetConf Server for deviceID: {} , unregistered= {}",\r
-        deviceId, status);\r
-    return status;\r
+    String result = manager.unregister(deviceId, enodeBName);\r
+    LOG.info("Unregister request is processed. NetConf Server for deviceID: {} , unregisted= {}",\r
+        deviceId, result);\r
+    return result;\r
   }\r
 \r
 }\r