Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add a getDeviceByLabel method
Add a method to return a VirtualDevice by label and refactor the
existing getDeviceKeysByLabel to use it.

https://bugzilla.redhat.com/show_bug.cgi?id=1533728
  • Loading branch information
agrare committed Apr 30, 2018
1 parent 272ff5a commit 0a71f13
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions lib/VMwareWebService/MiqVimVm.rb
Expand Up @@ -940,18 +940,14 @@ def getDeviceByBacking(backingFile, hardware = nil)
nil
end

def getDeviceKeysByLabel(device_label)
hardware = getHardware
hardware["device"].to_a.each do |dev|
next unless VIRTUAL_NICS.include?(dev.xsiType)
next unless dev["deviceInfo"]["label"] == device_label
controller_key = dev["controllerKey"]
key = dev["key"]
unit_number = dev["unitNumber"]
return controller_key, key, unit_number
end
# controller_key, key, unit_number
[nil, nil, nil]
def getDeviceByLabel(device_label, hardware = nil)
hardware ||= getHardware
hardware["device"].to_a.detect { |dev| dev["deviceInfo"]["label"] == device_label }
end

def getDeviceKeysByLabel(device_label, hardware = nil)
dev = getDeviceByLabel(device_label, hardware)
dev.values_at("controllerKey", "key", "unitNumber") unless dev.nil?
end

#####################
Expand Down

0 comments on commit 0a71f13

Please sign in to comment.