rbvmomi 1.8.2 → 2.4.1

data/lib/rbvmomi/vim/DynamicTypeMgrAllTypeInfo.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::DynamicTypeMgrAllTypeInfo
   def toRbvmomiTypeHash
     id2name = {}

data/lib/rbvmomi/vim/DynamicTypeMgrDataTypeInfo.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::DynamicTypeMgrDataTypeInfo
   def toRbvmomiTypeHash
     {
@@ -17,4 +20,4 @@ class RbVmomi::VIM::DynamicTypeMgrDataTypeInfo
       }
     }
   end
-end
+end

data/lib/rbvmomi/vim/DynamicTypeMgrManagedTypeInfo.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::DynamicTypeMgrManagedTypeInfo
   def toRbvmomiTypeHash
     {
@@ -29,13 +32,18 @@ class RbVmomi::VIM::DynamicTypeMgrManagedTypeInfo
                    'version-id-ref' => param.version,
                  }
                end,
-               'result' => {
-                 'name' => result.name,
-                 'type-id-ref' => result.type.gsub("[]", ""),
-                 'is-array' => (result.type =~ /\[\]$/) ? true : false,
-                 'is-optional' => result.annotation.find{|a| a.name == "optional"} ? true : false,
-                 'version-id-ref' => result.version,
-               }
+               'result' => (
+               if result.nil? then
+                 nil
+               else
+                 {
+                   'name' => result.name,
+                   'type-id-ref' => result.type.gsub("[]", ""),
+                   'is-array' => (result.type =~ /\[\]$/) ? true : false,
+                   'is-optional' => result.annotation.find{|a| a.name == "optional"} ? true : false,
+                   'version-id-ref' => result.version,
+                 }
+               end)
              }
             ]
           end

data/lib/rbvmomi/vim/Folder.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::Folder
   # Retrieve a child entity
   # @param name [String] Name of the child.
@@ -38,19 +41,23 @@ class RbVmomi::VIM::Folder
     x if x.is_a? type
   end
 
-  # Retrieve a virtual machine or host by BIOS UUID.
-  # @param uuid [String] The UUID to find.
-  # @param type [Class] Return nil unless the found entity <tt>is_a? type</tt>.
-  # @param dc [RbVmomi::VIM::Datacenter] Restricts the query to entities in the given Datacenter.
+  # Finds a virtual machine or host by BIOS or instance UUID
+  #
+  # @param uuid [String] UUID to find
+  # @param type [Class] return nil unless found entity <tt>is_a?(type)</tt>
+  # @param dc [RbVmomi::VIM::Datacenter] restricts query to specified datacenter
+  #
   # @return [VIM::ManagedEntity]
-  def findByUuid uuid, type=RbVmomi::VIM::VirtualMachine, dc=nil
-    propSpecs = {
-      :entity => self, :uuid => uuid, :instanceUuid => false,
-      :vmSearch => type == RbVmomi::VIM::VirtualMachine
+  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
     }
-    propSpecs[:datacenter] = dc if dc
-    x = _connection.searchIndex.FindByUuid(propSpecs)
-    x if x.is_a? type
+    prop_specs[:datacenter] = dc if dc
+    x = _connection.searchIndex.FindByUuid(prop_specs)
+    x if x.is_a?(type)
   end
 
   # Retrieve a managed entity by inventory path.
@@ -60,7 +67,7 @@ class RbVmomi::VIM::Folder
     propSpecs = {
       :entity => self, :inventoryPath => path
     }
-    x = _connection.searchIndex.FindByInventoryPath(propSpecs)
+    _connection.searchIndex.FindByInventoryPath(propSpecs)
   end
 
   # Alias to <tt>traverse path, type, true</tt>

data/lib/rbvmomi/vim/HostSystem.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 module RbVmomi
 
 class VIM::HostSystem
@@ -112,12 +115,12 @@ class VIM::EsxcliNamespace
     conn.type(@type_info.wsdlName).new(conn, @instance)
   end
 
-  def method_missing name, *args
+  def method_missing(name, *args)
     name = name.to_s
     if @namespaces.member? name and args.empty?
       @namespaces[name]
     elsif @commands.member? name
-      @commands[name].call *args
+      @commands[name].call(*args)
     else
       raise NoMethodError
     end

data/lib/rbvmomi/vim/ManagedEntity.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::ManagedEntity
   # Retrieve the ancestors of the entity.
   # @return [Array] Ancestors of this entity, starting with the root.

data/lib/rbvmomi/vim/ManagedObject.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::ManagedObject
   # Wait for updates on an object until a condition becomes true.
   #
@@ -49,7 +52,7 @@ class RbVmomi::VIM::ManagedObject
   # @return [Array] Property values in same order as +pathSet+, or the return
   #                 value from the block if it is given.
   def collect *pathSet
-    h = collect! *pathSet
+    h = collect!(*pathSet)
     a = pathSet.map { |k| h[k.to_s] }
     if block_given?
       yield a

data/lib/rbvmomi/vim/ObjectContent.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::ObjectContent
   # Represent this ObjectContent as a hash.
   # @return [Hash] A hash from property paths to values.

data/lib/rbvmomi/vim/ObjectUpdate.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::ObjectUpdate
   # Represent this ObjectUpdate as a hash.
   # @return [Hash] A hash from property paths to values.

data/lib/rbvmomi/vim/OvfManager.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 # @note +deployOVF+ and requires +curl+. If +curl+ is not in your +PATH+
 #       then set the +CURL+ environment variable to point to it.
 # @todo Use an HTTP library instead of executing +curl+.
@@ -16,6 +19,7 @@ class RbVmomi::VIM::OvfManager
   # @option opts [String]             :diskProvisioning (thin) Disk provisioning mode.
   # @option opts [Hash]               :networkMappings Network mappings.
   # @option opts [Hash]               :propertyMappings Property mappings.
+  # @option opts [String]             :deploymentOption Deployment option key.
   def deployOVF opts
     opts = { :networkMappings => {},
              :propertyMappings => {},
@@ -29,7 +33,7 @@ class RbVmomi::VIM::OvfManager
       :hostSystem => opts[:host],
       :locale => "US",
       :entityName => opts[:vmName],
-      :deploymentOption => "",
+      :deploymentOption => opts[:deploymentOption] || "",
       :networkMapping => opts[:networkMappings].map{|from, to| RbVmomi::VIM::OvfNetworkMapping(:name => from, :network => to)},
       :propertyMapping => opts[:propertyMappings].to_a,
       :diskProvisioning => opts[:diskProvisioning]
@@ -135,7 +139,7 @@ class RbVmomi::VIM::OvfManager
         # to the uploadCmd. It is not clear to me why, but that leads to 
         # trucation of the uploaded disk. Without this option curl can't tell
         # the progress, but who cares
-        system("#{downloadCmd} | #{uploadCmd}", STDOUT => "/dev/null")
+        system("#{downloadCmd} | #{uploadCmd}", :out => "/dev/null")
         
         keepAliveThread.kill
         keepAliveThread.join

data/lib/rbvmomi/vim/PerfCounterInfo.rb

@@ -1,4 +1,6 @@
-# Copyright (c) 2011 VMware, Inc.  All Rights Reserved.
+# Copyright (c) 2012-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/rbvmomi/vim/PerformanceManager.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2012-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 require 'date'
 
 class Time

data/lib/rbvmomi/vim/PropertyCollector.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::PropertyCollector
   def collectMultiple objs, *pathSet
     return {} if objs.empty?

data/lib/rbvmomi/vim/ReflectManagedMethodExecuter.rb

@@ -1,8 +1,11 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 module RbVmomi
 
 class VIM::ReflectManagedMethodExecuter
   def fetch moid, prop
-    result = FetchSoap(:moid => moid, :version => 'urn:vim25/5.0', :prop => prop)
+    result = FetchSoap(:moid => moid, :version => 'urn:vim25/6.5', :prop => prop)
     xml = Nokogiri(result.response)
     _connection.deserializer.deserialize xml.root, nil
   end
@@ -16,7 +19,7 @@ class VIM::ReflectManagedMethodExecuter
         soap_arg.val = xml.target!
       end
     end
-    result = ExecuteSoap(:moid => moid, :version => 'urn:vim25/5.0',
+    result = ExecuteSoap(:moid => moid, :version => 'urn:vim25/6.5',
                          :method => method, :argument => soap_args)
     if result
       _connection.deserializer.deserialize Nokogiri(result.response).root, nil

data/lib/rbvmomi/vim/ResourcePool.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::ResourcePool
   # Retrieve a child ResourcePool.
   # @param name [String] Name of the child.

data/lib/rbvmomi/vim/ServiceInstance.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::ServiceInstance
   # Retrieve a Datacenter.
   # If no path is given the first datacenter will be returned.

data/lib/rbvmomi/vim/Task.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::Task
   # Wait for a task to finish.
   # @return +info.result+ on success.

data/lib/rbvmomi/vim/VirtualMachine.rb

@@ -1,47 +1,48 @@
+# Copyright (c) 2011-2017 VMware, Inc.  All Rights Reserved.
+# SPDX-License-Identifier: MIT
+
 class RbVmomi::VIM::VirtualMachine
   # Retrieve the MAC addresses for all virtual NICs.
   # @return [Hash] Keyed by device label.
   def macs
     Hash[self.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).map { |x| [x.deviceInfo.label, x.macAddress] }]
   end
-  
+
   # Retrieve all virtual disk devices.
   # @return [Array] Array of virtual disk devices.
   def disks
     self.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
   end
-  
-  # Get the IP of the guest, but only if it is not stale 
+
+  # Get the IP of the guest, but only if it is not stale
   # @return [String] Current IP reported (as per VMware Tools) or nil
-  def guest_ip 
+  def guest_ip
     g = self.guest
     if g.ipAddress && (g.toolsStatus == "toolsOk" || g.toolsStatus == "toolsOld")
       g.ipAddress
     else
       nil
     end
-  end  
+  end
 
   # Add a layer of delta disks (redo logs) in front of every disk on the VM.
   # This is similar to taking a snapshot and makes the VM a valid target for
   # creating a linked clone.
   #
-  # Background: The API for linked clones is quite strange. We can't create 
+  # Background: The API for linked clones is quite strange. We can't create
   # a linked straight from any VM. The disks of the VM for which we can create a
   # linked clone need to be read-only and thus VC demands that the VM we
   # are cloning from uses delta-disks. Only then it will allow us to
   # share the base disk.
   def add_delta_disk_layer_on_all_disks
-    devices,  = self.collect 'config.hardware.device'
-    disks = devices.grep(RbVmomi::VIM::VirtualDisk)
     spec = update_spec_add_delta_disk_layer_on_all_disks
     self.ReconfigVM_Task(:spec => spec).wait_for_completion
   end
-  
+
   # Updates a passed in spec to perform the task of adding a delta disk layer
   # on top of all disks. Does the same as add_delta_disk_layer_on_all_disks
-  # but instead of issuing the ReconfigVM_Task, it just constructs the 
-  # spec, so that the caller can batch a couple of updates into one 
+  # but instead of issuing the ReconfigVM_Task, it just constructs the
+  # spec, so that the caller can batch a couple of updates into one
   # ReconfigVM_Task.
   def update_spec_add_delta_disk_layer_on_all_disks spec = {}
     devices,  = self.collect 'config.hardware.device'
@@ -70,5 +71,5 @@ class RbVmomi::VIM::VirtualMachine
       spec[:deviceChange] += device_change
     end
     spec
-  end 
+  end
 end

metadata

@@ -1,111 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: rbvmomi
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 2.4.1
 platform: ruby
 authors:
 - Rich Lane
 - Christian Dickmann
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: optimist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: 
-email: rlane@vmware.com
+email: jrg@vmware.com
 executables:
 - rbvmomish
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .yardopts
 - LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- bin/rbvmomish
-- devel/analyze-vim-declarations.rb
-- devel/analyze-xml.rb
-- devel/benchmark.rb
-- devel/collisions.rb
-- devel/merge-internal-vmodl.rb
-- devel/merge-manual-vmodl.rb
-- examples/annotate.rb
-- examples/cached_ovf_deploy.rb
-- examples/clone_vm.rb
-- examples/create_vm-1.9.rb
-- examples/create_vm.rb
-- examples/extraConfig.rb
-- examples/lease_tool.rb
-- examples/logbundle.rb
-- examples/logtail.rb
-- examples/nfs_datastore.rb
-- examples/power.rb
-- examples/readme-1.rb
-- examples/readme-2.rb
-- examples/run.sh
-- examples/screenshot.rb
-- examples/vdf.rb
-- examples/vm_drs_behavior.rb
+- README.md
+- exe/rbvmomish
 - lib/rbvmomi.rb
 - lib/rbvmomi/basic_types.rb
 - lib/rbvmomi/connection.rb
 - lib/rbvmomi/deserialization.rb
 - lib/rbvmomi/fault.rb
+- lib/rbvmomi/optimist.rb
 - lib/rbvmomi/pbm.rb
 - lib/rbvmomi/sms.rb
 - lib/rbvmomi/sms/SmsStorageManager.rb
+- lib/rbvmomi/sso.rb
 - lib/rbvmomi/trivial_soap.rb
-- lib/rbvmomi/trollop.rb
 - lib/rbvmomi/type_loader.rb
 - lib/rbvmomi/utils/admission_control.rb
 - lib/rbvmomi/utils/deploy.rb
 - lib/rbvmomi/utils/leases.rb
 - lib/rbvmomi/utils/perfdump.rb
+- lib/rbvmomi/version.rb
 - lib/rbvmomi/vim.rb
 - lib/rbvmomi/vim/ComputeResource.rb
 - lib/rbvmomi/vim/Datacenter.rb
@@ -128,16 +172,10 @@ files:
 - lib/rbvmomi/vim/ServiceInstance.rb
 - lib/rbvmomi/vim/Task.rb
 - lib/rbvmomi/vim/VirtualMachine.rb
-- test/test_deserialization.rb
-- test/test_emit_request.rb
-- test/test_exceptions.rb
-- test/test_helper.rb
-- test/test_misc.rb
-- test/test_parse_response.rb
-- test/test_serialization.rb
 - vmodl.db
 homepage: https://github.com/vmware/rbvmomi
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -145,17 +183,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby interface to the VMware vSphere API