X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fvlan.lua;h=89a73a5ca88909c3e1274005602dbc0feb1f0d24;hp=902767c903826d8aa3303012c0b1a4b3dcd0a9e1;hb=e38a03f1e35d2521d22fd4f5b92b7c677d0b5bdf;hpb=95358ab99d89b92e3e68a9ceebb76ae563a73344

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
index 902767c90..89a73a5ca 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -12,6 +12,35 @@ nw.init(m.uci)
 
 local topologies = nw:get_switch_topologies() or {}
 
+local update_interfaces = function(old_ifname, new_ifname)
+	local info = { }
+
+	m.uci:foreach("network", "interface", function(section)
+		local old_ifnames = m.uci:get("network", section[".name"], "ifname")
+		local new_ifnames = { }
+		local cur_ifname
+		local changed = false
+		for cur_ifname in luci.util.imatch(old_ifnames) do
+			if cur_ifname == old_ifname then
+				new_ifnames[#new_ifnames+1] = new_ifname
+				changed = true
+			else
+				new_ifnames[#new_ifnames+1] = cur_ifname
+			end
+		end
+		if changed then
+			m.uci:set("network", section[".name"], "ifname", table.concat(new_ifnames, " "))
+
+			info[#info+1] = translatef("Interface %q device auto-migrated from %q to %q.",
+				section[".name"], old_ifname, new_ifname)
+		end
+	end)
+
+	if #info > 0 then
+		m.message = (m.message and m.message .. "\n" or "") .. table.concat(info, "\n")
+	end
+end
+
 m.uci:foreach("network", "switch",
 	function(x)
 		local sid         = x['.name']
@@ -259,17 +288,32 @@ m.uci:foreach("network", "switch",
 
 		-- When writing the "vid" or "vlan" option, serialize the port states
 		-- as well and write them as "ports" option to uci.
-		vid.write = function(self, section, value)
+		vid.write = function(self, section, new_vid)
 			local o
 			local p = { }
-
 			for _, o in ipairs(port_opts) do
-				local v = o:formvalue(section)
-				if v == "t" then
-					p[#p+1] = o.option .. v
-				elseif v == "u" then
+				local new_tag = o:formvalue(section)
+				if new_tag == "t" then
+					p[#p+1] = o.option .. new_tag
+				elseif new_tag == "u" then
 					p[#p+1] = o.option
 				end
+
+				if o.info and o.info.device then
+					local old_tag = o:cfgvalue(section)
+					local old_vid = self:cfgvalue(section)
+					if old_tag ~= new_tag or old_vid ~= new_vid then
+						local old_ifname = (old_tag == "u") and o.info.device
+							or "%s.%s" %{ o.info.device, old_vid }
+
+						local new_ifname = (new_tag == "u") and o.info.device
+							or "%s.%s" %{ o.info.device, new_vid }
+
+						if old_ifname ~= new_ifname then
+							update_interfaces(old_ifname, new_ifname)
+						end
+					end
+				end
 			end
 
 			if enable_vlan4k then
@@ -277,7 +321,7 @@ m.uci:foreach("network", "switch",
 			end
 
 			m:set(section, "ports", table.concat(p, " "))
-			return Value.write(self, section, value)
+			return Value.write(self, section, new_vid)
 		end
 
 		-- Fallback to "vlan" option if "vid" option is supported but unset.
@@ -301,6 +345,7 @@ m.uci:foreach("network", "switch",
 			po.cfgvalue = portvalue
 			po.validate = portvalidate
 			po.write    = function() end
+			po.info     = pt
 
 			port_opts[#port_opts+1] = po
 		end