From e986a42e901c866aa1eb8b4850495b7c336355a6 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Tue, 9 Sep 2008 20:28:42 +0000 Subject: Minor clean-up of quagga git-svn-id: svn://svn.alpinelinux.org/acf/quagga/trunk@1454 ab2d0c66-481e-0410-8bed-d214d4d58bed --- bgp-controller.lua | 3 --- bgp-details-html.lsp | 2 +- bgp-model.lua | 7 ++----- zebra-controller.lua | 3 --- zebra.roles | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/bgp-controller.lua b/bgp-controller.lua index b344230..0938a89 100644 --- a/bgp-controller.lua +++ b/bgp-controller.lua @@ -5,9 +5,6 @@ require("controllerfunctions") default_action = "status" -function welcome() -end - function status(self) return self.model.getstatus() end diff --git a/bgp-details-html.lsp b/bgp-details-html.lsp index 025dab2..9a946fd 100644 --- a/bgp-details-html.lsp +++ b/bgp-details-html.lsp @@ -10,6 +10,6 @@ io.write("")

BGP routes

-<% io.write(tostring(data.showipbgp.value)) %>
+<% io.write(tostring(data.value.showipbgp.value)) %>
 
diff --git a/bgp-model.lua b/bgp-model.lua index c1426f9..07c5b24 100644 --- a/bgp-model.lua +++ b/bgp-model.lua @@ -57,11 +57,8 @@ end function getdetails() local status = {} - status.showipbgp = cfe({ - name="showipbgp", - label="BGP routes", - }) + status.showipbgp = cfe({ label="BGP routes" }) status.showipbgp.value,status.showipbgp.errtxt = telnetshowipbgp() - return status + return cfe({ type="group", value=status, label="BGP Details" }) end diff --git a/zebra-controller.lua b/zebra-controller.lua index 90aacdd..8e65d57 100644 --- a/zebra-controller.lua +++ b/zebra-controller.lua @@ -5,9 +5,6 @@ require("controllerfunctions") default_action = "status" -function welcome() -end - function status(self) return self.model.getstatus() end diff --git a/zebra.roles b/zebra.roles index 3c86963..c03bfdb 100644 --- a/zebra.roles +++ b/zebra.roles @@ -1,2 +1,2 @@ -READ=zebra:welcome,zebra:status,zebra:details, +READ=zebra:status,zebra:details, UPDATE=zebra:startstop,zebra:expert, -- cgit v1.2.3