From 2ece009273252437281c8cc0b84ba2ec49e5d07c Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Thu, 17 Oct 2013 19:07:53 +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. --- interfaces-model.lua | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'interfaces-model.lua') diff --git a/interfaces-model.lua b/interfaces-model.lua index 2f108b9..9fee686 100644 --- a/interfaces-model.lua +++ b/interfaces-model.lua @@ -1,6 +1,6 @@ -- acf model for /etc/network/interfaces -- Copyright(c) 2007 N. Angelacos - Licensed under terms of GPL2 -module (..., package.seeall) +local mymodule = {} modelfunctions = require("modelfunctions") fs = require("acf.fs") @@ -232,12 +232,12 @@ end -- Public Methods ------------------------------------------------------------------------------- -get_all_interfaces = function(self, clientdata) +mymodule.get_all_interfaces = function(self, clientdata) unpack_interfaces() return cfe({ type="group", value=array, label="Interfaces" }) end -get_iface_by_name = function(self, clientdata) +mymodule.get_iface_by_name = function(self, clientdata) -- if the name is blank, then return a blank iface with error local ret unpack_interfaces() @@ -253,11 +253,11 @@ get_iface_by_name = function(self, clientdata) return ret end -get_iface = function(self, clientdata) +mymodule.get_iface = function(self, clientdata) return get_blank_iface() end -create_iface = function(self, def) +mymodule.create_iface = function(self, def) unpack_interfaces() local success = validate_interface( def ) @@ -272,7 +272,7 @@ create_iface = function(self, def) return def end -update_iface = function(self, def) +mymodule.update_iface = function(self, def) unpack_interfaces() -- if the def by that name doesn't exist, fail local success @@ -294,14 +294,14 @@ update_iface = function(self, def) return def end -get_delete_iface_by_name = function(self, clientdata) +mymodule.get_delete_iface_by_name = function(self, clientdata) local result = {} result.name = cfe({ type="select", value=clientdata.name or "", label="Interface Name", option=list_interfaces() }) return cfe({ type="group", value=result, label="Interface Name" }) end -delete_iface_by_name = function(self, deleterequest) +mymodule.delete_iface_by_name = function(self, deleterequest) local success = modelfunctions.validateselect(deleterequest.value.name) if success then @@ -321,7 +321,7 @@ delete_iface_by_name = function(self, deleterequest) return deleterequest end -get_status = function () +mymodule.get_status = function () local status = {} status.filename = cfe({ value=filename, label="Interfaces file" }) status.iproute = cfe({ type="longtext", label="ip route" }) @@ -339,16 +339,16 @@ get_status = function () return cfe({ type="group", value=status, label="Status" }) end -get_file = function () +mymodule.get_file = function () return modelfunctions.getfiledetails(filename) end -write_file = function (self, newfile) +mymodule.write_file = function (self, newfile) array = nil return modelfunctions.setfiledetails(self, newfile, {filename}) end -get_interfaces = function() +mymodule.get_interfaces = function() local ipaddr = modelfunctions.run_executable({"ip", "addr"}) -- now parse the result to find the interfaces local retval = {} @@ -361,7 +361,7 @@ get_interfaces = function() return cfe({ type="list", value=retval, label="IP Interfaces" }) end -get_addresses = function() +mymodule.get_addresses = function() local ipaddr = modelfunctions.run_executable({"ip", "addr"}) -- now parse the result to find the interfaces and IP addresses local retval = {} @@ -376,14 +376,14 @@ get_addresses = function() return cfe({ type="structure", value=retval, label="Interface IP Addresses" }) end -get_ifup_by_name = function(self, clientdata) +mymodule.get_ifup_by_name = function(self, clientdata) local result = {} result.name = cfe({ type="select", value=clientdata.name or "", label="Interface Name", option=list_interfaces() }) return cfe({ type="group", value=result, label="Interface Name" }) end -ifup_by_name = function (self, ifuprequest) +mymodule.ifup_by_name = function (self, ifuprequest) local success = modelfunctions.validateselect(ifuprequest.value.name) if success then name = ifuprequest.value.name.value or "" @@ -399,14 +399,14 @@ ifup_by_name = function (self, ifuprequest) return ifuprequest end -get_ifdown_by_name = function(self, clientdata) +mymodule.get_ifdown_by_name = function(self, clientdata) local result = {} result.name = cfe({ type="select", value=clientdata.name or "", label="Interface Name", option=list_interfaces() }) return cfe({ type="group", value=result, label="Interface Name" }) end -ifdown_by_name = function (self, ifdownrequest) +mymodule.ifdown_by_name = function (self, ifdownrequest) local success = modelfunctions.validateselect(ifdownrequest.value.name) if success then name = ifdownrequest.value.name.value or "" @@ -422,7 +422,7 @@ ifdown_by_name = function (self, ifdownrequest) return ifdownrequest end -get_restartnetworking = function(self, clientdata) +mymodule.get_restartnetworking = function(self, clientdata) local actions = {} actions[1] = "restart" local service = cfe({ type="hidden", value=servicename, label="Service Name" }) @@ -431,6 +431,8 @@ get_restartnetworking = function(self, clientdata) return startstop end -restartnetworking = function(self, startstop) +mymodule.restartnetworking = function(self, startstop) return modelfunctions.startstop_service(startstop, "restart") end + +return mymodule -- cgit v1.2.3