vmware_web_service 1.0.5 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41d35593f9823b06bc56a23afab180ed7aafd1c3d96f28789328d0b22ba0cbc9
-  data.tar.gz: 3a019d2b5c772c7a3421a65d4004fac15730c7e05c951dca74ab078daa2646e6
+  metadata.gz: 77fcee14b8adf4ff299e6f703078e3d2bbf62aba13be17e4a6253a010cae18f1
+  data.tar.gz: 86972a49c90161ae859753f7470e4e415b336e1178a554036aac0f24362588f2
 SHA512:
-  metadata.gz: 1fc01631af5d5201a5949fe905ef496e8de89d36483e550b6cc5f961ac93c68be684366c03484e6289417e26a2b40d2b1ff2e7c2ad194ab5d3a338983bfa5371
-  data.tar.gz: edab43df0d56713eb7b465cf92606963790eb0d58b30b73966c1dbc6bb10015816e0fc247c49ef9544971dc1cbcf62b5bdeea9977a06596240b9373a6db6c361
+  metadata.gz: eb2c3b6c7e80fed7f4b5d2cc63d4556103ffd0a6b57442896b0edc262601de38e0ab394bf2d75b1a2bc7e67788f766d4864668d47ad1c1d3001bcd0395db135d
+  data.tar.gz: def519ee4ed00ad05cb3590f7decddbf90a5e8b408b3df34223685a27cb3387675120a210ae5c1e58135a6c1609bb022ad56428a816ef81df6f1190437a91962

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 = specs.dup.to_miq_a
+    specs = Array.wrap(specs.dup)
     specs.each { |s| s['spec'] = getCustomizationSpec(s['name'].to_s).spec }
     specs
   end

data/lib/VMwareWebService/MiqVimDataStore.rb

@@ -290,8 +290,8 @@ class MiqVimDataStore
     if block_given?
       open(fileUrl, options) { |ret| yield(ret) }
     else
-      meta = {}; data = nil
-      open(fileUrl, options) { |ret| data = ret.read; meta = ret.meta }
+      data = nil
+      open(fileUrl, options) { |ret| data = ret.read }
       return data
     end
   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,
@@ -1138,18 +1143,18 @@ class MiqVimInventory < MiqVimClientBase
 
     $vim_log.info "MiqVimInventory.datacenters_locked: loading Datacenter cache for #{@connId}"
     begin
-    @cacheLock.sync_lock(:EX) if (unlock = @cacheLock.sync_shared?)
+      @cacheLock.sync_lock(:EX) if (unlock = @cacheLock.sync_shared?)
 
-    ra = getMoPropMulti(inventoryHash_locked['Datacenter'], @propMap[:Datacenter][:props])
+      ra = getMoPropMulti(inventoryHash_locked['Datacenter'], @propMap[:Datacenter][:props])
 
-    @datacenters      = {}
-    @datacentersByMor = {}
-    ra.each do |dcObj|
-      addObjHash(:Datacenter, dcObj)
+      @datacenters      = {}
+      @datacentersByMor = {}
+      ra.each do |dcObj|
+        addObjHash(:Datacenter, dcObj)
+      end
+    ensure
+      @cacheLock.sync_unlock if unlock
     end
-  ensure
-    @cacheLock.sync_unlock if unlock
-  end
     $vim_log.info "MiqVimInventory.datacenters_locked: loaded Datacenter cache for #{@connId}"
 
     @datacenters

data/lib/VMwareWebService/MiqVimUpdate.rb

@@ -112,7 +112,7 @@ module MiqVimUpdate
         version = updates_version
         sleep @updateDelay if @updateDelay
       end # while @monitor
-    rescue SignalException => err
+    rescue SignalException
       # Ignore signals, except TERM
     rescue => herr
       if herr.respond_to?(:reason) && herr.reason == 'The task was canceled by a user.'

data/lib/VMwareWebService/MiqVimVm.rb

@@ -87,14 +87,6 @@ class MiqVimVm
     # @invObj.releaseObj(self)
   end
 
-  def vmMor
-    (@vmMor)
-  end
-
-  def vmh
-    (@vmh)
-  end
-
   #######################
   # Power state methods.
   #######################
@@ -317,24 +309,24 @@ class MiqVimVm
     return(@snapshotInfo) if @snapshotInfo && !refresh
 
     begin
-        @cacheLock.sync_lock(:EX) if (unlock = @cacheLock.sync_shared?)
-
-        unless (ssp = @invObj.getMoProp_local(@vmMor, "snapshot"))
-          @snapshotInfo = nil
-          return(nil)
-        end
+      @cacheLock.sync_lock(:EX) if (unlock = @cacheLock.sync_shared?)
 
-        ssObj = ssp["snapshot"]
-        ssMorHash = {}
-        rsl = ssObj['rootSnapshotList']
-        rsl = [rsl] unless rsl.kind_of?(Array)
-        rsl.each { |rs| @invObj.snapshotFixup(rs, ssMorHash) }
-        ssObj['ssMorHash'] = ssMorHash
-        @snapshotInfo = ssObj
-      ensure
-        @cacheLock.sync_unlock if unlock
+      unless (ssp = @invObj.getMoProp_local(@vmMor, "snapshot"))
+        @snapshotInfo = nil
+        return(nil)
       end
 
+      ssObj = ssp["snapshot"]
+      ssMorHash = {}
+      rsl = ssObj['rootSnapshotList']
+      rsl = [rsl] unless rsl.kind_of?(Array)
+      rsl.each { |rs| @invObj.snapshotFixup(rs, ssMorHash) }
+      ssObj['ssMorHash'] = ssMorHash
+      @snapshotInfo = ssObj
+    ensure
+      @cacheLock.sync_unlock if unlock
+    end
+
     (@snapshotInfo)
   end # def snapshotInfo_locked
 
@@ -800,11 +792,11 @@ class MiqVimVm
               bck.writeThrough  = "false"
               bck.fileName    = backingFile
               begin
-                  dsn = @invObj.path2dsName(@dsPath)
-                  bck.datastore = @invObj.dsName2mo_local(dsn)
-                rescue
-                  bck.datastore = nil
-                end
+                dsn = @invObj.path2dsName(@dsPath)
+                bck.datastore = @invObj.dsName2mo_local(dsn)
+              rescue
+                bck.datastore = nil
+              end
             end
           end
         end
@@ -856,11 +848,11 @@ class MiqVimVm
               bck.writeThrough  = "false"
               bck.fileName    = backingFile
               begin
-                  dsn = @invObj.path2dsName(@dsPath)
-                  bck.datastore = @invObj.dsName2mo(dsn)
-                rescue
-                  bck.datastore = nil
-                end
+                dsn = @invObj.path2dsName(@dsPath)
+                bck.datastore = @invObj.dsName2mo(dsn)
+              rescue
+                bck.datastore = nil
+              end
             end unless deleteBacking
           end
         end
@@ -917,13 +909,14 @@ 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
-      next if scsi_controller["device"].to_miq_a.count >= MAX_SCSI_DEVICES
+      device = Array.wrap(scsi_controller["device"])
+      next if device.count >= MAX_SCSI_DEVICES
 
       # We've found the lowest scsi controller with an available unit
       controller_key = scsi_controller["key"]
 
       # Get a list of disks on this controller
-      disks = devices.select { |dev| scsi_controller["device"].to_miq_a.include?(dev["key"]) }
+      disks = devices.select { |dev| device.include?(dev["key"]) }
 
       # Get a list of all populated units on the controller
       populated_units = disks.collect { |disk| disk["unitNumber"].to_i }
@@ -1037,24 +1030,24 @@ class MiqVimVm
     end
 
     begin
-        @cacheLock.sync_lock(:EX) if (unlock = @cacheLock.sync_shared?)
-
-        alarmManager = @sic.alarmManager
-        #
-        # Add disabled if VM is running.
-        #
-        if poweredOff?
-          aSpec = @miqAlarmSpecEnabled
-        else
-          aSpec = @miqAlarmSpecDisabled
-        end
-        $vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).addMiqAlarm_locked: calling createAlarm" if $vim_log
-        alarmMor = @invObj.createAlarm(alarmManager, @vmMor, aSpec)
-        $vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).addMiqAlarm_locked: returned from createAlarm" if $vim_log
-        @miqAlarmMor = alarmMor
-      ensure
-        @cacheLock.sync_unlock if unlock
+      @cacheLock.sync_lock(:EX) if (unlock = @cacheLock.sync_shared?)
+
+      alarmManager = @sic.alarmManager
+      #
+      # Add disabled if VM is running.
+      #
+      if poweredOff?
+        aSpec = @miqAlarmSpecEnabled
+      else
+        aSpec = @miqAlarmSpecDisabled
       end
+      $vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).addMiqAlarm_locked: calling createAlarm" if $vim_log
+      alarmMor = @invObj.createAlarm(alarmManager, @vmMor, aSpec)
+      $vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).addMiqAlarm_locked: returned from createAlarm" if $vim_log
+      @miqAlarmMor = alarmMor
+    ensure
+      @cacheLock.sync_unlock if unlock
+    end
 
     (alarmMor)
   end # def addMiqAlarm_locked

data/lib/VMwareWebService/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '1.0.5'.freeze
+  VERSION = '2.0.2'.freeze
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.2
 platform: ruby
 authors:
 - ManageIQ Developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-09-24 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
@@ -76,30 +76,22 @@ dependencies:
   name: more_core_extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-- !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'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -199,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: []
@@ -215,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
@@ -236,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
@@ -4455,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
@@ -4471,7 +4461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.3
-signing_key: 
+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