vmware_web_service 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41d35593f9823b06bc56a23afab180ed7aafd1c3d96f28789328d0b22ba0cbc9
-  data.tar.gz: 3a019d2b5c772c7a3421a65d4004fac15730c7e05c951dca74ab078daa2646e6
+  metadata.gz: d0b00e667598e644b035f2c3241e0c77ac2238044060045255a21701346320b6
+  data.tar.gz: 9d6b0cc3dbb8c4cb4cd2f5f54d48acb1b23d734b46e1ebce79e9945a954c9e35
 SHA512:
-  metadata.gz: 1fc01631af5d5201a5949fe905ef496e8de89d36483e550b6cc5f961ac93c68be684366c03484e6289417e26a2b40d2b1ff2e7c2ad194ab5d3a338983bfa5371
-  data.tar.gz: edab43df0d56713eb7b465cf92606963790eb0d58b30b73966c1dbc6bb10015816e0fc247c49ef9544971dc1cbcf62b5bdeea9977a06596240b9373a6db6c361
+  metadata.gz: a62e1199199d1670c84485f0d304874838da6c7a292dfd17526c3a66e02e5ee746f0f2bc2db1b8caef326c211840b8d455d2149370cb170c0179778ac5705a35
+  data.tar.gz: 36f481706737461eb2bd5125e5aeb7959517c947d54d01ecc5837fcacfc87a18cea4bca10a35c3027ecf40d520ffe0db312acb6fd4a31dd2e7849c669760b879

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/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
@@ -1037,24 +1029,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 = '1.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-07-14 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