From d618d2e33321bd0a6debcb2c2758bda8a35456d9 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 19 Feb 2018 15:55:24 +0100 Subject: [PATCH] Fixed rubocop offenses --- .../vmware/infra_manager/vm/reconfigure.rb | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/manageiq/providers/vmware/infra_manager/vm/reconfigure.rb b/app/models/manageiq/providers/vmware/infra_manager/vm/reconfigure.rb index 90a82799b..dbe0dedf6 100644 --- a/app/models/manageiq/providers/vmware/infra_manager/vm/reconfigure.rb +++ b/app/models/manageiq/providers/vmware/infra_manager/vm/reconfigure.rb @@ -263,7 +263,7 @@ def add_disk_config_spec(vmcs, options) def add_network_adapter_config_spec(vmcs, options) add_device_config_spec(vmcs, VirtualDeviceConfigSpecOperation::Add) do |vdcs| vdcs.device = VimHash.new("VirtualVmxnet3") do |dev| - dev.key = get_next_device_idx # negative integer as temporary key + dev.key = next_device_idx # negative integer as temporary key dev.unitNumber = 0 dev.addressType = "Generated" dev.wakeOnLanEnabled = "true" @@ -274,18 +274,18 @@ def add_network_adapter_config_spec(vmcs, options) end lan = Lan.find_by(:name => options[:network], :switch_id => HostSwitch.where(:host_id => host.id).pluck(:switch_id)) raise MiqException::MiqVmError, "Network [#{options[:network]}] is not available on target" if lan.nil? - if lan.switch.shared - dev.backing = VimHash.new("VirtualEthernetCardDistributedVirtualPortBackingInfo") do |bck| - bck.port = VimHash.new("DistributedVirtualSwitchPortConnection") do |pc| - pc.switchUuid = lan.switch.switch_uuid - pc.portgroupKey = lan.uid_ems - end - end - else - dev.backing = VimHash.new('VirtualEthernetCardNetworkBackingInfo') do |bck| - bck.deviceName = options[:network] - end - end + dev.backing = if lan.switch.shared + VimHash.new("VirtualEthernetCardDistributedVirtualPortBackingInfo") do |bck| + bck.port = VimHash.new("DistributedVirtualSwitchPortConnection") do |pc| + pc.switchUuid = lan.switch.switch_uuid + pc.portgroupKey = lan.uid_ems + end + end + else + VimHash.new('VirtualEthernetCardNetworkBackingInfo') do |bck| + bck.deviceName = options[:network] + end + end end end end @@ -371,7 +371,7 @@ def set_spec_option(obj, property, value, modifier = nil) end end - def get_next_device_idx + def next_device_idx @new_device_idx ||= -100 @new_device_idx -= 1 end