rbvmomi 1.1.0 → 1.1.1

data/.yardopts

@@ -3,3 +3,4 @@
 --readme README.rdoc
 lib/rbvmomi/vim.rb
 lib/rbvmomi/vim/*.rb
+lib/rbvmomi/trollop.rb

data/README.rdoc

@@ -8,6 +8,10 @@ supports the vSphere 4.1 API. RbVmomi specific documentation is
 online[http://rdoc.info/github/rlane/rbvmomi/master/frames] and is meant to
 be used alongside the official documentation[http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/index.html].
 
+== Installation
+
+    gem install rbvmomi
+
 == Usage
 
 A simple example of turning on a VM:
@@ -52,9 +56,8 @@ in the first example uses the SearchIndex for fast lookups.
 
 A few important points:
 
-* Ruby 1.9 is required.
-* Properties are exposed as accessor methods.
 * All class, method, parameter, and property names match the official documentation[http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/index.html].
+* Properties are exposed as accessor methods.
 * Data object types can usually be inferred from context, so you may use a hash instead.
 * Enumeration values are simply strings.
 * Example code is included in the examples/ directory.

data/Rakefile

@@ -6,7 +6,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rbvmomi"
-    gem.summary = "Ruby interface to the VI API"
+    gem.summary = "Ruby interface to the VMware vSphere API"
     #gem.description = ""
     gem.email = "rlane@vmware.com"
     gem.homepage = "https://github.com/rlane/rbvmomi"
@@ -17,6 +17,7 @@ begin
     gem.add_dependency 'cdb-full'
     gem.required_ruby_version = '>= 1.9.1'
     gem.files.include 'vmodl.cdb'
+    gem.files.include '.yardopts'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/devel/analyze-vim-declarations.rb

@@ -2,7 +2,7 @@
 require 'nokogiri'
 require 'cdb'
 
-# usage: analyze-vim-declarations.rb vim-declarations.xml foo-declarations.xml vmodl.db
+# :usage => analyze-vim-declarations.rb vim-declarations.xml foo-declarations.xml vmodl.db
 
 XML_FNS = ARGV[0...-1]
 abort "must specify path to vim-declarations.xml" if XML_FNS.empty?

data/examples/create_vm.rb

@@ -4,11 +4,10 @@ require 'rbvmomi'
 require 'rbvmomi/trollop'
 
 VIM = RbVmomi::VIM
-N = 2
 
 opts = Trollop.options do
   banner <<-EOS
-Create and destroy a couple of VMs.
+Create a VM.
 
 Usage:
     create_vm.rb [options]
@@ -41,52 +40,52 @@ hosts = dc.hostFolder.children
 rp = hosts.first.resourcePool
 
 vm_cfg = {
-  name: vm_name,
-  guestId: 'otherGuest',
-  files: { vmPathName: '[datastore1]' },
-  numCPUs: 1,
-  memoryMB: 128,
-  deviceChange: [
+  :name => vm_name,
+  :guestId => 'otherGuest',
+  :files => { :vmPathName => '[datastore1]' },
+  :numCPUs => 1,
+  :memoryMB => 128,
+  :deviceChange => [
     {
-      operation: :add,
-      device: VIM.VirtualLsiLogicController(
-        key: 1000,
-        busNumber: 0,
-        sharedBus: :noSharing,
+      :operation => :add,
+      :device => VIM.VirtualLsiLogicController(
+        :key => 1000,
+        :busNumber => 0,
+        :sharedBus => :noSharing
       )
     }, {
-      operation: :add,
-      fileOperation: :create,
-      device: VIM.VirtualDisk(
-        key: 0,
-        backing: VIM.VirtualDiskFlatVer2BackingInfo(
-          fileName: '[datastore1]',
-          diskMode: :persistent,
-          thinProvisioned: true,
+      :operation => :add,
+      :fileOperation => :create,
+      :device => VIM.VirtualDisk(
+        :key => 0,
+        :backing => VIM.VirtualDiskFlatVer2BackingInfo(
+          :fileName => '[datastore1]',
+          :diskMode => :persistent,
+          :thinProvisioned => true
         ),
-        controllerKey: 1000,
-        unitNumber: 0,
-        capacityInKB: 4000000,
+        :controllerKey => 1000,
+        :unitNumber => 0,
+        :capacityInKB => 4000000
       )
     }, {
-      operation: :add,
-      device: VIM.VirtualE1000(
-        key: 0,
-        deviceInfo: {
-          label: 'Network Adapter 1',
-          summary: 'VM Network',
+      :operation => :add,
+      :device => VIM.VirtualE1000(
+        :key => 0,
+        :deviceInfo => {
+          :label => 'Network Adapter 1',
+          :summary => 'VM Network'
         },
-        backing: VIM.VirtualEthernetCardNetworkBackingInfo(
-          deviceName: 'VM Network',
+        :backing => VIM.VirtualEthernetCardNetworkBackingInfo(
+          :deviceName => 'VM Network'
         ),
-        addressType: 'generated'
+        :addressType => 'generated'
       )
     }
   ],
-  extraConfig: [
+  :extraConfig => [
     {
-      key: 'bios.bootOrder',
-      value: 'ethernet0'
+      :key => 'bios.bootOrder',
+      :value => 'ethernet0'
     }
   ]
 }

data/examples/extraConfig.rb

@@ -49,6 +49,6 @@ case cmd
 when 'list'
   vm.config.extraConfig.each { |x| puts "#{x.key}: #{x.value}" }
 when 'set'
-  extraConfig = ARGV.map { |x| x.split("=", 2) }.map { |k,v| { key: k, value: v } }
-  vm.ReconfigVM_Task(spec: VIM.VirtualMachineConfigSpec(extraConfig: extraConfig)).wait_for_completion
+  extraConfig = ARGV.map { |x| x.split("=", 2) }.map { |k,v| { :key => k, :value => v } }
+  vm.ReconfigVM_Task(:spec => VIM.VirtualMachineConfigSpec(:extraConfig => extraConfig)).wait_for_completion
 end

data/examples/power.rb

@@ -3,7 +3,7 @@ require 'rbvmomi'
 require 'rbvmomi/trollop'
 
 VIM = RbVmomi::VIM
-CMDS = %w(on off reset suspend)
+CMDS = %w(on off reset suspend destroy)
 
 opts = Trollop.options do
   banner <<-EOS
@@ -52,6 +52,8 @@ when 'reset'
   vm.ResetVM_Task.wait_for_completion
 when 'suspend'
   vm.SuspendVM_Task.wait_for_completion
+when 'destroy'
+  vm.Destroy_Task.wait_for_completion
 else
   abort "invalid command"
 end

data/examples/readme-2.rb

@@ -35,15 +35,15 @@ dc = rootFolder.childEntity.grep(RbVmomi::VIM::Datacenter).find { |x| x.name ==
 vm = dc.vmFolder.childEntity.grep(RbVmomi::VIM::VirtualMachine).find { |x| x.name == vm_name } or fail "VM not found"
 task = vm.PowerOnVM_Task
 filter = vim.propertyCollector.CreateFilter(
-  spec: {
-    propSet: [{ type: 'Task', all: false, pathSet: ['info.state']}],
-    objectSet: [{ obj: task }]
+  :spec => {
+    :propSet => [{ :type => 'Task', :all => false, :pathSet => ['info.state']}],
+    :objectSet => [{ :obj => task }]
   },
-  partialUpdates: false
+  :partialUpdates => false
 )
 ver = ''
 while true
-  result = vim.propertyCollector.WaitForUpdates(version: ver)
+  result = vim.propertyCollector.WaitForUpdates(:version => ver)
   ver = result.version
   break if ['success', 'error'].member? task.info.state
 end

data/examples/run.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+
+if [ -z "$RBVMOMI_HOST" ]
+then
+  echo "export at least RBVMOMI_HOST"
+  exit 1
+fi
+
+EXAMPLES="$(dirname $(which $0))"
+export RUBYOPT="-I$EXAMPLES/../lib -rubygems"
+
+source "$HOME/.rvm/scripts/rvm"
+rvm use 1.8.7
+ruby -v
+RUBY=ruby
+
+echo Creating VM
+$RUBY $EXAMPLES/create_vm.rb foo
+echo Powering on VM
+$RUBY $EXAMPLES/power.rb on foo
+echo Resetting VM
+$RUBY $EXAMPLES/power.rb reset foo
+echo Powering off VM
+$RUBY $EXAMPLES/power.rb off foo
+echo "Powering on VM (1)"
+$RUBY $EXAMPLES/readme-1.rb foo
+echo Powering off VM
+$RUBY $EXAMPLES/power.rb off foo
+echo "Powering on VM (2)"
+$RUBY $EXAMPLES/readme-2.rb foo
+echo "Setting extraConfig"
+$RUBY $EXAMPLES/extraConfig.rb foo set guestinfo.bar=baz
+echo "Listing extraConfig"
+$RUBY $EXAMPLES/extraConfig.rb foo list | grep guestinfo.bar
+echo Powering off VM
+$RUBY $EXAMPLES/power.rb off foo
+echo Destroying VM
+$RUBY $EXAMPLES/power.rb destroy foo

data/lib/rbvmomi/trollop.rb

@@ -1,33 +1,34 @@
 # Copyright (c) 2011 VMware, Inc.  All Rights Reserved.
 require 'trollop'
 
+# @todo Document
 module Trollop
 class Parser
   def rbvmomi_connection_opts
-    opt :host, "host", type: :string, short: 'o', default: ENV['RBVMOMI_HOST']
-    opt :port, "port", type: :int, short: :none, default: (ENV.member?('RBVMOMI_PORT') ? ENV['RBVMOMI_PORT'].to_i : 443)
-    opt :"no-ssl", "don't use ssl", short: :none, default: (ENV['RBVMOMI_SSL'] == '0') 
-    opt :insecure, "don't verify ssl certificate", short: 'k', default: (ENV['RBVMOMI_INSECURE'] == '1')
-    opt :user, "username", short: 'u', default: (ENV['RBVMOMI_USER'] || 'root')
-    opt :password, "password", short: 'p', default: (ENV['RBVMOMI_PASSWORD'] || '')
-    opt :path, "SOAP endpoint path", short: :none, default: (ENV['RBVMOMI_PATH'] || '/sdk')
-    opt :debug, "Log SOAP messages", short: 'd'
+    opt :host, "host", :type => :string, :short => 'o', :default => ENV['RBVMOMI_HOST']
+    opt :port, "port", :type => :int, :short => :none, :default => (ENV.member?('RBVMOMI_PORT') ? ENV['RBVMOMI_PORT'].to_i : 443)
+    opt :"no-ssl", "don't use ssl", :short => :none, :default => (ENV['RBVMOMI_SSL'] == '0') 
+    opt :insecure, "don't verify ssl certificate", :short => 'k', :default => (ENV['RBVMOMI_INSECURE'] == '1')
+    opt :user, "username", :short => 'u', :default => (ENV['RBVMOMI_USER'] || 'root')
+    opt :password, "password", :short => 'p', :default => (ENV['RBVMOMI_PASSWORD'] || '')
+    opt :path, "SOAP endpoint path", :short => :none, :default => (ENV['RBVMOMI_PATH'] || '/sdk')
+    opt :debug, "Log SOAP messages", :short => 'd'
   end
 
   def rbvmomi_datacenter_opt
-    opt :datacenter, "datacenter", type: :string, short: "D", default: (ENV['RBVMOMI_DATACENTER'] || 'ha-datacenter')
+    opt :datacenter, "datacenter", :type => :string, :short => "D", :default => (ENV['RBVMOMI_DATACENTER'] || 'ha-datacenter')
   end
 
   def rbvmomi_folder_opt
-    opt :folder, "VM folder", type: :string, short: "F", default: (ENV['RBVMOMI_FOLDER'] || '')
+    opt :folder, "VM folder", :type => :string, :short => "F", :default => (ENV['RBVMOMI_FOLDER'] || '')
   end
 
   def rbvmomi_computer_opt
-    opt :computer, "Compute resource", type: :string, short: "R", default: ENV['RBVMOMI_COMPUTER']
+    opt :computer, "Compute resource", :type => :string, :short => "R", :default => ENV['RBVMOMI_COMPUTER']
   end
 
   def rbvmomi_datastore_opt
-    opt :datastore, "Datastore", short: 's', default: (ENV['RBVMOMI_DATASTORE'] || 'datastore1')
+    opt :datastore, "Datastore", :short => 's', :default => (ENV['RBVMOMI_DATASTORE'] || 'datastore1')
   end
 end
 end

data/lib/rbvmomi/vim/ComputeResource.rb

@@ -4,38 +4,38 @@ class RbVmomi::VIM::ComputeResource
   # @note Values are returned in a hash.
   #
   # @return [Mhz] totalCPU: Sum of the frequencies of each CPU in the cluster.
-  # @return [Mhz] usedCPU: CPU cycles used across the cluster.
-  # @return [MB] totalMem: Total RAM.
-  # @return [MB] usedMem: Used RAM.
+  # @return [Mhz] usedCPU:  CPU cycles used across the cluster.
+  # @return [MB]  totalMem: Total RAM.
+  # @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 = @soap.propertyCollector.RetrieveProperties(specSet: [filterSpec])
+    result = @soap.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|

data/lib/rbvmomi/vim/Datastore.rb

@@ -30,7 +30,7 @@ class RbVmomi::VIM::Datastore
                 "-o", local_path,
                 "-b", @soap.cookie,
                 url,
-                out: '/dev/null'
+                :out => '/dev/null'
     Process.waitpid(pid, 0)
     fail "download failed" unless $?.success?
   end
@@ -45,7 +45,7 @@ class RbVmomi::VIM::Datastore
                 "-T", local_path,
                 "-b", @soap.cookie,
                 url,
-                out: '/dev/null'
+                :out => '/dev/null'
     Process.waitpid(pid, 0)
     fail "upload failed" unless $?.success?
   end

data/lib/rbvmomi/vim/Folder.rb

@@ -4,7 +4,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 = @soap.searchIndex.FindChild(entity: self, name: name)
+    x = @soap.searchIndex.FindChild(:entity => self, :name => name)
     x if x.is_a? type
   end
 
@@ -26,13 +26,13 @@ class RbVmomi::VIM::Folder
     final = es.pop
 
     p = es.inject(self) do |f,e|
-      f.find(e, Folder) || (create && f.CreateFolder(name: e)) || return
+      f.find(e, Folder) || (create && f.CreateFolder(:name => e)) || return
     end
 
     if x = p.find(final, type)
       x
     elsif create and type == Folder
-      p.CreateFolder(name: final)
+      p.CreateFolder(:name => final)
     else
       nil
     end
@@ -57,7 +57,7 @@ class RbVmomi::VIM::Folder
   #
   # @todo Return ObjectContent instead of the leaf hash.
   def inventory propSpecs={}
-    propSet = [{ type: 'Folder', pathSet: ['name', 'parent'] }]
+    propSet = [{ :type => 'Folder', :pathSet => ['name', 'parent'] }]
     propSpecs.each do |k,v|
       case k
       when RbVmomi::VIM::ManagedEntity
@@ -68,7 +68,7 @@ class RbVmomi::VIM::Folder
         fail "key must be a ManagedEntity"
       end
 
-      h = { type: k }
+      h = { :type => k }
       if v == :all
         h[:all] = true
       elsif v.is_a? Array
@@ -80,24 +80,24 @@ class RbVmomi::VIM::Folder
     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 = @soap.propertyCollector.RetrieveProperties(specSet: [filterSpec])
+    result = @soap.propertyCollector.RetrieveProperties(:specSet => [filterSpec])
 
     tree = { self => {} }
     result.each do |x|

data/lib/rbvmomi/vim/ManagedEntity.rb

@@ -3,27 +3,27 @@ class RbVmomi::VIM::ManagedEntity
   # @return [Array] Ancestors of this entity, starting with the root.
   def path
     filterSpec = RbVmomi::VIM.PropertyFilterSpec(
-      objectSet: [{
-        obj: self,
-        selectSet: [
+      :objectSet => [{
+        :obj => self,
+        :selectSet => [
           RbVmomi::VIM.TraversalSpec(
-            name: 'tsME',
-            type: 'ManagedEntity',
-            path: 'parent',
-            skip: false,
-            selectSet: [
-              RbVmomi::VIM.SelectionSpec(name: 'tsME')
+            :name => 'tsME',
+            :type => 'ManagedEntity',
+            :path => 'parent',
+            :skip => false,
+            :selectSet => [
+              RbVmomi::VIM.SelectionSpec(:name => 'tsME')
             ]
           )
         ]
       }],
-      propSet: [{
-        pathSet: %w(name parent),
-        type: 'ManagedEntity'
+      :propSet => [{
+        :pathSet => %w(name parent),
+        :type => 'ManagedEntity'
       }]
     )
 
-    result = @soap.propertyCollector.RetrieveProperties(specSet: [filterSpec])
+    result = @soap.propertyCollector.RetrieveProperties(:specSet => [filterSpec])
 
     tree = {}
     result.each { |x| tree[x.obj] = [x['parent'], x['name']] }

data/lib/rbvmomi/vim/ManagedObject.rb

@@ -14,7 +14,7 @@ class RbVmomi::VIM::ManagedObject
     }, :partialUpdates => false
     ver = ''
     loop do
-      result = @soap.propertyCollector.WaitForUpdates(version: ver)
+      result = @soap.propertyCollector.WaitForUpdates(:version => ver)
       ver = result.version
       if x = b.call
         return x
@@ -29,13 +29,13 @@ class RbVmomi::VIM::ManagedObject
   # @return [Hash] Hash from property paths to values.
   def collect! *pathSet
     spec = {
-      objectSet: [{ obj: self }],
-      propSet: [{
-        pathSet: pathSet,
-        type: self.class.wsdl_name
+      :objectSet => [{ :obj => self }],
+      :propSet => [{
+        :pathSet => pathSet,
+        :type => self.class.wsdl_name
       }]
     }
-    @soap.propertyCollector.RetrieveProperties(specSet: [spec])[0].to_hash
+    @soap.propertyCollector.RetrieveProperties(:specSet => [spec])[0].to_hash
   end
 
   # Efficiently retrieve multiple properties from an object.

data/lib/rbvmomi/vim/OvfManager.rb

@@ -17,29 +17,29 @@ class RbVmomi::VIM::OvfManager
   # @option opts [Hash]               :networkMappings Network mappings.
   # @option opts [Hash]               :propertyMappings Property mappings.
   def deployOVF opts
-    opts = { networkMappings: {},
-             propertyMappings: {},
-             diskProvisioning: :thin }.merge opts
+    opts = { :networkMappings => {},
+             :propertyMappings => {},
+             :diskProvisioning => :thin }.merge opts
 
     %w(uri vmName vmFolder host resourcePool datastore).each do |k|
       fail "parameter #{k} required" unless opts[k.to_sym]
     end
 
     ovfImportSpec = RbVmomi::VIM::OvfCreateImportSpecParams(
-      hostSystem: opts[:host],
-      locale: "US",
-      entityName: opts[:vmName],
-      deploymentOption: "",
-      networkMapping: opts[:networkMappings].map{|from, to| RbVmomi::VIM::OvfNetworkMapping(name: from, network: to)},
-      propertyMapping: opts[:propertyMappings].map{|key, value| RbVmomi::VIM::KeyValue(key: key, value: value)},
-      diskProvisioning: opts[:diskProvisioning]
+      :hostSystem => opts[:host],
+      :locale => "US",
+      :entityName => opts[:vmName],
+      :deploymentOption => "",
+      :networkMapping => opts[:networkMappings].map{|from, to| RbVmomi::VIM::OvfNetworkMapping(:name => from, :network => to)},
+      :propertyMapping => opts[:propertyMappings].map{|key, value| RbVmomi::VIM::KeyValue(:key => key, :value => value)},
+      :diskProvisioning => opts[:diskProvisioning]
     )
 
     result = CreateImportSpec(
-      ovfDescriptor: open(opts[:uri]).read,
-      resourcePool: opts[:resourcePool],
-      datastore: opts[:datastore],
-      cisp: ovfImportSpec
+      :ovfDescriptor => open(opts[:uri]).read,
+      :resourcePool => opts[:resourcePool],
+      :datastore => opts[:datastore],
+      :cisp => ovfImportSpec
     )
 
     raise result.error[0].localizedMessage if result.error && !result.error.empty?
@@ -48,15 +48,15 @@ class RbVmomi::VIM::OvfManager
       result.warning.each{|x| puts "OVF Warning: #{x.localizedMessage.chomp}" }
     end
 
-    nfcLease = opts[:resourcePool].ImportVApp(spec: result.importSpec,
-                                              folder: opts[:vmFolder],
-                                              host: opts[:host])
+    nfcLease = opts[:resourcePool].ImportVApp(:spec => result.importSpec,
+                                              :folder => opts[:vmFolder],
+                                              :host => opts[:host])
 
     nfcLease.wait_until(:state) { nfcLease.state != "initializing" }
     raise nfcLease.error if nfcLease.state == "error"
 
     begin
-      nfcLease.HttpNfcLeaseProgress(percent: 5)
+      nfcLease.HttpNfcLeaseProgress(:percent => 5)
       progress = 0.0
       result.fileItem.each do |fileItem|
         deviceUrl = nfcLease.info.deviceUrl.find{|x| x.importKey == fileItem.deviceId}
@@ -78,10 +78,10 @@ class RbVmomi::VIM::OvfManager
         uploadCmd = "#{CURLBIN} -X #{method} --insecure -T - -H 'Content-Type: application/x-vnd.vmware-streamVmdk' -H 'Content-Length: #{fileItem.size}' '#{href}'"
         system("#{downloadCmd} | #{uploadCmd}")
         progress += (95.0 / result.fileItem.length)
-        nfcLease.HttpNfcLeaseProgress(percent: progress.to_i)
+        nfcLease.HttpNfcLeaseProgress(:percent => progress.to_i)
       end
 
-      nfcLease.HttpNfcLeaseProgress(percent: 100)
+      nfcLease.HttpNfcLeaseProgress(:percent => 100)
       vm = nfcLease.info.entity
       nfcLease.HttpNfcLeaseComplete
       vm

data/lib/rbvmomi/vim/ResourcePool.rb

@@ -3,7 +3,7 @@ class RbVmomi::VIM::ResourcePool
   # @param name [String] Name of the child.
   # @return [VIM::ResourcePool]
   def find name
-    @soap.searchIndex.FindChild(entity: self, name: name)
+    @soap.searchIndex.FindChild(:entity => self, :name => name)
   end
 
   # Retrieve a descendant of this ResourcePool.

data/lib/rbvmomi/vim/ServiceInstance.rb

@@ -30,7 +30,7 @@ class RbVmomi::VIM::ServiceInstance
 
     begin
       until task_props.size == tasks.size and task_props.all? { |k,h| %w(success error).member? h['info.state'] }
-        result = @soap.propertyCollector.WaitForUpdates(version: version)
+        result = @soap.propertyCollector.WaitForUpdates(:version => version)
         version = result.version
         os = result.filterSet[0].objectSet
 

data/test/test_deserialization.rb

@@ -1,10 +1,10 @@
 require 'test/unit'
 require 'rbvmomi'
-VIM ||= RbVmomi::VIM
+VIM = RbVmomi::VIM unless Object.const_defined? :VIM
 
 class DeserializationTest < Test::Unit::TestCase
   def setup
-    @soap = VIM.new(ns: 'urn:vim25', rev: '4.0')
+    @soap = VIM.new(:ns => 'urn:vim25', :rev => '4.0')
   end
 
   def check str, expected, type
@@ -24,15 +24,15 @@ class DeserializationTest < Test::Unit::TestCase
 
   def test_dataobject
     obj = VIM.DatastoreSummary(
-      capacity: 1000,
-      accessible: true,
-      datastore: VIM.Datastore(nil, "foo"),
-      freeSpace: 31,
-      multipleHostAccess: false,
-      name: "baz",
-      type: "VMFS",
-      url: "http://foo/",
-      dynamicProperty: []
+      :capacity => 1000,
+      :accessible => true,
+      :datastore => VIM.Datastore(nil, "foo"),
+      :freeSpace => 31,
+      :multipleHostAccess => false,
+      :name => "baz",
+      :type => "VMFS",
+      :url => "http://foo/",
+      :dynamicProperty => []
     )
 
     check <<-EOS, obj, 'DatastoreSummary'
@@ -57,13 +57,13 @@ class DeserializationTest < Test::Unit::TestCase
 
   def test_array
     obj = VIM.ObjectContent(
-      obj: VIM.Folder(nil, 'ha-folder-root'),
-      dynamicProperty: [],
-      missingSet: [],
-      propSet: [
+      :obj => VIM.Folder(nil, 'ha-folder-root'),
+      :dynamicProperty => [],
+      :missingSet => [],
+      :propSet => [
         VIM.DynamicProperty(
-          name: 'childEntity',
-          val: [
+          :name => 'childEntity',
+          :val => [
             VIM.Datacenter(nil, 'ha-datacenter')
           ]
         )
@@ -85,12 +85,12 @@ class DeserializationTest < Test::Unit::TestCase
 
 def test_array2
   obj = VIM.DVPortStatus(
-    dynamicProperty: [],
-    linkUp: true,
-    blocked: false,
-    vlanIds: [
-      VIM::NumericRange(dynamicProperty: [], start: 5, end: 7),
-      VIM::NumericRange(dynamicProperty: [], start: 10, end: 20),
+    :dynamicProperty => [],
+    :linkUp => true,
+    :blocked => false,
+    :vlanIds => [
+      VIM::NumericRange(:dynamicProperty => [], :start => 5, :end => 7),
+      VIM::NumericRange(:dynamicProperty => [], :start => 10, :end => 20),
     ]
   )
 
@@ -112,10 +112,10 @@ end
 
 def test_empty_array
   obj = VIM.DVPortStatus(
-    dynamicProperty: [],
-    linkUp: true,
-    blocked: false,
-    vlanIds: []
+    :dynamicProperty => [],
+    :linkUp => true,
+    :blocked => false,
+    :vlanIds => []
   )
 
   check <<-EOS, obj, 'DVPortStatus'
@@ -128,11 +128,11 @@ end
 
   def test_fault
     obj = VIM.LocalizedMethodFault(
-      localizedMessage: "The attempted operation cannot be performed in the current state (Powered off).",
-      fault: VIM.InvalidPowerState(
-        requestedState: 'poweredOn',
-        existingState: 'poweredOff',
-        faultMessage: []
+      :localizedMessage => "The attempted operation cannot be performed in the current state (Powered off).",
+      :fault => VIM.InvalidPowerState(
+        :requestedState => 'poweredOn',
+        :existingState => 'poweredOff',
+        :faultMessage => []
       )
     )
 
@@ -149,25 +149,25 @@ end
 
   def test_wait_for_updates
     obj = VIM.UpdateSet(
-      version: '7',
-      dynamicProperty: [],
-      filterSet: [
+      :version => '7',
+      :dynamicProperty => [],
+      :filterSet => [
         VIM.PropertyFilterUpdate(
-          dynamicProperty: [],
-          filter: VIM.PropertyFilter(nil, "session[528BA5EB-335B-4AF6-B49C-6160CF5E8D5B]71E3AC7E-7927-4D9E-8BC3-522769F22DAF"),
-          missingSet: [],
-          objectSet: [
+          :dynamicProperty => [],
+          :filter => VIM.PropertyFilter(nil, "session[528BA5EB-335B-4AF6-B49C-6160CF5E8D5B]71E3AC7E-7927-4D9E-8BC3-522769F22DAF"),
+          :missingSet => [],
+          :objectSet => [
             VIM.ObjectUpdate(
-              dynamicProperty: [],
-              kind: 'enter',
-              obj: VIM.VirtualMachine(nil, 'vm-1106'),
-              missingSet: [],
-              changeSet: [
+              :dynamicProperty => [],
+              :kind => 'enter',
+              :obj => VIM.VirtualMachine(nil, 'vm-1106'),
+              :missingSet => [],
+              :changeSet => [
                 VIM.PropertyChange(
-                  dynamicProperty: [],
-                  name: 'runtime.powerState',
-                  op: 'assign',
-                  val: 'poweredOn'
+                  :dynamicProperty => [],
+                  :name => 'runtime.powerState',
+                  :op => 'assign',
+                  :val => 'poweredOn'
                 )
               ]
             )
@@ -204,14 +204,14 @@ end
 
   def test_hba
     obj = VIM::HostBlockHba(
-      dynamicProperty: [],
-      key: 'key-vim.host.BlockHba-vmhba0',
-      device: 'vmhba0',
-      bus: 0,
-      status: 'unknown',
-      model: 'Virtual Machine Chipset',
-      driver: 'ata_piix',
-      pci: '00:07.1')
+      :dynamicProperty => [],
+      :key => 'key-vim.host.BlockHba-vmhba0',
+      :device => 'vmhba0',
+      :bus => 0,
+      :status => 'unknown',
+      :model => 'Virtual Machine Chipset',
+      :driver => 'ata_piix',
+      :pci => '00:07.1')
 
     check <<-EOS, obj, "HostBlockHba"
 <hostBusAdapter xsi:type="HostBlockHba">
@@ -229,10 +229,10 @@ end
 =begin
   def test_runtime_state
     obj = VIM::VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeState(
-      dynamicProperty: [],
-      vmDirectPathGen2Active: false,
-      vmDirectPathGen2InactiveReasonOther: ["vmNptIncompatibleHost"],
-      vmDirectPathGen2InactiveReasonVm: []
+      :dynamicProperty => [],
+      vmDirectPathGen2:Active => false,
+      vmDirectPathGen2:InactiveReasonOther => ["vmNptIncompatibleHost"],
+      vmDirectPathGen2:InactiveReasonVm => []
     )
     check <<-EOS, obj, 'VirtualMachineDeviceRuntimeInfoDeviceRuntimeState'
 <runtimeState xsi:type="VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeState" xmlns:xsi="#{VIM::NS_XSI}">
@@ -245,19 +245,19 @@ end
 
   def test_runtime_info
     obj = VIM::VirtualMachineRuntimeInfo(
-      bootTime: Time.parse('2010-08-20 05:44:35 UTC'),
-      connectionState: "connected",
-      dynamicProperty: [],
-      faultToleranceState: "notConfigured",
-      host: VIM::HostSystem(nil, "host-32"),
-      maxCpuUsage: 5612,
-      maxMemoryUsage: 3072,
-      memoryOverhead: 128671744,
-      numMksConnections: 1,
-      powerState: "poweredOn",
-      recordReplayState: "inactive",
-      suspendInterval: 0,
-      toolsInstallerMounted: false
+      :bootTime => Time.parse('2010-08-20 05:44:35 UTC'),
+      :connectionState => "connected",
+      :dynamicProperty => [],
+      :faultToleranceState => "notConfigured",
+      :host => VIM::HostSystem(nil, "host-32"),
+      :maxCpuUsage => 5612,
+      :maxMemoryUsage => 3072,
+      :memoryOverhead => 128671744,
+      :numMksConnections => 1,
+      :powerState => "poweredOn",
+      :recordReplayState => "inactive",
+      :suspendInterval => 0,
+      :toolsInstallerMounted => false
     )
 
     check <<-EOS, obj, 'VirtualMachineRuntimeInfo'

data/test/test_emit_request.rb

@@ -1,12 +1,12 @@
 require 'test/unit'
 require 'rbvmomi'
-VIM ||= RbVmomi::VIM
+VIM = RbVmomi::VIM unless Object.const_defined? :VIM
 
 class EmitRequestTest < Test::Unit::TestCase
   MO = VIM::VirtualMachine(nil, "foo")
 
   def check desc, str, this, params
-    soap = VIM.new(ns: 'urn:vim25', rev: '4.0')
+    soap = VIM.new(:ns => 'urn:vim25', :rev => '4.0')
     xml = Builder::XmlMarkup.new :indent => 2
     soap.emit_request xml, 'root', desc, this, params
 
@@ -33,7 +33,7 @@ class EmitRequestTest < Test::Unit::TestCase
       }
     ]
 
-    check desc, <<-EOS, MO, blah: ['a', 'b', 'c']
+    check desc, <<-EOS, MO, :blah => ['a', 'b', 'c']
 <root xmlns="urn:vim25">
   <_this type="VirtualMachine">foo</_this>
   <blah>a</blah>
@@ -53,7 +53,7 @@ class EmitRequestTest < Test::Unit::TestCase
       }
     ]
 
-    check desc, <<-EOS, MO, blah: 'a'
+    check desc, <<-EOS, MO, :blah => 'a'
 <root xmlns="urn:vim25">
   <_this type="VirtualMachine">foo</_this>
   <blah>a</blah>

data/test/test_exceptions.rb

@@ -1,11 +1,11 @@
 require 'test/unit'
 require 'rbvmomi'
-VIM ||= RbVmomi::VIM
+VIM = RbVmomi::VIM unless Object.const_defined? :VIM
 
 class ExceptionTest < Test::Unit::TestCase
   def test_fault
     begin
-      fault = VIM::InvalidArgument.new invalidProperty: 'foo'
+      fault = VIM::InvalidArgument.new :invalidProperty => 'foo'
       assert_raises RbVmomi::Fault do
         raise RbVmomi::Fault.new('A specified parameter was not correct.', fault)
       end

data/test/test_parse_response.rb

@@ -1,10 +1,10 @@
 require 'test/unit'
 require 'rbvmomi'
-VIM ||= RbVmomi::VIM
+VIM = RbVmomi::VIM unless Object.const_defined? :VIM
 
 class ParseResponseTest < Test::Unit::TestCase
   def check desc, str, expected
-    soap = VIM.new(ns: 'urn:vim25', rev: '4.0')
+    soap = VIM.new(:ns => 'urn:vim25', :rev => '4.0')
     got = soap.parse_response Nokogiri(str).root, desc
     assert_equal expected, got
   end

data/test/test_serialization.rb

@@ -1,10 +1,10 @@
 require 'test/unit'
 require 'rbvmomi'
-VIM ||= RbVmomi::VIM
+VIM = RbVmomi::VIM unless Object.const_defined? :VIM
 
 class SerializationTest < Test::Unit::TestCase
   def check str, obj, type, array=false
-    @soap = VIM.new(ns: 'urn:vim25', rev: '4.0')
+    @soap = VIM.new(:ns => 'urn:vim25', :rev => '4.0')
     xml = Builder::XmlMarkup.new :indent => 2
     @soap.obj2xml(xml, 'root', type, array, obj)
 
@@ -29,52 +29,52 @@ class SerializationTest < Test::Unit::TestCase
 
   def test_config
     cfg = VIM.VirtualMachineConfigSpec(
-      name: 'vm',
-      files: { vmPathName: '[datastore1]' },
-      guestId: 'otherGuest64',
-      numCPUs: 2,
-      memoryMB: 3072,
-      deviceChange: [
+      :name => 'vm',
+      :files => { :vmPathName => '[datastore1]' },
+      :guestId => 'otherGuest64',
+      :numCPUs => 2,
+      :memoryMB => 3072,
+      :deviceChange => [
         {
-          operation: :add,
-          device: VIM.VirtualLsiLogicController(
-            key: 1000,
-            busNumber: 0,
-            sharedBus: :noSharing,
+          :operation => :add,
+          :device => VIM.VirtualLsiLogicController(
+            :key => 1000,
+            :busNumber => 0,
+            :sharedBus => :noSharing
           )
         }, VIM.VirtualDeviceConfigSpec(
-          operation: VIM.VirtualDeviceConfigSpecOperation(:add),
-          fileOperation: VIM.VirtualDeviceConfigSpecFileOperation(:create),
-          device: VIM.VirtualDisk(
-            key: 0,
-            backing: VIM.VirtualDiskFlatVer2BackingInfo(
-              fileName: '[datastore1]',
-              diskMode: :persistent,
-              thinProvisioned: true,
+          :operation => VIM.VirtualDeviceConfigSpecOperation(:add),
+          :fileOperation => VIM.VirtualDeviceConfigSpecFileOperation(:create),
+          :device => VIM.VirtualDisk(
+            :key => 0,
+            :backing => VIM.VirtualDiskFlatVer2BackingInfo(
+              :fileName => '[datastore1]',
+              :diskMode => :persistent,
+              :thinProvisioned => true
             ),
-            controllerKey: 1000,
-            unitNumber: 0,
-            capacityInKB: 4000000,
+            :controllerKey => 1000,
+            :unitNumber => 0,
+            :capacityInKB => 4000000
           )
         ), {
-          operation: :add,
-          device: VIM.VirtualE1000(
-            key: 0,
-            deviceInfo: {
-              label: 'Network Adapter 1',
-              summary: 'VM Network',
+          :operation => :add,
+          :device => VIM.VirtualE1000(
+            :key => 0,
+            :deviceInfo => {
+              :label => 'Network Adapter 1',
+              :summary => 'VM Network'
             },
-            backing: VIM.VirtualEthernetCardNetworkBackingInfo(
-              deviceName: 'VM Network',
+            :backing => VIM.VirtualEthernetCardNetworkBackingInfo(
+              :deviceName => 'VM Network'
             ),
-            addressType: 'generated'
+            :addressType => 'generated'
           )
         }
       ],
-      extraConfig: [
+      :extraConfig => [
         {
-          key: 'bios.bootOrder',
-          value: 'ethernet0'
+          :key => 'bios.bootOrder',
+          :value => 'ethernet0'
         }
       ]
     )
@@ -133,7 +133,7 @@ class SerializationTest < Test::Unit::TestCase
   end
 
   def test_nil_field
-    obj = VIM.OptionValue(key: 'foo', value: nil)
+    obj = VIM.OptionValue(:key => 'foo', :value => nil)
     check <<-EOS, obj, "OptionValue"
 <root xsi:type="OptionValue">
   <key>foo</key>

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbvmomi
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Rich Lane
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 -08:00
+date: 2011-02-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 4
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -53,6 +56,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -66,6 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -93,6 +98,7 @@ files:
 - examples/power.rb
 - examples/readme-1.rb
 - examples/readme-2.rb
+- examples/run.sh
 - lib/rbvmomi.rb
 - lib/rbvmomi/basic_types.rb
 - lib/rbvmomi/connection.rb
@@ -134,6 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 49
       segments: 
       - 1
       - 9
@@ -144,16 +151,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Ruby interface to the VI API
+summary: Ruby interface to the VMware vSphere API
 test_files: 
 - examples/create_vm.rb
 - examples/extraConfig.rb