vmware_web_service 1.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b73de1ee5f2d243a464a790d35752220e182e6f0fbe888707a35b2b5183c44f3
-  data.tar.gz: 64f8c7d2b6643806068b2c4042fed7390f5905f59536e160f5633672b3eba215
+  metadata.gz: 4d5a7058d7db794775f6a27766ae62dc2e17b6334d3d69c3dce8dc73df888906
+  data.tar.gz: 2b1fc2a2d07776d19c995cdc56e271d9bf14303534960c5f60a2d9b3f85b7429
 SHA512:
-  metadata.gz: 16a8effd7ef4615e017c543fc662f9a7eda22a74089f6a02518bc7a47687102d13e6fe3955c8b6b82d8b000c4db48ca0b176231f0d0e825f19be922370eb85cd
-  data.tar.gz: 52bf388bc55afb1343e9d276812ee20b99c2d5b9e4250e62550b68ab73e150367ee3c43a3a46382a2ee65bf79577f8e52f4f2b94b89ca047c9c0759ad1d76594
+  metadata.gz: f6a4bfefe875d792e2020d087cb913f2a418515ebb5a05a8f60814781227405b58985bd33e091d856ac28777658675aa8507a57b4975ff87d48a3966b0255c9b
+  data.tar.gz: 93543cf64a0c43a43ea82b585418f9e95cb4e4c2f367b3aac5969b753b47a75799520734951aa38731b0a2f2f9dbbf3b69b72cae7c402aadb03313e15e3766eb

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,12 +16,11 @@ require 'VMwareWebService/MiqVimUpdate'
 
 class MiqVim < MiqVimInventory
   include MiqVimVdlConnectionMod
-  include MiqPbmInventory
   include MiqVimUpdate
 
   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)
@@ -32,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
@@ -48,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/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.8'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2021-01-08 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
@@ -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
@@ -4476,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.0.rc.2
 signing_key:
 specification_version: 4
 summary: A ruby interface to Vmware Web Services SDK

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