rvc 1.0.3 → 1.1.0

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "rlane@vmware.com"
     #gem.homepage = ""
     gem.authors = ["Rich Lane"]
-    gem.add_dependency 'rbvmomi', '>= 1.2.2'
+    gem.add_dependency 'rbvmomi', '>= 1.2.3'
     gem.add_dependency 'trollop', '>= 1.16.2'
     gem.add_dependency 'backports', '>= 1.18.2'
     #gem.add_dependency 'ffi', '>= 1.0.7'

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

data/lib/rvc/extensions/VirtualMachine.rb

@@ -21,6 +21,7 @@
 class RbVmomi::VIM::VirtualMachine
   def display_info
     config, runtime, guest = collect :config, :runtime, :guest
+    err "Information currently unavailable" unless config and runtime and guest
 
     puts "name: #{config.name}"
     puts "note: #{config.annotation}" if config.annotation and !config.annotation.empty?

data/lib/rvc/modules/host.rb

@@ -27,3 +27,68 @@ end
 def reboot hosts, opts
   tasks hosts, :RebootHost, :force => opts[:force]
 end
+
+
+opts :evacuate do
+  summary "vMotion all VMs away from this host (experimental)"
+  arg :src, nil, :lookup => VIM::HostSystem
+  arg :dst, nil, :lookup => VIM::ComputeResource, :multi => true
+  opt :num, "Maximum concurrent vMotions", :default => 4
+end
+
+def evacuate src, dsts, opts
+  vim = src._connection
+  vms = src.vm
+  dst_hosts = dsts.map(&:host).flatten
+  checks = ['cpu', 'software']
+
+  dst_hosts.reject! { |host| host == src ||
+                             host.runtime.connectionState != 'connected' ||
+                             host.runtime.inMaintenanceMode }
+
+  candidates = {}
+  vms.each do |vm|
+    required_datastores = vm.datastore
+    result = vim.serviceInstance.QueryVMotionCompatibility(:vm => vm,
+                                                           :host => dst_hosts,
+                                                           :compatibility => checks)
+    result.reject! { |x| x.compatibility != checks ||
+                         x.host.datastore & required_datastores != required_datastores }
+    candidates[vm] = result.map { |x| x.host }
+  end
+
+  if candidates.any? { |vm,hosts| hosts.empty? }
+    puts "The following VMs have no compatible vMotion destination:"
+    candidates.select { |vm,hosts| hosts.empty? }.each { |vm,hosts| puts " #{vm.name}" }
+    return
+  end
+
+  tasks = candidates.map do |vm,hosts|
+    host = hosts[rand(hosts.size)]
+    vm.MigrateVM_Task(:host => host, :priority => :defaultPriority)
+  end
+
+  progress tasks
+end
+
+
+opts :enter_maintenance_mode do
+  summary "Put hosts into maintenance mode"
+  arg :host, nil, :lookup => VIM::HostSystem, :multi => true
+  opt :timeout, "Timeout", :default => 0
+end
+
+def enter_maintenance_mode hosts, opts
+  tasks hosts, :EnterMaintenanceMode, :timeout => opts[:timeout]
+end
+
+
+opts :exit_maintenance_mode do
+  summary "Take hosts out of maintenance mode"
+  arg :host, nil, :lookup => VIM::HostSystem, :multi => true
+  opt :timeout, "Timeout", :default => 0
+end
+
+def exit_maintenance_mode hosts, opts
+  tasks hosts, :ExitMaintenanceMode, :timeout => opts[:timeout]
+end

data/lib/rvc/modules/vm.rb

@@ -538,16 +538,25 @@ opts :clone do
   arg :dst, "Path to new VM"
   opt :pool, "Resource pool", :short => 'p', :type => :string, :lookup => VIM::ResourcePool
   opt :host, "Host", :short => 'h', :type => :string, :lookup => VIM::HostSystem
-  opt :template, "Create a template"
+  opt :template, "Create a template", :short => 't'
+  opt :linked, "Create a linked clone", :short => 'l'
   opt :powerOn, "Power on VM after clone"
 end
 
 def clone src, dst, opts
   folder = lookup! File.dirname(dst), VIM::Folder
+  diskMoveType = nil
+
+  if opts[:linked]
+    deltaize_disks src
+    diskMoveType = :moveChildMostDiskBacking
+  end
+
   task = src.CloneVM_Task(:folder => folder,
                           :name => File.basename(dst),
                           :spec => {
                             :location => {
+                              :diskMoveType => diskMoveType,
                               :host => opts[:host],
                               :pool => opts[:pool],
                             },
@@ -558,6 +567,27 @@ def clone src, dst, opts
 end
 
 
+def deltaize_disks vm
+  real_disks = vm.config.hardware.device.grep(VIM::VirtualDisk).select { |x| x.backing.parent == nil }
+  unless real_disks.empty?
+    puts "Reconfiguring source VM to use delta disks..."
+    deviceChange = []
+    real_disks.each do |disk|
+      deviceChange << { :operation => :remove, :device => disk }
+      deviceChange << {
+        :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
+        }
+      }
+    end
+    progress [vm.ReconfigVM_Task(:spec => { :deviceChange => deviceChange })]
+  end
+end
+
 def find_vmx_files ds
   datastorePath = "[#{ds.name}] /"
   searchSpec = {

data/lib/rvc/modules/vmrc.rb

@@ -22,7 +22,11 @@ require 'tmpdir'
 
 VMRC_NAME = "vmware-vmrc-linux-x86-3.0.0"
 VMRC_PKGVER = 1
-VMRC_URL = "https://github.com/downloads/vmware/rvc/#{VMRC_NAME}.#{VMRC_PKGVER}.tar.bz2"
+VMRC_BASENAME = "#{VMRC_NAME}.#{VMRC_PKGVER}.tar.bz2"
+VMRC_URL = "http://cloud.github.com/downloads/vmware/rvc/#{VMRC_BASENAME}"
+VMRC_SHA256 = "cda9ba0b0078aee9a7b9704d720ef4c7d74ae2028efb71815d0eb91a5de75921"
+
+CURL = ENV['CURL'] || 'curl'
 
 def find_local_vmrc
   path = File.join(Dir.tmpdir, VMRC_NAME, 'plugins', 'vmware-vmrc')
@@ -51,8 +55,10 @@ def view vms
     host = vm._connection._host
     fork do
       ENV['https_proxy'] = ENV['HTTPS_PROXY'] = ''
-      $stderr.reopen("#{ENV['HOME']||'.'}/.rvc-vmrc.log", "w")
+      $stderr.reopen("#{ENV['HOME']||'.'}/.rvc-vmrc.log", "a")
       $stderr.puts Time.now
+      $stderr.puts "Using VMRC #{vmrc}"
+      $stderr.flush
       Process.setpgrp
       exec vmrc, '-M', moref,
                  '-h', host,
@@ -66,7 +72,18 @@ opts :install do
 end
 
 def install
+  system "which #{CURL} > /dev/null" or err "curl not found"
+  system "which sha256sum > /dev/null" or err "sha256sum not found"
+  puts "Downloading VMRC..."
+  dir = Dir.mktmpdir
+  vmrc_file = "#{dir}/#{VMRC_BASENAME}"
+  checksum_file = "#{dir}/sha256sums"
+  system "#{CURL} -L #{VMRC_URL} -o #{vmrc_file}" or err "download failed"
+  puts "Checking integrity..."
+  File.open(checksum_file, 'w') { |io| io.puts "#{VMRC_SHA256} *#{vmrc_file}" }
+  system "sha256sum -c #{checksum_file}" or err "integrity check failed"
   puts "Installing VMRC..."
-  system "curl -L #{VMRC_URL} | tar -xj -C #{Dir.tmpdir}" or err("VMRC installation failed")
+  system "tar -xj -f #{vmrc_file} -C #{Dir.tmpdir}" or err("VMRC installation failed")
   puts "VMRC was installed successfully."
+  FileUtils.rm_r dir
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rvc
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Rich Lane
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -07:00
+date: 2011-04-05 00:00:00 -07:00
 default_executable: rvc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
+        version: 1.2.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 83
-        segments: 
-        - 1
-        - 16
-        - 2
         version: 1.16.2
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 91
-        segments: 
-        - 1
-        - 18
-        - 2
         version: 1.18.2
   type: :runtime
   version_requirements: *id003
@@ -117,8 +97,6 @@ files:
 - test/inventory_fixtures.rb
 - test/test_fs.rb
 - test/test_parse_path.rb
-- test/_test_completion.rb
-- test/_test_option_parser.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -133,29 +111,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: vSphere console UI
 test_files: 
-- test/_test_completion.rb
-- test/_test_option_parser.rb
 - test/inventory_fixtures.rb
 - test/test_fs.rb
 - test/test_parse_path.rb

data/test/_test_completion.rb

@@ -1,27 +0,0 @@
-require 'test/unit'
-require 'rvc'
-require 'inventory_fixtures'
-
-class CompletionTest < Test::Unit::TestCase
-  NodeBaz = FixtureNode.new
-  NodeBar = FixtureNode.new
-  NodeFoo = FixtureNode.new('bar' => NodeBar, 'baz' => NodeBaz)
-  Root = FixtureNode.new('foo' => NodeFoo)
-
-  def check word, expected
-    got = RVC::Completion::Completor[word]
-    assert_equal expected, got
-  end
-
-  def setup
-    @context = RVC::Context.new Root
-  end
-
-  def teardown
-    @context = nil
-  end
-
-  def test_simple
-    check 
-  end
-end

data/test/_test_option_parser.rb

@@ -1,6 +0,0 @@
-require 'test/unit'
-require 'rvc'
-require 'inventory_fixtures'
-
-class OptionParserTest < Test::Unit::TestCase
-end