From 2262acb8dbee2e6005e679d454e5d4358ab443eb Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 21 Oct 2013 00:02:20 +0000 Subject: Remove all calls to 'module' in preparation for move to Lua 5.2 Use mymodule parameter for module definition. This was also helpful in revealing places where the code relied on the global environment. --- bgp-controller.lua | 13 +++++++------ bgp-model.lua | 15 ++++++++------- ospf-controller.lua | 13 +++++++------ ospf-model.lua | 16 ++++++++-------- zebra-controller.lua | 13 +++++++------ zebra-model.lua | 16 ++++++++-------- 6 files changed, 45 insertions(+), 41 deletions(-) diff --git a/bgp-controller.lua b/bgp-controller.lua index 15d7658..3c29ba2 100644 --- a/bgp-controller.lua +++ b/bgp-controller.lua @@ -1,20 +1,21 @@ -module(..., package.seeall) +local mymodule = {} -default_action = "status" +mymodule.default_action = "status" -function status(self) +function mymodule.status(self) return self.model.getstatus() end -function details(self) +function mymodule.details(self) return self.model.getdetails() end -function expert(self) +function mymodule.expert(self) return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit BGP Config", "BGP Configuration Saved") end -function startstop(self) +function mymodule.startstop(self) return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata) end +return mymodule diff --git a/bgp-model.lua b/bgp-model.lua index 88badc6..c380163 100644 --- a/bgp-model.lua +++ b/bgp-model.lua @@ -1,4 +1,4 @@ -module(..., package.seeall) +local mymodule = {} -- Load libraries modelfunctions = require("modelfunctions") @@ -58,30 +58,31 @@ end -- ################################################################################ -- PUBLIC FUNCTIONS -function getstatus() +function mymodule.getstatus() return modelfunctions.getstatus(processname, packagename, "BGP Status") end -function getconfigfile() +function mymodule.getconfigfile() return modelfunctions.getfiledetails(configfile) end -function setconfigfile(self, filedetails) +function mymodule.setconfigfile(self, filedetails) return modelfunctions.setfiledetails(self, filedetails, {configfile}) end -function get_startstop(self, clientdata) +function mymodule.get_startstop(self, clientdata) return modelfunctions.get_startstop(processname) end -function startstop_service(self, startstop, action) +function mymodule.startstop_service(self, startstop, action) return modelfunctions.startstop_service(startstop, action) end -function getdetails() +function mymodule.getdetails() local status = {} status.showipbgp = cfe({ label="BGP routes" }) status.showipbgp.value = telnetshowipbgp() return cfe({ type="group", value=status, label="BGP Details" }) end +return mymodule diff --git a/ospf-controller.lua b/ospf-controller.lua index 9cabb3b..fbdbc6f 100644 --- a/ospf-controller.lua +++ b/ospf-controller.lua @@ -1,20 +1,21 @@ -module(..., package.seeall) +local mymodule = {} -default_action = "status" +mymodule.default_action = "status" -function status(self) +function mymodule.status(self) return self.model.getstatus() end -function details(self) +function mymodule.details(self) return self.model.getdetails() end -function startstop(self) +function mymodule.startstop(self) return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata) end -function expert(self) +function mymodule.expert(self) return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit OSPF Config", "OSPF Configuration Saved") end +return mymodule diff --git a/ospf-model.lua b/ospf-model.lua index 383050b..27d779a 100644 --- a/ospf-model.lua +++ b/ospf-model.lua @@ -1,4 +1,4 @@ -module(..., package.seeall) +local mymodule = {} -- Load libraries modelfunctions = require("modelfunctions") @@ -55,31 +55,31 @@ end -- ################################################################################ -- PUBLIC FUNCTIONS -function get_startstop(self, clientdata) +function mymodule.get_startstop(self, clientdata) return modelfunctions.get_startstop(processname) end -function startstop_service(self, startstop, action) +function mymodule.startstop_service(self, startstop, action) return modelfunctions.startstop_service(startstop, action) end -function getstatus() +function mymodule.getstatus() return modelfunctions.getstatus(processname, packagename, "OSPF Status") end -function getconfigfile() +function mymodule.getconfigfile() return modelfunctions.getfiledetails(configfile) end -function setconfigfile(self, filedetails) +function mymodule.setconfigfile(self, filedetails) return modelfunctions.setfiledetails(self, filedetails, {configfile}) end -function getdetails() +function mymodule.getdetails() local status = {} status.showip = cfe({ label="OSPF routes" }) status.showip.value = telnetshowip() return cfe({ type="group", value=status, label="OSPF Details" }) end - +return mymodule diff --git a/zebra-controller.lua b/zebra-controller.lua index 9d723c7..489494a 100644 --- a/zebra-controller.lua +++ b/zebra-controller.lua @@ -1,20 +1,21 @@ -module(..., package.seeall) +local mymodule = {} -default_action = "status" +mymodule.default_action = "status" -function status(self) +function mymodule.status(self) return self.model.getstatus() end -function details(self) +function mymodule.details(self) return self.model.getdetails() end -function startstop(self) +function mymodule.startstop(self) return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata) end -function expert(self) +function mymodule.expert(self) return self.handle_form(self, self.model.getconfigfile, self.model.setconfigfile, self.clientdata, "Save", "Edit Zebra Config", "Zebra Configuration Saved") end +return mymodule diff --git a/zebra-model.lua b/zebra-model.lua index 488e113..3dcf53b 100644 --- a/zebra-model.lua +++ b/zebra-model.lua @@ -1,4 +1,4 @@ -module(..., package.seeall) +local mymodule = {} -- Load libraries modelfunctions = require("modelfunctions") @@ -59,31 +59,31 @@ end -- ################################################################################ -- PUBLIC FUNCTIONS -function get_startstop(self, clientdata) +function mymodule.get_startstop(self, clientdata) return modelfunctions.get_startstop(processname) end -function startstop_service(self, startstop, action) +function mymodule.startstop_service(self, startstop, action) return modelfunctions.startstop_service(startstop, action) end -function getstatus() +function mymodule.getstatus() return modelfunctions.getstatus(processname, packagename, "Zebra Status") end -function getconfigfile() +function mymodule.getconfigfile() return modelfunctions.getfiledetails(configfile) end -function setconfigfile(self, filedetails) +function mymodule.setconfigfile(self, filedetails) return modelfunctions.setfiledetails(self, filedetails, {configfile}) end -function getdetails() +function mymodule.getdetails() local status = {} status.showip = cfe({ label="Zebra routes" }) status.showip.value = telnetshowip() return cfe({ type="group", value=status, label="Zebra Details" }) end - +return mymodule -- cgit v1.2.3