vmware_web_service 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d49e55eae3c01b8a0ebcee6bc65ecd844d85873
-  data.tar.gz: f54bfb9418377883d6cf70feeac750f915501f79
+  metadata.gz: f815f44db746241670dcf6aeccceb7ba06e5239f
+  data.tar.gz: ce92064c9ad563462157886144c386e79c07049d
 SHA512:
-  metadata.gz: 5be8f46486ae02c49a400ac2578c490ea9f50111fd2f5f083f7d2c03cd1f5a5f0c728d1f2fc573776e66b23d13e8be95536b10286dfd57ed9c43a8a6d90b51c8
-  data.tar.gz: 9c37afe5a3abd34a4163aa7459a96bf63bff558543d9cb7eac5b3f547225229336aaf2075748f009612b837cc212a736e448a889975b261e696c2ac001d4b260
+  metadata.gz: a04a387bb2cf576b16aa39ed3bddccdd161f63ec23b80e69164539970175b28b912855042d3be7e19fa66400c6a4c5867f228867b686716c7b07d61bab2d21dc
+  data.tar.gz: 0db6b7d78d2c31c63ed1a3b8542551cc0bfdd5b9fc63f8880d8760922e43a78becf7932a5a08430729c6bf8ba9d16f85a0127a602ad00c4f1ff6c87c2d75b915

data/lib/VMwareWebService/MiqVimVm.rb

@@ -21,8 +21,13 @@ class MiqVimVm
   VIRTUAL_SCSI_CONTROLLERS  = %w( VirtualBusLogicController
                                   VirtualLsiLogicController
                                   VirtualLsiLogicSASController
-                                  ParaVirtualSCSIController
-                                ).freeze
+                                  ParaVirtualSCSIController ).freeze
+  VIRTUAL_NICS              = %w( VirtualE1000
+                                  VirtualE1000e
+                                  VirtualPCNet32
+                                  VirtualVmxnet
+                                  VirtualVmxnet2
+                                  VirtualVmxnet3 ).freeze
   MAX_SCSI_DEVICES          = 15
   MAX_SCSI_CONTROLLERS      = 4
 
@@ -915,15 +920,39 @@ class MiqVimVm
   # associated with the given backing file.
   #
   def getDeviceKeysByBacking(backingFile, hardware = nil)
-    hardware ||= getHardware()
+    dev = getDeviceByBacking(backingFile, hardware)
+    return [nil, nil] if dev.nil?
+    [dev["controllerKey"], dev["key"]]
+  end
+
+  #
+  # Returns the device details
+  # associated with the given backing file.
+  #
+  def getDeviceByBacking(backingFile, hardware = nil)
+    hardware ||= getHardware
 
     hardware["device"].to_a.each do |dev|
       next if dev.xsiType != "VirtualDisk"
       next if dev["backing"]["fileName"] != backingFile
-      return([dev["controllerKey"], dev["key"]])
+      return dev
     end
-    ([nil, nil])
-  end # def getDeviceKeysByBacking
+    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]
+  end
 
   #####################
   # Miq Alarm methods.

data/lib/VMwareWebService/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport