rbvmomi2 3.0.0 → 3.0.1

data/lib/rbvmomi/version.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 # Copyright (c) 2016-2020 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
 module RbVmomi
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/lib/rbvmomi/vim/ComputeResource.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -12,37 +13,38 @@ class RbVmomi::VIM::ComputeResource
   # @return [MB]  usedMem:  Used RAM.
   def stats
     filterSpec = RbVmomi::VIM.PropertyFilterSpec(
-      :objectSet => [{
-        :obj => self,
-        :selectSet => [
+      objectSet: [{
+        obj: self,
+        selectSet: [
           RbVmomi::VIM.TraversalSpec(
-            :name => 'tsHosts',
-            :type => 'ComputeResource',
-            :path => 'host',
-            :skip => false
+            name: 'tsHosts',
+            type: 'ComputeResource',
+            path: 'host',
+            skip: false
           )
         ]
       }],
-      :propSet => [{
-        :pathSet => %w(name overallStatus summary.hardware.cpuMhz
+      propSet: [{
+        pathSet: %w(name overallStatus summary.hardware.cpuMhz
                     summary.hardware.numCpuCores summary.hardware.memorySize
                     summary.quickStats.overallCpuUsage
                     summary.quickStats.overallMemoryUsage),
-        :type => 'HostSystem'
+        type: 'HostSystem'
       }]
     )
 
-    result = _connection.propertyCollector.RetrieveProperties(:specSet => [filterSpec])
+    result = _connection.propertyCollector.RetrieveProperties(specSet: [filterSpec])
 
     stats = {
-      :totalCPU => 0,
-      :totalMem => 0,
-      :usedCPU => 0,
-      :usedMem => 0,
+      totalCPU: 0,
+      totalMem: 0,
+      usedCPU: 0,
+      usedMem: 0,
     }
 
     result.each do |x|
       next if x['overallStatus'] == 'red'
+
       stats[:totalCPU] += x['summary.hardware.cpuMhz'] * x['summary.hardware.numCpuCores']
       stats[:totalMem] += x['summary.hardware.memorySize'] / (1024*1024)
       stats[:usedCPU] += x['summary.quickStats.overallCpuUsage'] || 0

data/lib/rbvmomi/vim/Datacenter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 

data/lib/rbvmomi/vim/Datastore.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -5,7 +6,7 @@
 #       then set the +CURL+ environment variable to point to it.
 # @todo Use an HTTP library instead of executing +curl+.
 class RbVmomi::VIM::Datastore
-  CURLBIN = ENV['CURL'] || "curl" #@private
+  CURLBIN = ENV['CURL'] || 'curl' #@private
 
   # Check whether a file exists on this datastore.
   # @param path [String] Path on the datastore.
@@ -19,7 +20,7 @@ class RbVmomi::VIM::Datastore
     when Net::HTTPNotFound
       false
     else
-      fail resp.inspect
+      raise resp.inspect
     end
   end
 
@@ -29,13 +30,13 @@ class RbVmomi::VIM::Datastore
   # @return [void]
   def download remote_path, local_path
     url = "http#{_connection.http.use_ssl? ? 's' : ''}://#{_connection.http.address}:#{_connection.http.port}#{mkuripath(remote_path)}"
-    pid = spawn CURLBIN, "-k", '--noproxy', '*', '-f',
-                "-o", local_path,
-                "-b", _connection.cookie,
+    pid = spawn CURLBIN, '-k', '--noproxy', '*', '-f',
+                '-o', local_path,
+                '-b', _connection.cookie,
                 url,
-                :out => '/dev/null'
+                out: '/dev/null'
     Process.waitpid(pid, 0)
-    fail "download failed" unless $?.success?
+    raise 'download failed' unless $?.success?
   end
 
   # Upload a file to this datastore.
@@ -44,29 +45,31 @@ class RbVmomi::VIM::Datastore
   # @return [void]
   def upload remote_path, local_path
     url = "http#{_connection.http.use_ssl? ? 's' : ''}://#{_connection.http.address}:#{_connection.http.port}#{mkuripath(remote_path)}"
-    pid = spawn CURLBIN, "-k", '--noproxy', '*', '-f',
-                "-T", local_path,
-                "-b", _connection.cookie,
+    pid = spawn CURLBIN, '-k', '--noproxy', '*', '-f',
+                '-T', local_path,
+                '-b', _connection.cookie,
                 url,
-                :out => '/dev/null'
+                out: '/dev/null'
     Process.waitpid(pid, 0)
-    fail "upload failed" unless $?.success?
+    raise 'upload failed' unless $?.success?
   end
 
   private
 
   def datacenter
     return @datacenter if @datacenter
+
     x = parent
     while not x.is_a? RbVmomi::VIM::Datacenter
       x = x.parent
     end
-    fail unless x.is_a? RbVmomi::VIM::Datacenter
+    raise unless x.is_a? RbVmomi::VIM::Datacenter
+
     @datacenter = x
   end
 
   def mkuripath path
-    datacenter_path_str = datacenter.path[1..-1].map{|elem| elem[1]}.join('/')
-    "/folder/#{URI.escape path}?dcPath=#{URI.escape datacenter_path_str }&dsName=#{URI.escape name}"
+    datacenter_path_str = datacenter.path[1..-1].map{ |elem| elem[1] }.join('/')
+    "/folder/#{URI.encode_www_form_component path}?dcPath=#{URI.encode_www_form_component datacenter_path_str }&dsName=#{URI.encode_www_form_component name}"
   end
 end

data/lib/rbvmomi/vim/DynamicTypeMgrAllTypeInfo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -34,14 +35,14 @@ class RbVmomi::VIM::DynamicTypeMgrAllTypeInfo
     end
 
     types = {}
-    self.managedTypeInfo.each{|x| types.merge!(x.toRbvmomiTypeHash) }
-    self.dataTypeInfo.each{|x| types.merge!(x.toRbvmomiTypeHash) }
+    self.managedTypeInfo.each{ |x| types.merge!(x.toRbvmomiTypeHash) }
+    self.dataTypeInfo.each{ |x| types.merge!(x.toRbvmomiTypeHash) }
 
-    types.each do |k,t|
+    types.each do |k, t|
       id2name[t['type-id']] = k
     end
 
-    types = Hash[types.map do |k,t|
+    types = Hash[types.map do |k, t|
       case t['kind']
       when 'data'
         t['wsdl_base'] = t['base-type-id'] ? id2name[t['base-type-id']] : 'DataObject'
@@ -57,7 +58,7 @@ class RbVmomi::VIM::DynamicTypeMgrAllTypeInfo
           x['wsdl_type'] = id2name[x['type-id-ref']]
           x.delete 'type-id-ref'
         end
-        t['methods'].each do |mName,x|
+        t['methods'].each do |mName, x|
           if y = x['result']
             y['wsdl_type'] = id2name[y['type-id-ref']]
             #y.delete 'type-id-ref'
@@ -68,7 +69,7 @@ class RbVmomi::VIM::DynamicTypeMgrAllTypeInfo
           end
         end
       when 'enum'
-      else fail
+      else raise
       end
       [k, t]
     end]

data/lib/rbvmomi/vim/DynamicTypeMgrDataTypeInfo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -11,9 +12,9 @@ class RbVmomi::VIM::DynamicTypeMgrDataTypeInfo
         'props' => self.property.map do |prop|
           {
             'name' => prop.name,
-            'type-id-ref' => prop.type.gsub("[]", ""),
+            'type-id-ref' => prop.type.gsub('[]', ''),
             'is-array' => (prop.type =~ /\[\]$/) ? true : false,
-            'is-optional' => prop.annotation.find{|a| a.name == "optional"} ? true : false,
+            'is-optional' => prop.annotation.find{ |a| a.name == 'optional' } ? true : false,
             'version-id-ref' => prop.version,
           }
         end,

data/lib/rbvmomi/vim/DynamicTypeMgrManagedTypeInfo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -11,9 +12,9 @@ class RbVmomi::VIM::DynamicTypeMgrManagedTypeInfo
         'props' => self.property.map do |prop|
           {
             'name' => prop.name,
-            'type-id-ref' => prop.type.gsub("[]", ""),
+            'type-id-ref' => prop.type.gsub('[]', ''),
             'is-array' => (prop.type =~ /\[\]$/) ? true : false,
-            'is-optional' => prop.annotation.find{|a| a.name == "optional"} ? true : false,
+            'is-optional' => prop.annotation.find{ |a| a.name == 'optional' } ? true : false,
             'version-id-ref' => prop.version,
           }
         end,
@@ -26,9 +27,9 @@ class RbVmomi::VIM::DynamicTypeMgrManagedTypeInfo
                'params' => method.paramTypeInfo.map do |param|
                  {
                    'name' => param.name,
-                   'type-id-ref' => param.type.gsub("[]", ""),
+                   'type-id-ref' => param.type.gsub('[]', ''),
                    'is-array' => (param.type =~ /\[\]$/) ? true : false,
-                   'is-optional' => param.annotation.find{|a| a.name == "optional"} ? true : false,
+                   'is-optional' => param.annotation.find{ |a| a.name == 'optional' } ? true : false,
                    'version-id-ref' => param.version,
                  }
                end,
@@ -38,9 +39,9 @@ class RbVmomi::VIM::DynamicTypeMgrManagedTypeInfo
                else
                  {
                    'name' => result.name,
-                   'type-id-ref' => result.type.gsub("[]", ""),
+                   'type-id-ref' => result.type.gsub('[]', ''),
                    'is-array' => (result.type =~ /\[\]$/) ? true : false,
-                   'is-optional' => result.annotation.find{|a| a.name == "optional"} ? true : false,
+                   'is-optional' => result.annotation.find{ |a| a.name == 'optional' } ? true : false,
                    'version-id-ref' => result.version,
                  }
                end)

data/lib/rbvmomi/vim/Folder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
 # SPDX-License-Identifier: MIT
 
@@ -7,7 +8,7 @@ class RbVmomi::VIM::Folder
   # @param type [Class] Return nil unless the found entity <tt>is_a? type</tt>.
   # @return [VIM::ManagedEntity]
   def find name, type=Object
-    x = _connection.searchIndex.FindChild(:entity => self, :name => name)
+    x = _connection.searchIndex.FindChild(entity: self, name: name)
     x if x.is_a? type
   end
 
@@ -18,8 +19,8 @@ class RbVmomi::VIM::Folder
   # @return [VIM::ManagedEntity]
   def findByDnsName name, type=RbVmomi::VIM::VirtualMachine, dc=nil
     propSpecs = {
-      :entity => self, :dnsName => name,
-      :vmSearch => type == RbVmomi::VIM::VirtualMachine
+      entity: self, dnsName: name,
+      vmSearch: type == RbVmomi::VIM::VirtualMachine
     }
     propSpecs[:datacenter] = dc if dc
     x = _connection.searchIndex.FindByDnsName(propSpecs)
@@ -33,8 +34,8 @@ class RbVmomi::VIM::Folder
   # @return [VIM::ManagedEntity]
   def findByIp ip, type=RbVmomi::VIM::VirtualMachine, dc=nil
     propSpecs = {
-      :entity => self, :ip => ip,
-      :vmSearch => type == RbVmomi::VIM::VirtualMachine
+      entity: self, ip: ip,
+      vmSearch: type == RbVmomi::VIM::VirtualMachine
     }
     propSpecs[:datacenter] = dc if dc
     x = _connection.searchIndex.FindByIp(propSpecs)
@@ -50,10 +51,10 @@ class RbVmomi::VIM::Folder
   # @return [VIM::ManagedEntity]
   def findByUuid(uuid, type = RbVmomi::VIM::VirtualMachine, dc = nil, instance_uuid = false)
     prop_specs = {
-      :entity       => self,
-      :instanceUuid => instance_uuid,
-      :uuid         => uuid,
-      :vmSearch     => type == RbVmomi::VIM::VirtualMachine
+      entity: self,
+      instanceUuid: instance_uuid,
+      uuid: uuid,
+      vmSearch: type == RbVmomi::VIM::VirtualMachine
     }
     prop_specs[:datacenter] = dc if dc
     x = _connection.searchIndex.FindByUuid(prop_specs)
@@ -65,7 +66,7 @@ class RbVmomi::VIM::Folder
   # @return [VIM::ManagedEntity]
   def findByInventoryPath path
     propSpecs = {
-      :entity => self, :inventoryPath => path
+      entity: self, inventoryPath: path
     }
     _connection.searchIndex.FindByInventoryPath(propSpecs)
   end
@@ -88,21 +89,22 @@ class RbVmomi::VIM::Folder
     elsif path.is_a? Enumerable
       es = path
     else
-      fail "unexpected path class #{path.class}"
+      raise "unexpected path class #{path.class}"
     end
     return self if es.empty?
+
     final = es.pop
 
-    p = es.inject(self) do |f,e|
-      f.find(e, RbVmomi::VIM::Folder) || (create && f.CreateFolder(:name => e)) || return
+    p = es.inject(self) do |f, e|
+      f.find(e, RbVmomi::VIM::Folder) || (create && f.CreateFolder(name: e)) || return
     end
 
     if x = p.find(final, type)
       x
     elsif create and type == RbVmomi::VIM::Folder
-      p.CreateFolder(:name => final)
+      p.CreateFolder(name: final)
     elsif create and type == RbVmomi::VIM::Datacenter
-      p.CreateDatacenter(:name => final)
+      p.CreateDatacenter(name: final)
     else
       nil
     end
@@ -123,48 +125,49 @@ class RbVmomi::VIM::Folder
   #
   # @return [Hash] Hash of ManagedObjects to properties.
   def inventory_flat propSpecs={}
-    propSet = [{ :type => 'Folder', :pathSet => ['name', 'parent', 'childEntity'] }]
-    propSpecs.each do |k,v|
+    propSet = [{ type: 'Folder', pathSet: ['name', 'parent', 'childEntity'] }]
+    propSpecs.each do |k, v|
       case k
       when Class
-        fail "key must be a subclass of ManagedEntity" unless k < RbVmomi::VIM::ManagedEntity
+        raise 'key must be a subclass of ManagedEntity' unless k < RbVmomi::VIM::ManagedEntity
+
         k = k.wsdl_name
       when Symbol, String
         k = k.to_s
       else
-        fail "invalid key"
+        raise 'invalid key'
       end
 
-      h = { :type => k }
+      h = { type: k }
       if v == :all
         h[:all] = true
       elsif v.is_a? Array
         h[:pathSet] = v + %w(parent)
       else
-        fail "value must be an array of property paths or :all"
+        raise 'value must be an array of property paths or :all'
       end
       propSet << h
     end
 
     filterSpec = RbVmomi::VIM.PropertyFilterSpec(
-      :objectSet => [
-        :obj => self,
-        :selectSet => [
+      objectSet: [
+        obj: self,
+        selectSet: [
           RbVmomi::VIM.TraversalSpec(
-            :name => 'tsFolder',
-            :type => 'Folder',
-            :path => 'childEntity',
-            :skip => false,
-            :selectSet => [
-              RbVmomi::VIM.SelectionSpec(:name => 'tsFolder')
+            name: 'tsFolder',
+            type: 'Folder',
+            path: 'childEntity',
+            skip: false,
+            selectSet: [
+              RbVmomi::VIM.SelectionSpec(name: 'tsFolder')
             ]
           )
         ]
       ],
-      :propSet => propSet
+      propSet: propSet
     )
 
-    result = _connection.propertyCollector.RetrieveProperties(:specSet => [filterSpec])
+    result = _connection.propertyCollector.RetrieveProperties(specSet: [filterSpec])
     {}.tap do |h|
       result.each { |r| h[r.obj] = r }
     end
@@ -203,8 +206,9 @@ class RbVmomi::VIM::Folder
   def inventory propSpecs={}
     inv = inventory_flat propSpecs
     tree = { self => {} }
-    inv.each do |obj,x|
+    inv.each do |obj, x|
       next if obj == self
+
       h = Hash[x.propSet.map { |y| [y.name, y.val] }]
       tree[h['parent']][h['name']] = [obj, h]
       tree[obj] = {} if obj.is_a? RbVmomi::VIM::Folder