vmware_web_service 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df40424f3d517dd28e1068afa27577ae38b41eefb926476c43116df2422fe841
-  data.tar.gz: b1ba415b69bb546c830354ad42fa39cccdeda19104d23672d82909654ea8938f
+  metadata.gz: dec8c1bf5bd2dd9fc8d00e057e146cf7dea54c2cbcfe5c500f71389e333d6de4
+  data.tar.gz: 331dbc8f7400e12b2a3a5c1c3dd7b474db1880be659a9e182112b23c8278b817
 SHA512:
-  metadata.gz: 6716525e09aef414ae8a4cbe341fbd0a10da794e61bc8455e29f1c7df4a1952949151f15be9aec381fab1d355564e4106626f49f9ad1fcb7efd71e3f66afc96b
-  data.tar.gz: 7c83374173415c650fc5cdd9629d04e298d2a8367191e564e11c5711b82165e23816b86d6c6e2e8e7eb743f99aeba279c0b941c12bac35faf3ccb962ed5daada
+  metadata.gz: 73e001def303f702ad26815843ec3b0fc25cbdfa26fb4c796cdec1e333e4a6fb8c0357cf86ce8ea31e076401b9e1729d41555d1668e296d46a4aea7bd59bdf1b
+  data.tar.gz: 5e91e171b1d568f6b1920a29ef69161eeebc9accd1261e3e93b7cab58a126f890266013552f23e98c24c1088646512dd97e91b7b08ee52ff4e959f011e33b192

data/lib/VMwareWebService/MiqVim.rb

@@ -20,7 +20,7 @@ class MiqVim < MiqVimInventory
 
   attr_reader :updateThread, :monitor_updates
 
-  # @param server [String] DNS name or IP address of the vCenter Server 
+  # @param server [String] DNS name or IP address of the vCenter Server
   # @param username [String] Username to connect to the vCenter Server
   # @param password [String] Password to connect to the vCenter Server
   # @param cacheScope [Symbol] A pre-defined set of properties to cache (default: nil)
@@ -30,10 +30,11 @@ class MiqVim < MiqVimInventory
   # @param notifyMethod [Method] A optional method to call for each update (default: nil)
   # @param maxWait [Integer] How many seconds to wait before breaking out of WaitForUpdates (default: 60)
   # @param maxObjects [Integer] How many objects to return from each WaitForUpdates page (default: 250)
-  def initialize(server, username, password, cacheScope = nil, monitor_updates = false, preLoad = false, debugUpdates = false, notifyMethod = nil, maxWait = 60, maxObjects = 250)
+  def initialize(server, username, password, cacheScope = nil, monitor_updates = nil, preLoad = nil, debugUpdates = false, notifyMethod = nil, maxWait = 60, maxObjects = 250)
     super(server, username, password, cacheScope)
 
-    pbm_initialize(self)
+    monitor_updates = self.class.monitor_updates if monitor_updates.nil?
+    preLoad         = self.class.pre_load        if preLoad.nil?
 
     @monitor_updates    = monitor_updates
     @updateMonitorReady = false
@@ -46,6 +47,25 @@ class MiqVim < MiqVimInventory
     start_monitor_updates_thread(preLoad) if @monitor_updates
   end
 
+  @@monitor_updates = false
+  @@pre_load        = false
+
+  def self.monitor_updates
+    @@monitor_updates
+  end
+
+  def self.monitor_updates=(val)
+    @@monitor_updates = val
+  end
+
+  def self.pre_load
+    @@pre_load
+  end
+
+  def self.pre_load=(val)
+    @@pre_load = val
+  end
+
   def getVimVm(path)
     $vim_log.info "MiqVimMod.getVimVm: called"
     miqVimVm = nil

data/lib/VMwareWebService/MiqVimCustomizationSpecManager.rb

@@ -34,7 +34,7 @@ class MiqVimCustomizationSpecManager
     specs = info
     return [] if specs.nil?
 
-    specs = Array.wrap(specs.dup)
+    specs = Array(specs.dup)
     specs.each { |s| s['spec'] = getCustomizationSpec(s['name'].to_s).spec }
     specs
   end

data/lib/VMwareWebService/MiqVimInventory.rb

@@ -366,7 +366,12 @@ class MiqVimInventory < MiqVimClientBase
     #
     # Hash snapshot info by create time.
     #
-    ssMorHash[ssObj['createTime']] = ssObj
+    # VMware API strips trailing '0's from the fractional seconds
+    # which causes the string to not match what .iso8601(6) returns
+    #
+    # Example 12:12:59.123Z instead of 12:12:59.123000Z
+    create_time = Time.parse(ssObj['createTime']).iso8601(6)
+    ssMorHash[create_time] = ssObj
 
     #
     # Ensure childSnapshotList is always present and always an array,

data/lib/VMwareWebService/MiqVimVm.rb

@@ -909,7 +909,7 @@ class MiqVimVm
     scsi_controllers.sort_by { |s| s["key"].to_i }.each do |scsi_controller|
       # Skip if all controller units are populated
       # Bus has 16 units, controller takes up 1 unit itself
-      device = Array.wrap(scsi_controller["device"])
+      device = Array(scsi_controller["device"])
       next if device.count >= MAX_SCSI_DEVICES
 
       # We've found the lowest scsi controller with an available unit

data/lib/VMwareWebService/VixDiskLib/VixDiskLib.rb

@@ -96,7 +96,8 @@ class VixDiskLib
 
     my_env["LD_LIBRARY_PATH"] = (my_env["LD_LIBRARY_PATH"].to_s.split(':') << VIXDISKLIB_PATH).compact.join(":")
     raise VixDiskLibError, "VixDiskLib.connect() failed: No $vim_log defined" unless $vim_log
-    my_env["LOG_FILE"] = $vim_log.logdev.filename.to_s
+    my_env["LOG_FILE"] = $vim_log.logdev.filename.to_s if $vim_log.logdev.kind_of?(Logger::LogDevice)
+
     my_env
   end
 
@@ -109,9 +110,12 @@ class VixDiskLib
     proc_reader, @proc_writer = IO.pipe
 
     server_cmd = "ruby #{SERVER_PATH}/VixDiskLibServer.rb"
+    log_target = my_env["LOG_FILE"] ? [my_env["LOG_FILE"], "a"] : $stdout
+
     $vim_log.info "VixDiskLib.start_service: running command = #{server_cmd}"
+
     pid = Kernel.spawn(my_env, server_cmd,
-                       [:out, :err]     => [my_env["LOG_FILE"], "a"],
+                       [:out, :err]     => log_target,
                        :unsetenv_others => true,
                        3                => uri_writer,
                        4                => proc_reader)

data/lib/VMwareWebService/VixDiskLib/VixDiskLibServer.rb

@@ -11,9 +11,7 @@ require 'VMwareWebService/VixDiskLib/vdl_wrapper'
 class VixDiskLibError < RuntimeError
 end
 
-LOG_FILE    = ENV["LOG_FILE"]
-
-$vim_log = Logger.new LOG_FILE
+$vim_log = Logger.new $stdout
 
 class VDDKFactory
   include DRb::DRbUndumped

data/lib/VMwareWebService/VixDiskLib/vdl_wrapper.rb

@@ -4,9 +4,7 @@ require 'ffi-vix_disk_lib/api_wrapper'
 require 'VMwareWebService/VimTypes'
 require 'time'
 
-LOG_FILE    = ENV["LOG_FILE"]
-
-$vim_log = Logger.new LOG_FILE
+$vim_log = Logger.new $stdout
 
 VixDiskLibApi = FFI::VixDiskLib::ApiWrapper
 class VdlWrapper

data/lib/VMwareWebService/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.2.4
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.2.4
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: ffi-vix_disk_lib
   requirement: !ruby/object:Gem::Requirement
@@ -4460,7 +4460,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.5
 signing_key:
 specification_version: 4
 summary: A ruby interface to Vmware Web Services SDK