vmware_web_service 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7081f07a222fe10b6d6d3eb328c02f912f38de4f735f09e8b55c85ff7aae825d
-  data.tar.gz: d0496ba2b93e3ead6f52c197e093108642196675d90436807c6b1ce929caecaa
+  metadata.gz: c405553b39bdd48a0d1addb0ab9851436a201adc836a23829177e68cab8169c3
+  data.tar.gz: c70a6f7137570372d6b6b4e05fd0c8723fe2e3ab0980d8651a03a874e9b9c2cf
 SHA512:
-  metadata.gz: b013e0a843eff0f90eea71db7dc9e42bbe0ef67eead7b4cc4a7caa986e52c11f989725dac3d57ae756b6de480863817b917382e173aef46a2b8a8a8c710efeee
-  data.tar.gz: 7940e3c8186e9e16fe460c2a8f54e5e662e32db1cbb9ca2012db0a65a22c33ec9894b1d24ba794407fd71c3658697b221d01a523608b654c4329051590bca3d6
+  metadata.gz: b733b1e46bc3a003a111b33bd03b8e57be539f632f15eae1cb86f293c3ff4df065610db71c8498e46f9b33ca6f2e73b7676aae4a22921964e0f88feec7038b63
+  data.tar.gz: 86cdf766a022fd1bfe677e5b9c353b2df629fdccd7ee2d443c518393c7a5e66863e248cf1fcd91536d17b41417e2df0da519c5b20db43556792ef82a3dfe1c91

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/MiqVimEventMonitor.rb

@@ -120,7 +120,7 @@ class MiqVimEventMonitor < MiqVimInventory
         next unless (vmObj = virtualMachinesByMor_locked[eventVmObj['vm']])
 
         eventVmObj['path'] = vmObj['summary']['config']['vmPathName']
-        eventVmObj['uuid'] = vmObj['summary']['config']['uuid']
+        eventVmObj['uuid'] = vmObj['summary']['config']['uuid'].presence
 
         removeVirtualMachine(eventVmObj['vm']) if event['eventType'] == 'VmRemovedEvent'
       end

data/lib/VMwareWebService/MiqVimInventory.rb

@@ -1138,18 +1138,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/VimTypes.rb

@@ -27,10 +27,11 @@ end
 class VimHash < Hash
   include VimType
 
-  undef_method(:id)   if method_defined?(:id)
-  undef_method(:type) if method_defined?(:type)
-  undef_method(:size) if method_defined?(:size)
-  undef_method(:key)  if method_defined?(:key)
+  undef_method(:id)     if method_defined?(:id)
+  undef_method(:type)   if method_defined?(:type)
+  undef_method(:size)   if method_defined?(:size)
+  undef_method(:key)    if method_defined?(:key)
+  undef_method(:filter) if method_defined?(:filter)
 
   def initialize(xsiType = nil, vimType = nil)
     self.xsiType = xsiType

data/lib/VMwareWebService/version.rb

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

data/lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardOpaqueNetworkBackingInfo.yml

@@ -0,0 +1,11 @@
+# THIS FILE WAS AUTOGENERATED. DO NOT MODIFY.
+---
+dynamicType:
+  :type: :SOAP::SOAPString
+dynamicProperty:
+  :type: :DynamicProperty
+  :isArray: true
+opaqueNetworkId:
+  :type: :SOAP::SOAPString
+opaqueNetworkType:
+  :type: :SOAP::SOAPString

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -76,16 +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::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -4062,6 +4068,7 @@ files:
 - lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardNetworkBackingOption.yml
 - lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardNotSupported.yml
 - lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardNotSupportedFault.yml
+- lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardOpaqueNetworkBackingInfo.yml
 - lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardOption.yml
 - lib/VMwareWebService/wsdl41/methods/VirtualFloppy.yml
 - lib/VMwareWebService/wsdl41/methods/VirtualFloppyDeviceBackingInfo.yml
@@ -4469,7 +4476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: A ruby interface to Vmware Web Services SDK