Skip to content

luci-mod-status: add dynamic ethernet devices to port status view #8525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KarstenH792 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

luci-mod-status: add dynamic ethernet devices to port status view #8525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/29_ports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,13 +412,18 @@ return baseclass.extend({
});
});

return Promise.all(psePromises).then((pseResults) => {
return Promise.all([
Promise.all(psePromises),
L.resolveDefault(fs.list('/sys/class/net'), [])
]).then(([pseResults, devs]) => {
const pseMap = {};
pseResults.forEach((r) => {
if (r.pse)
pseMap[r.name] = r.pse;
});
data.push(pseMap);
const present = (devs || []).map(d => d.name || d);
data.push(pseMap);
data.push(present);
return data;
});
});
Expand Down Expand Up @@ -462,6 +467,23 @@ return baseclass.extend({
}
}

const presentDevices = new Set(data[6] || []);
for (const dev in port_map) {
if (dev === 'lo')
continue;

if (!presentDevices.has(dev))
continue;

if (!known_ports.find(p => p.device === dev)) {
known_ports.push({
role: 'extra',
device: dev,
netdev: network.instantiateDevice(dev)
});
}
}

known_ports.sort(function(a, b) {
return L.naturalCompare(a.device, b.device);
});
Expand Down