modules/admin-core, modules/admin-full: fix switch port status for devices with multiple switches

modules/admin-core/luasrc/tools/status.lua

@@ -153,7 +153,10 @@ function wifi_network(id)
 	return { }
 end
 
-function switch_status(dev)
+function switch_status(devs)
+	local dev
+	local switches = { }
+	for dev in devs:gmatch("[^%s,]+") do
 		local ports = { }
 		local swc = io.popen("swconfig dev %q show" % dev, "r")
 		if swc then
@@ -183,5 +186,7 @@ function switch_status(dev)
 			until not l
 			swc:close()
 		end
-	return ports
+		switches[dev] = ports
+	end
+	return switches
 end

modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua

@@ -14,6 +14,8 @@ You may obtain a copy of the License at
 
 m = Map("network", translate("Switch"), translate("The network ports on this device can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."))
 
+local switches = { }
+
 m.uci:foreach("network", "switch",
 	function(x)
 		local sid         = x['.name']
@@ -199,7 +201,7 @@ m.uci:foreach("network", "switch",
 		end
 
 
-		local vid = s:option(Value, has_vlan4k or "vlan", "VLAN ID")
+		local vid = s:option(Value, has_vlan4k or "vlan", "VLAN ID", "<div id='portstatus-%s'></div>" % switch_name)
 
 		vid.rmempty = false
 		vid.forcewrite = true
@@ -276,12 +278,13 @@ m.uci:foreach("network", "switch",
 			port_opts[#port_opts+1] = po
 		end
 
+		switches[#switches+1] = switch_name
+	end
+)
 
 -- Switch status template
 s = m:section(SimpleSection)
 s.template = "admin_network/switch_status"
-        s.switch = switch_name
+s.switches = switches
-	end
-)
 
 return m

modules/admin-full/luasrc/view/admin_network/switch_status.htm

@@ -1,31 +1,28 @@
 <script type="text/javascript">//<![CDATA[
-	var tb;
+	var switches = [ '<%=table.concat(self.switches, "', '")%>' ];
-	var ths = document.getElementsByTagName('th');
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "switch_status")%>/' + switches.join(','), null,
-	for (var i = 0; i < ths.length; i++)
-		if (ths[i].className = 'cbi-section-table-cell' && !ths[i].innerHTML)
-		{
-			ths[i].innerHTML = '<%:Port status:%>';
-			tb = ths[i].parentNode;
-			break;
-		}
-
-	if (tb)
-	{
-		XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "switch_status", self.switch)%>', null,
 		function(x, st)
 		{
-				if (st && st.length)
+			for (var i = 0; i < switches.length; i++)
 			{
-					for (var i = 0; i < st.length; i++)
+				var ports = st[switches[i]];
-					{
+				var th0 = document.getElementById('portstatus-' + switches[i]);
-						var th = tb.childNodes[i+1];
 
-						if (st[i].link)
+				if (th0 && ports && ports.length)
+				{
+					if (!th0.innerHTML)
+						th0.innerHTML = '<%:Port status:%>';
+
+					for (var j = 0; j < ports.length; j++)
+					{
+						var th = th0.parentNode.parentNode.childNodes[j+1];
+
+						if (ports[j].link)
 						{
 							th.innerHTML = String.format(
 								'<small><img src="<%=resource%>/icons/port_up.png" />' +
 								'<br />%d<%:baseT%><br />%s</small>',
-								st[i].speed, st[i].duplex
+								ports[j].speed, ports[j].duplex
 									? '<%:full-duplex%>' : '<%:half-duplex%>'
 							);
 						}
@@ -39,6 +36,6 @@
 					}
 				}
 			}
-		);
 		}
+	);
 //]]></script>