vmware_web_service 1.0.7 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c405553b39bdd48a0d1addb0ab9851436a201adc836a23829177e68cab8169c3
-  data.tar.gz: c70a6f7137570372d6b6b4e05fd0c8723fe2e3ab0980d8651a03a874e9b9c2cf
+  metadata.gz: 7e574683780708a47c577b3917ed87bf1557bc5cf74754a316779dbf22078e41
+  data.tar.gz: adaf9d2ceee9103c3f1f523c09741f851265b3a751b3bc4485f2d94f778c6dcf
 SHA512:
-  metadata.gz: b733b1e46bc3a003a111b33bd03b8e57be539f632f15eae1cb86f293c3ff4df065610db71c8498e46f9b33ca6f2e73b7676aae4a22921964e0f88feec7038b63
-  data.tar.gz: 86cdf766a022fd1bfe677e5b9c353b2df629fdccd7ee2d443c518393c7a5e66863e248cf1fcd91536d17b41417e2df0da519c5b20db43556792ef82a3dfe1c91
+  metadata.gz: 8bbd90473121a7d542350232dca9525e33c836e84274e41574550e4dd2123b317d23345a73ff8cf5bc6e8f98b849358571288aef91a44d5fbc076a979c0ac7ca
+  data.tar.gz: c423d660ce2d62115449de15b130495794625344b58a1ba7d7d331155b62e4d29738a69c55991931050a0dba29ddbad318b367189edf990113ca5745c983fbe3

data/lib/VMwareWebService/MiqVim.rb

@@ -1,7 +1,6 @@
 require 'sync'
 
 require 'VMwareWebService/MiqVimInventory'
-require 'VMwareWebService/MiqPbmInventory'
 require 'VMwareWebService/MiqVimVm'
 require 'VMwareWebService/MiqVimVdlMod'
 require 'VMwareWebService/MiqVimFolder'
@@ -17,7 +16,6 @@ require 'VMwareWebService/MiqVimUpdate'
 
 class MiqVim < MiqVimInventory
   include MiqVimVdlConnectionMod
-  include MiqPbmInventory
   include MiqVimUpdate
 
   attr_reader :updateThread, :monitor_updates
@@ -35,8 +33,6 @@ class MiqVim < MiqVimInventory
   def initialize(server, username, password, cacheScope = nil, monitor_updates = false, preLoad = false, debugUpdates = false, notifyMethod = nil, maxWait = 60, maxObjects = 250)
     super(server, username, password, cacheScope)
 
-    pbm_initialize(self)
-
     @monitor_updates    = monitor_updates
     @updateMonitorReady = false
     @error              = 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/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '1.0.7'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 2.0.3
 platform: ruby
 authors:
 - ManageIQ Developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: ffi-vix_disk_lib
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +92,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: rbvmomi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +191,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A ruby interface to Vmware Web Services SDK
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -221,7 +207,6 @@ files:
 - lib/VMwareWebService/MiqHostSnmpSystem.rb
 - lib/VMwareWebService/MiqHostStorageSystem.rb
 - lib/VMwareWebService/MiqHostVirtualNicManager.rb
-- lib/VMwareWebService/MiqPbmInventory.rb
 - lib/VMwareWebService/MiqVim.rb
 - lib/VMwareWebService/MiqVimAlarmManager.rb
 - lib/VMwareWebService/MiqVimBroker.rb
@@ -242,7 +227,6 @@ files:
 - lib/VMwareWebService/MiqVimUpdate.rb
 - lib/VMwareWebService/MiqVimVdlMod.rb
 - lib/VMwareWebService/MiqVimVm.rb
-- lib/VMwareWebService/PbmService.rb
 - lib/VMwareWebService/VimConstants.rb
 - lib/VMwareWebService/VimMappingRegistry.rb
 - lib/VMwareWebService/VimPropMaps.rb
@@ -4461,7 +4445,7 @@ homepage: https://github.com/ManageIQ/vmware_web_service
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -4476,8 +4460,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.2.0.rc.2
+signing_key:
 specification_version: 4
 summary: A ruby interface to Vmware Web Services SDK
 test_files: []

data/lib/VMwareWebService/MiqPbmInventory.rb

@@ -1,67 +0,0 @@
-require 'VMwareWebService/PbmService'
-
-module MiqPbmInventory
-  def pbm_initialize(vim)
-    begin
-      # SPBM endpoint was introduced in vSphere Management SDK 5.5 and
-      # isn't supported by Hosts (only vCenters)
-      @pbm_svc = PbmService.new(vim) if apiVersion >= '5.5' && isVirtualCenter
-    rescue => err
-      $vim_log.warn("MiqPbmInventory: Failed to connect to SPBM endpoint: #{err}")
-    end
-  end
-
-  def pbmProfilesByUid(_selspec = nil)
-    profiles = {}
-    return profiles if @pbm_svc.nil?
-
-    begin
-      profile_ids = @pbm_svc.queryProfile
-      @pbm_svc.retrieveContent(profile_ids).to_a.each do |pbm_profile|
-        uid = pbm_profile.profileId.uniqueId
-
-        profiles[uid] = pbm_profile
-      end
-    rescue => err
-      $vim_log.warn("MiqPbmInventory: pbmProfilesByUid: #{err}")
-    end
-
-    profiles
-  end
-
-  def pbmQueryAssociatedEntity(profile_ids)
-    assoc_entities = {}
-    return assoc_entities if @pbm_svc.nil?
-
-    begin
-      profile_ids.each do |profile_id|
-        # If a string was passed in create a PbmProfileId object
-        profile_id = RbVmomi::PBM::PbmProfileId(:uniqueId => profile_id) if profile_id.kind_of?(String)
-
-        assoc_entities[profile_id.uniqueId] = @pbm_svc.queryAssociatedEntity(profile_id)
-      end
-    rescue => err
-      $vim_log.warn("MiqPbmInventory: pbmQueryAssociatedEntity: #{err}")
-    end
-
-    assoc_entities
-  end
-
-  def pbmQueryMatchingHub(profile_ids)
-    hubs = {}
-    return hubs if @pbm_svc.nil?
-
-    begin
-      profile_ids.each do |profile_id|
-        # If a string was passed in create a PbmProfileId object
-        profile_id = RbVmomi::PBM::PbmProfileId(:uniqueId => profile_id) if profile_id.kind_of?(String)
-
-        hubs[profile_id.uniqueId] = @pbm_svc.queryMatchingHub(profile_id)
-      end
-    rescue => err
-      $vim_log.warn("MiqPbmInventory: pbmQueryMatchingHub: #{err}")
-    end
-
-    hubs
-  end
-end

data/lib/VMwareWebService/PbmService.rb

@@ -1,36 +0,0 @@
-require 'rbvmomi'
-require 'rbvmomi/pbm'
-
-PbmVimConnection = Struct.new(:host, :cookie)
-
-class PbmService
-  def initialize(vim)
-    # RbVmomi::PBM#connect expects a RbVmomi::VIM object, use a struct
-    # to fake it out into using our vim Handsoap connection
-    pbm_vim_conn = PbmVimConnection.new(vim.server.dup, vim.session_cookie.dup)
-
-    @pbm = RbVmomi::PBM.connect(pbm_vim_conn, :insecure => true)
-    @sic = @pbm.serviceContent
-  end
-
-  def queryAssociatedEntity(profileId)
-    @sic.profileManager.PbmQueryAssociatedEntity(:profile => profileId)
-  end
-
-  def queryMatchingHub(profileId, hubsToSearch = nil)
-    @sic.placementSolver.PbmQueryMatchingHub(
-      :profile      => profileId,
-      :hubsToSearch => hubsToSearch
-    )
-  end
-
-  def queryProfile
-    @sic.profileManager.PbmQueryProfile(
-      :resourceType => RbVmomi::PBM::PbmProfileResourceType(:resourceType => "STORAGE")
-    )
-  end
-
-  def retrieveContent(profileIds)
-    @sic.profileManager.PbmRetrieveContent(:profileIds => profileIds)
-  end
-end