vmware_web_service 1.0.9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9387d2cd8bafbb20342e26e516df855fbc85d2a995d248fc092ad61a82b3864e
-  data.tar.gz: 7874514afcb8cdd2ef96b95bd6b06a7afdb8b2175465219ec5b88d08adfee024
+  metadata.gz: df40424f3d517dd28e1068afa27577ae38b41eefb926476c43116df2422fe841
+  data.tar.gz: b1ba415b69bb546c830354ad42fa39cccdeda19104d23672d82909654ea8938f
 SHA512:
-  metadata.gz: 5387c14724142857b488e24bf49a8ac2cc79e38d85bed837441bd42b468e21cf029eed99b0779eab260440f8ee370972b61b9c23885d04a6dfe1c35f40bc7e97
-  data.tar.gz: 9f03fd556dcb003f139950d518ea08f21666f56ddd15acbd2a6cecc3571880ee48de5cbb941f4b7e047abcf98d77fec477a7846eb57be78b585ab36c3f3f4499
+  metadata.gz: 6716525e09aef414ae8a4cbe341fbd0a10da794e61bc8455e29f1c7df4a1952949151f15be9aec381fab1d355564e4106626f49f9ad1fcb7efd71e3f66afc96b
+  data.tar.gz: 7c83374173415c650fc5cdd9629d04e298d2a8367191e564e11c5711b82165e23816b86d6c6e2e8e7eb743f99aeba279c0b941c12bac35faf3ccb962ed5daada

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,14 +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 = nil, preLoad = nil, debugUpdates = false, notifyMethod = nil, maxWait = 60, maxObjects = 250)
+  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 = self.class.monitor_updates if monitor_updates.nil?
-    preLoad         = self.class.pre_load        if preLoad.nil?
-
     @monitor_updates    = monitor_updates
     @updateMonitorReady = false
     @error              = nil
@@ -51,25 +46,6 @@ 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/MiqVimInventory.rb

@@ -366,12 +366,7 @@ class MiqVimInventory < MiqVimClientBase
     #
     # Hash snapshot info by create time.
     #
-    # 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
+    ssMorHash[ssObj['createTime']] = ssObj
 
     #
     # Ensure childSnapshotList is always present and always an array,

data/lib/VMwareWebService/version.rb

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

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 2.0.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+        version: 5.2.4
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
+        version: 5.2.4
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 5.2.4.3
 - !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.2.4
+rubygems_version: 3.1.3
 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