rbvmomi 1.2.2 → 1.2.3

data/Rakefile

@@ -29,3 +29,17 @@ Rake::TestTask.new do |t|
 end
 
 YARD::Rake::YardocTask.new
+
+begin
+  require 'rcov/rcovtask'
+  desc 'Measures test coverage using rcov'
+  Rcov::RcovTask.new do |rcov|
+    rcov.pattern    = 'test/test_*.rb'
+    rcov.output_dir = 'coverage'
+    rcov.verbose    = true
+    rcov.libs << "test"
+    rcov.rcov_opts << '--exclude "gems/*"'
+  end
+rescue LoadError
+  puts "Rcov not available. Install it with: gem install rcov"
+end

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/devel/analyze-vim-declarations.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'nokogiri'
-require 'cdb'
 
 # :usage => analyze-vim-declarations.rb vim-declarations.xml foo-declarations.xml vmodl.db
 
@@ -175,16 +174,16 @@ TYPES.each do |k,t|
   end
 end
 
-db = CDBMake.new(OUT_FN)
+db = {}
 
 TYPES.each do |k,t|
-  db[k] = Marshal.dump t
+  db[k] = t
 end
 
-db['_typenames'] = Marshal.dump TYPES.keys
-db['_versions'] = Marshal.dump VERSIONS
+db['_typenames'] = TYPES.keys
+db['_versions'] = VERSIONS
 
-db.finish
+File.open(OUT_FN, 'w') { |io| Marshal.dump db, io }
 
 if filename = ENV['VERSION_GRAPH']
   File.open(filename, 'w') do |io|

data/examples/annotate.rb

@@ -0,0 +1,54 @@
+require 'trollop'
+require 'rbvmomi'
+require 'rbvmomi/trollop'
+
+VIM = RbVmomi::VIM
+CMDS = %w(get set)
+
+opts = Trollop.options do
+  banner <<-EOS
+Annotate a VM.
+
+Usage:
+    annotate.rb [options] VM get
+    annotate.rb [options] VM set annotation
+
+Commands: #{CMDS * ' '}
+
+VIM connection options:
+    EOS
+
+    rbvmomi_connection_opts
+
+    text <<-EOS
+
+VM location options:
+    EOS
+
+    rbvmomi_datacenter_opt
+
+    text <<-EOS
+
+Other options:
+  EOS
+
+  stop_on CMDS
+end
+
+vm_name = ARGV[0] or Trollop.die("no VM name given")
+cmd = ARGV[1] or Trollop.die("no command given")
+abort "invalid command" unless CMDS.member? cmd
+Trollop.die("must specify host") unless opts[:host]
+
+vim = VIM.connect opts
+
+dc = vim.serviceInstance.find_datacenter(opts[:datacenter]) or abort "datacenter not found"
+vm = dc.find_vm(vm_name) or abort "VM not found"
+
+case cmd
+when 'get'
+  puts vm.config.annotation
+when 'set'
+  value = ARGV[2] or Trollop.die("no annotation given")
+  vm.ReconfigVM_Task(:spec => VIM.VirtualMachineConfigSpec(:annotation => value)).wait_for_completion
+end

data/examples/clone_vm.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+require 'trollop'
+require 'rbvmomi'
+require 'rbvmomi/trollop'
+
+VIM = RbVmomi::VIM
+
+opts = Trollop.options do
+  banner <<-EOS
+Clone a VM.
+
+Usage:
+    clone_vm.rb [options] source_vm dest_vm
+
+VIM connection options:
+    EOS
+
+    rbvmomi_connection_opts
+
+    text <<-EOS
+
+VM location options:
+    EOS
+
+    rbvmomi_datacenter_opt
+
+    text <<-EOS
+
+Other options:
+  EOS
+
+  opt :linked_clone, "Use a linked clone instead of a full clone"
+end
+
+Trollop.die("must specify host") unless opts[:host]
+ARGV.size == 2 or abort "must specify VM source name and VM target name"
+vm_source = ARGV[0]
+vm_target = ARGV[1]
+
+vim = VIM.connect opts
+dc = vim.serviceInstance.find_datacenter(opts[:datacenter]) or abort "datacenter not found"
+vm = dc.find_vm(vm_source) or abort "VM not found"
+
+if opts[:linked_clone]
+  # 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.
+  #
+  # Thus, this code first create a delta disk on top of the base disk for
+  # the to-be-cloned VM, if delta disks aren't used already.
+  disks = vm.config.hardware.device.grep(VIM::VirtualDisk)
+  disks.select { |x| x.backing.parent == nil }.each do |disk|
+    spec = {
+      :deviceChange => [
+        {
+          :operation => :remove,
+          :device => disk
+        },
+        {
+          :operation => :add,
+          :fileOperation => :create,
+          :device => disk.dup.tap { |x|
+            x.backing = x.backing.dup
+            x.backing.fileName = "[#{disk.backing.datastore.name}]"
+            x.backing.parent = disk.backing
+          },
+        }
+      ]
+    }
+    vm.ReconfigVM_Task(:spec => spec).wait_for_completion
+  end
+
+  relocateSpec = VIM.VirtualMachineRelocateSpec(:diskMoveType => :moveChildMostDiskBacking)
+else
+  relocateSpec = VIM.VirtualMachineRelocateSpec
+end
+
+spec = VIM.VirtualMachineCloneSpec(:location => relocateSpec,
+                                   :powerOn => false,
+                                   :template => false)
+
+vm.CloneVM_Task(:folder => vm.parent, :name => vm_target, :spec => spec).wait_for_completion

data/examples/vm_drs_behavior.rb

@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+require 'trollop'
+require 'rbvmomi'
+require 'rbvmomi/trollop'
+
+VIM = RbVmomi::VIM
+CMDS = %w(get set)
+BEHAVIOR = %w(fullyAutomated manual partiallyAutomated default)
+
+opts = Trollop.options do
+  banner <<-EOS
+Configure VM DRS behavior.
+
+Usage:
+    vm_drs_behavior.rb [options] VM get
+    vm_drs_behavior.rb [options] VM set #{BEHAVIOR.join('|')}
+
+Commands: #{CMDS * ' '}
+
+VIM connection options:
+    EOS
+
+    rbvmomi_connection_opts
+
+    text <<-EOS
+
+VM location options:
+    EOS
+
+    rbvmomi_datacenter_opt
+
+    text <<-EOS
+
+Other options:
+  EOS
+
+  stop_on CMDS
+end
+
+Trollop.die("must specify host") unless opts[:host]
+
+vm_name = ARGV[0] or Trollop.die("no VM name given")
+cmd = ARGV[1] or Trollop.die("no command given")
+abort "invalid command" unless CMDS.member? cmd
+
+vim = VIM.connect opts
+dc = vim.serviceInstance.find_datacenter(opts[:datacenter]) or abort "datacenter not found"
+vm = dc.find_vm(vm_name) or abort "VM not found"
+
+cluster = vm.runtime.host.parent
+config = cluster.configurationEx.drsVmConfig.select {|c| c.key.name == vm.name }.first
+default = cluster.configurationEx.drsConfig.defaultVmBehavior
+
+case cmd
+when 'get'
+  if config
+    behavior = config.behavior
+  else
+    behavior = "#{default} (default)"
+  end
+  puts "#{vm.name} is #{behavior}"
+when 'set'
+  behavior = ARGV[2] or Trollop.die("no behavior given")
+  abort "invalid behavior" unless BEHAVIOR.member? behavior
+
+  if behavior == "default"
+    behavior = default
+  end
+  vm_spec =
+    VIM.ClusterDrsVmConfigSpec(:operation => VIM.ArrayUpdateOperation(config ? "edit" : "add"),
+                               :info => VIM.ClusterDrsVmConfigInfo(:key => vm,
+                                                                   :behavior => VIM.DrsBehavior(behavior)))
+  spec = VIM.ClusterConfigSpecEx(:drsVmConfigSpec => [vm_spec])
+  cluster.ReconfigureComputeResource_Task(:spec => spec, :modify => true).wait_for_completion
+end
+

data/lib/rbvmomi/basic_types.rb

@@ -94,6 +94,11 @@ class DataObject < ObjectWithProperties
     end
   end
 
+  def initialize_copy(source)  
+    super  
+    @props = @props.dup  
+  end 
+
   def _get_property sym
     @props[sym]
   end

data/lib/rbvmomi/connection.rb

@@ -174,7 +174,7 @@ class Connection < TrivialSoap
     when Symbol, String
       if expected == BasicTypes::Binary
         attrs['xsi:type'] = 'xsd:base64Binary' if expected == BasicTypes::AnyType
-        xml.tag! name, [o].pack('m').chomp, attrs
+        xml.tag! name, [o].pack('m').chomp.gsub("\n", ""), attrs
       else
         attrs['xsi:type'] = 'xsd:string' if expected == BasicTypes::AnyType
         xml.tag! name, o.to_s, attrs

data/lib/rbvmomi/vim.rb

@@ -27,13 +27,16 @@ class VIM < Connection
     opts[:port] ||= (opts[:ssl] ? 443 : 80)
     opts[:path] ||= '/sdk'
     opts[:ns] ||= 'urn:vim25'
-    opts[:rev] = '4.0'
+    rev_given = opts[:rev] != nil
+    opts[:rev] = '4.0' unless rev_given
     opts[:debug] = (!ENV['RBVMOMI_DEBUG'].empty? rescue false) unless opts.member? :debug
 
     new(opts).tap do |vim|
       vim.serviceContent.sessionManager.Login :userName => opts[:user], :password => opts[:password]
-      rev = vim.serviceContent.about.apiVersion
-      vim.rev = [rev, '4.1'].min
+      unless rev_given
+        rev = vim.serviceContent.about.apiVersion
+        vim.rev = [rev, '4.1'].min
+      end
     end
   end
 
@@ -67,6 +70,11 @@ class VIM < Connection
     serviceContent.searchIndex
   end
 
+  # @private
+  def pretty_print pp
+    pp.text "VIM(#{@opts[:host]})"
+  end
+
   @extension_dirs = [File.join(File.dirname(__FILE__), "vim")]
 
   # Directories to search for extensions

metadata

@@ -2,7 +2,7 @@
 name: rbvmomi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Rich Lane
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -07:00
+date: 2011-04-05 00:00:00 -07:00
 default_executable: rbvmomish
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,8 @@ files:
 - bin/rbvmomish
 - devel/analyze-vim-declarations.rb
 - devel/analyze-xml.rb
+- examples/annotate.rb
+- examples/clone_vm.rb
 - examples/create_vm-1.9.rb
 - examples/create_vm.rb
 - examples/extraConfig.rb
@@ -76,6 +78,7 @@ files:
 - examples/run.sh
 - examples/screenshot.rb
 - examples/vdf.rb
+- examples/vm_drs_behavior.rb
 - lib/rbvmomi.rb
 - lib/rbvmomi/basic_types.rb
 - lib/rbvmomi/connection.rb
@@ -134,6 +137,8 @@ signing_key:
 specification_version: 3
 summary: Ruby interface to the VMware vSphere API
 test_files: 
+- examples/annotate.rb
+- examples/clone_vm.rb
 - examples/create_vm-1.9.rb
 - examples/create_vm.rb
 - examples/extraConfig.rb
@@ -144,6 +149,7 @@ test_files:
 - examples/readme-2.rb
 - examples/screenshot.rb
 - examples/vdf.rb
+- examples/vm_drs_behavior.rb
 - test/test_deserialization.rb
 - test/test_emit_request.rb
 - test/test_exceptions.rb