luci-app-mwan3: cleanup policy cbi

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2020-11-27 15:06:22 +01:00
parent b4eeb1829e
commit ba4d067c2a

View file

@ -5,7 +5,7 @@
local dsp = require "luci.dispatcher" local dsp = require "luci.dispatcher"
local uci = require "uci" local uci = require "uci"
local m, mwan_policy, use_member, last_resort local m, s, o
function policyCheck() function policyCheck()
local policy_error = {} local policy_error = {}
@ -38,7 +38,7 @@ end
m = Map("mwan3", translate("MWAN - Policies"), m = Map("mwan3", translate("MWAN - Policies"),
policyError(policyCheck())) policyError(policyCheck()))
mwan_policy = m:section(TypedSection, "policy", nil, s = m:section(TypedSection, "policy", nil,
translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" .. translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" ..
"Member interfaces with lower metrics are used first<br />" .. "Member interfaces with lower metrics are used first<br />" ..
"Member interfaces with the same metric will be load-balanced<br />" .. "Member interfaces with the same metric will be load-balanced<br />" ..
@ -46,13 +46,13 @@ mwan_policy = m:section(TypedSection, "policy", nil,
"Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" .. "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" ..
"Names must be 15 characters or less<br />" .. "Names must be 15 characters or less<br />" ..
"Policies may not share the same name as configured interfaces, members or rules")) "Policies may not share the same name as configured interfaces, members or rules"))
mwan_policy.addremove = true s.addremove = true
mwan_policy.dynamic = false s.dynamic = false
mwan_policy.sectionhead = translate("Policy") s.sectionhead = translate("Policy")
mwan_policy.sortable = true s.sortable = true
mwan_policy.template = "cbi/tblsection" s.template = "cbi/tblsection"
mwan_policy.extedit = dsp.build_url("admin", "network", "mwan", "policy", "%s") s.extedit = dsp.build_url("admin", "network", "mwan", "policy", "%s")
function mwan_policy.create(self, section) function s.create(self, section)
if #section > 15 then if #section > 15 then
self.invalid_cts = true self.invalid_cts = true
else else
@ -62,9 +62,9 @@ function mwan_policy.create(self, section)
end end
end end
use_member = mwan_policy:option(DummyValue, "use_member", translate("Members assigned")) o = s:option(DummyValue, "use_member", translate("Members assigned"))
use_member.rawhtml = true o.rawhtml = true
function use_member.cfgvalue(self, s) function o.cfgvalue(self, s)
local memberConfig, memberList = self.map:get(s, "use_member"), "" local memberConfig, memberList = self.map:get(s, "use_member"), ""
if memberConfig then if memberConfig then
for k,v in pairs(memberConfig) do for k,v in pairs(memberConfig) do
@ -76,9 +76,9 @@ function use_member.cfgvalue(self, s)
end end
end end
last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last resort")) o = s:option(DummyValue, "last_resort", translate("Last resort"))
last_resort.rawhtml = true o.rawhtml = true
function last_resort.cfgvalue(self, s) function o.cfgvalue(self, s)
local action = self.map:get(s, "last_resort") local action = self.map:get(s, "last_resort")
if action == "blackhole" then if action == "blackhole" then
return translate("blackhole (drop)") return translate("blackhole (drop)")