Skip to content
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

Jump to bottom

Do not offer empty name devices as VLAN etherdevice candidates (bsc#1136934) #979

Merged
merged 2 commits into from Sep 24, 2019
Merged

Do not offer empty name devices as VLAN etherdevice candidates (bsc#1136934) #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcfc0c5
Ommit devices without name
teclator Jul 12, 2019
0dcf659
Bump version & changelog
teclator Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-network.changes
View file
Open in desktop
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 24 09:58:00 UTC 2019 - Knut Anderssen <kanderssen@suse.com>

- bsc#1136934
- Do not offer empty name devices as VLAN etherdevice candidates.
- 4.1.53

-------------------------------------------------------------------
Tue Sep 10 07:40:04 UTC 2019 - Michal Filka <mfilka@suse.com>

Expand Down
61 changes: 13 additions & 48 deletions src/include/network/lan/address.rb
View file
Open in desktop
Expand Up @@ -475,63 +475,28 @@ def StoreBridge(key, _event)
# @param _key [String] id of the widget
def InitVLANSlave(_key)
items = []
# unconfigured devices
Builtins.foreach(
Convert.convert(
LanItems.Items,
from: "map <integer, any>",
to: "map <integer, map>"
)
) do |_i, a|
if Builtins.size(Ops.get_string(a, "ifcfg", "")) == 0
dev_name = Ops.get_string(a, ["hwinfo", "dev_name"], "")
items = Builtins.add(
items,
Item(
Id(dev_name),
dev_name,
dev_name == Ops.get_string(@settings, "ETHERDEVICE", "") ? true : false
)
)
end
LanItems.Items.each do |_i, a|
next unless a.fetch("ifcfg", "").empty?
dev_name = a.dig("hwinfo", "dev_name") || ""
next if dev_name.empty?
selected = dev_name == @settings.fetch("ETHERDEVICE", "")
items << Item(Id(dev_name), dev_name, selected)
end
# configured devices
configurations = NetworkInterfaces.FilterDevices("netcard")
Builtins.foreach(
Builtins.splitstring(
Ops.get(NetworkInterfaces.CardRegex, "netcard", ""),
"|"
)
) do |devtype|
Builtins.foreach(
Convert.convert(
Map.Keys(Ops.get_map(configurations, devtype, {})),
from: "list",
to: "list <string>"
)
) do |devname|
if Builtins.contains(["vlan"], NetworkInterfaces.GetType(devname))
next
end
items = Builtins.add(
items,
Item(
Id(devname),
Builtins.sformat(
"%1 - %2",
devname,
Ops.get_string(configurations, [devtype, devname, "NAME"], "")
),
Ops.get_string(@settings, "ETHERDEVICE", "") == devname
)
)
NetworkInterfaces.CardRegex["netcard"].split("|").each do |devtype|
(configurations[devtype] || {}).keys.each do |devname|
next if NetworkInterfaces.GetType(devname) == "vlan"
description = configurations.dig(devtype, devname, "NAME")
selected = devname == @settings.fetch("ETHERDEVICE", "")
items << Item(Id(devname), "#{devname} - #{description}", selected)
end
end
UI.ChangeWidget(Id(:vlan_eth), :Items, items)
UI.ChangeWidget(
Id(:vlan_id),
:Value,
Ops.get_integer(@settings, "VLAN_ID", 0)
@settings.fetch("VLAN_ID", 0).to_i
)

nil
Expand Down