Skip to content

Filter vlans by switch and then lan #9036

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

Merged
jeffibm merged 1 commit into from
Jan 22, 2024
Merged

Filter vlans by switch and then lan #9036

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
20 changes: 6 additions & 14 deletions app/controllers/mixins/actions/vm_actions/reconfigure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ def reconfigure(reconfigure_ids = [])

if @reconfigitems.size == 1
vm = @reconfigitems.first
@vlan_options = vm.try(:available_vlans) || get_vlan_options(vm.host_id)
# NOTE: available_vlans is ovirt specific vlan lookup
@vlan_options = vm.try(:available_vlans) || get_vlan_options(vm.host)

@avail_adapter_names = vm.try(:available_adapter_names) || []
@iso_options = get_iso_options(vm)
Expand Down Expand Up @@ -210,19 +211,10 @@ def reconfigure_calculations(mbsize)
return humansize.to_s, fmt
end

def get_vlan_options(host_id)
vlan_options = []

# determine available switches for this host...
switch_ids = []
Rbac.filtered(HostSwitch.where("host_id = ?", host_id)).each do |host_switch|
switch_ids << host_switch.switch_id
end

Rbac.filtered(Lan.where("switch_id IN (?)", switch_ids)).each do |lan|
vlan_options << lan.name
end
vlan_options.sort
# determine available switches for this host...
def get_vlan_options(host)
switch_ids = Rbac.filtered(host.switches).pluck(:id)
Rbac.filtered(Lan.where(:switch_id => switch_ids).order(:name)).pluck(:name)
end

def get_iso_options(vm)
Expand Down