From 01734be02c43e3ff1b884f2a3277db22963b98e9 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 23 Mar 2018 09:18:46 +0100
Subject: [PATCH] net/frr: convert service control

---
 .../src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt   | 4 +---
 .../mvc/app/views/OPNsense/Quagga/diagnosticsbgp.volt     | 4 +---
 .../mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt | 5 ++---
 .../mvc/app/views/OPNsense/Quagga/diagnosticsospf.volt    | 4 +---
 .../mvc/app/views/OPNsense/Quagga/diagnosticsospfv3.volt  | 4 +---
 .../opnsense/mvc/app/views/OPNsense/Quagga/general.volt   | 8 ++------
 .../src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt  | 4 +---
 .../src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt | 4 +---
 .../src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt   | 8 ++------
 9 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
index 23aae01f2..2354e1b63 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
@@ -162,9 +162,7 @@ POSSIBILITY OF SUCH DAMAGE.
 <script>
 
 function quagga_update_status() {
-    ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-        updateServiceStatusUI(data['status']);
-    });
+    updateServiceControlUI('quagga');
 }
 
 $(document).ready(function() {
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsbgp.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsbgp.volt
index e0219a99d..9c8d68d6e 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsbgp.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsbgp.volt
@@ -84,9 +84,7 @@ function translate(x) {
   return x;
 }
 $(document).ready(function() {
-  ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-      updateServiceStatusUI(data['status']);
-  });
+  updateServiceControlUI('quagga');
 
   ajaxCall(url="/api/quagga/diagnostics/showipbgp", sendData={}, callback=function(data,status) {
       content = _.template($('#overviewtpl').html())(data['response'])
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt
index 5ddb6dab4..61330475e 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt
@@ -96,9 +96,8 @@ dataconverters = {
 }
 
 $(document).ready(function() {
-  ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-      updateServiceStatusUI(data['status'])
-  });
+  updateServiceControlUI('quagga');
+
   ajaxCall(url="/api/quagga/diagnostics/generalroutes", sendData={}, callback=function(data,status) {
     content = _.template($('#routestpl').html())(data['response'])
     $('#routing').html(content)
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsospf.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsospf.volt
index 718fa25e4..0ac926d06 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsospf.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsospf.volt
@@ -428,9 +428,7 @@ dataconverters = {
 }
 
 $(document).ready(function() {
-  ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-      updateServiceStatusUI(data['status'])
-  });
+  updateServiceControlUI('quagga');
 
   ajaxCall(url="/api/quagga/diagnostics/ospfoverview", sendData={}, callback=function(data,status) {
     content = _.template($('#overviewtpl').html())(data['response'])
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsospfv3.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsospfv3.volt
index b6b7322d0..65c9d3866 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsospfv3.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsospfv3.volt
@@ -331,9 +331,7 @@ dataconverters = {
 }
 
 $(document).ready(function() {
-  ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-      updateServiceStatusUI(data['status'])
-  });
+  updateServiceControlUI('quagga');
 
   ajaxCall(url="/api/quagga/diagnostics/ospfv3overview", sendData={}, callback=function(data,status) {
     content = _.template($('#overviewtpl').html())(data['response'])
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt
index c05ab4665..01e1746bd 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt
@@ -41,18 +41,14 @@ POSSIBILITY OF SUCH DAMAGE.
             formatTokenizersUI();
             $('.selectpicker').selectpicker('refresh');
         });
-        ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-            updateServiceStatusUI(data['status']);
-        });
+        updateServiceControlUI('quagga');
 
         // link save button to API set action
         $("#saveAct").click(function(){
             saveFormToEndpoint(url="/api/quagga/general/set", formid='frm_general_settings',callback_ok=function(){
                 $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
                 ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) {
-                    ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-                        updateServiceStatusUI(data['status']);
-                    });
+                    updateServiceControlUI('quagga');
                     $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
                 });
             }, true);
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt
index 75820e932..424ca1e11 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt
@@ -132,9 +132,7 @@ POSSIBILITY OF SUCH DAMAGE.
 <script>
 
 function quagga_update_status() {
-  ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-    updateServiceStatusUI(data['status']);
-  });
+  updateServiceControlUI('quagga');
 }
 
 $( document ).ready(function() {
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt
index 1b3296a4f..758ca04a3 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt
@@ -77,9 +77,7 @@ POSSIBILITY OF SUCH DAMAGE.
 <script>
 
 function quagga_update_status() {
-  ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-    updateServiceStatusUI(data['status']);
-  });
+  updateServiceControlUI('quagga');
 }
 
 $( document ).ready(function() {
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt
index 6e014f5b0..8abc7a3f5 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt
@@ -43,18 +43,14 @@ $(document).ready(function() {
       $('.selectpicker').selectpicker('refresh');
   });
 
-  ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-      updateServiceStatusUI(data['status']);
-  });
+  updateServiceControlUI('quagga');
 
   // link save button to API set action
   $("#saveAct").click(function(){
       saveFormToEndpoint(url="/api/quagga/rip/set",formid='frm_rip_settings',callback_ok=function(){
         $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
         ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) {
-          ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-            updateServiceStatusUI(data['status']);
-          });
+          updateServiceControlUI('quagga');
           $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
         });
       });