rvc 1.7.0 → 1.8.0

data/Rakefile

@@ -5,8 +5,8 @@ begin
     gem.summary = "vSphere console UI"
     #gem.description = ""
     gem.email = "rlane@vmware.com"
-    #gem.homepage = ""
-    gem.authors = ["Rich Lane"]
+    gem.homepage = "https://github.com/vmware/rvc"
+    gem.authors = ["Rich Lane", "Christian Dickmann"]
     gem.add_dependency 'rbvmomi', '>= 1.6.0'
     gem.add_dependency 'trollop', '>= 1.16.2'
     gem.add_dependency 'backports', '>= 1.18.2'

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.0

data/lib/rvc/completion.rb

@@ -164,7 +164,7 @@ class Completion
     base = absolute ? @shell.fs.root : @shell.fs.cur
     cur = @shell.fs.traverse(base, arcs).first or return []
     arcs.unshift '' if absolute
-    children = @cache[cur, :children] rescue []
+    children = @cache[cur, :rvc_children] rescue []
     children.
       select { |k,v| k.gsub(' ', '\\ ') =~ /^#{Regexp.escape(last)}/ }.
       map { |k,v| (arcs+[k])*'/' }.

data/lib/rvc/extensions/ClusterComputeResource.rb

@@ -39,4 +39,15 @@ class RbVmomi::VIM::ClusterComputeResource
   def rvc_host_children
     RVC::Util.collect_children self, :host
   end
+
+  def display_info
+    super
+    pc = _connection.serviceContent.propertyCollector
+    cfg, = collect 'configurationEx'
+    drs = cfg.drsConfig
+    ha = cfg.dasConfig
+    puts "DRS: #{drs.enabled ? drs.defaultVmBehavior : 'disabled'}"
+    puts "HA: #{ha.enabled ? 'enabled' : 'disabled'}"
+    puts "VM Swap Placement: #{cfg.vmSwapPlacement}"
+  end
 end

data/lib/rvc/extensions/ComputeResource.rb

@@ -21,15 +21,19 @@
 class RbVmomi::VIM::ComputeResource
   # TODO expand, optimize
   def display_info
+    pc = _connection.serviceContent.propertyCollector
+    name, host = collect 'name', 'host'
     stats = self.stats
     pct_cpu_used = 100.0*stats[:usedCPU]/stats[:totalCPU]
     pct_mem_used = 100.0*stats[:usedMem]/stats[:totalMem]
     puts "name: #{name}"
     puts "cpu: #{stats[:totalCPU]/1e3} GHz (#{pct_cpu_used.to_i}% used)"
     puts "memory: #{stats[:totalMem]/1e3} GB (#{pct_mem_used.to_i}% used)"
+
+    host_names = pc.collectMultiple host, 'name'
     puts "hosts:"
     host.each do |h|
-      puts " #{h.name}"
+      puts " #{host_names[h]['name']}"
     end
   end
 

data/lib/rvc/extensions/Datacenter.rb

@@ -36,7 +36,7 @@ class RbVmomi::VIM::Datacenter
 
   # For compatibility with previous RVC versions
   def traverse_one arc
-    children = self.children
+    children = self.rvc_children
     return children[arc] if children.member? arc
     if arc == 'vm' then return vmFolder
     elsif arc == 'datastore' then return datastoreFolder

data/lib/rvc/extensions/HostSystem.rb

@@ -41,6 +41,21 @@ class RbVmomi::VIM::HostSystem
     property 'runtime.powerState'
   end
 
+  field 'state.maintenancemode' do
+    summary "Host maintenance mode."
+    property 'runtime.inMaintenanceMode'
+  end
+
+  field 'build' do
+    summary "ESX build number."
+    property 'summary.config.product.build'
+  end
+
+  field 'productname' do
+    summary "ESX product name."
+    property 'summary.config.product.fullName'
+  end
+
   field 'uptime' do
     summary "Host's uptime in days"
     properties %w(runtime.bootTime)

data/lib/rvc/extensions/VirtualMachine.rb

@@ -155,6 +155,7 @@ class RbVmomi::VIM::VirtualMachine
     puts "hostname: #{guest.hostName} (#{guest.ipAddress})" if guest.hostName and guest.ipAddress
     puts "VC UUID: #{config.instanceUuid}" if config.instanceUuid and !config.instanceUuid.empty?
     puts "power: #{runtime.powerState}"
+    puts "connectionState: #{runtime.connectionState}"
     if runtime.question
       puts "question: #{runtime.question.text.lines.to_a.join("> ")}"
       puts "choices: #{runtime.question.choice.choiceInfo.map(&:label) * ', '}"
@@ -190,11 +191,15 @@ class RbVmomi::VIM::VirtualMachine
   end
 
   def self.ls_properties
-    %w(name runtime.powerState)
+    %w(name runtime.powerState runtime.connectionState)
   end
   
   def ls_text r
-    ": #{r['runtime.powerState']}"
+    out = ": #{r['runtime.powerState']}"
+    if r['runtime.connectionState'] != 'connected'
+      out = "#{out}, #{r['runtime.connectionState']}"
+    end
+    out
   end
 
   def children

data/lib/rvc/fs.rb

@@ -78,10 +78,10 @@ class FS
       end
     when REGEX_PATTERN
       regex = Regexp.new($')
-      cur.children.select { |k,v| k =~ regex }.map { |k,v| v.rvc_link(cur, k); v }
+      cur.rvc_children.select { |k,v| k =~ regex }.map { |k,v| v.rvc_link(cur, k); v }
     when GLOB_PATTERN
       regex = glob_to_regex arc
-      cur.children.select { |k,v| k =~ regex }.map { |k,v| v.rvc_link(cur, k); v }
+      cur.rvc_children.select { |k,v| k =~ regex }.map { |k,v| v.rvc_link(cur, k); v }
     else
       # XXX check for ambiguous child
       if first and arc =~ /^\d+$/ and objs = @marks[arc]

data/lib/rvc/inventory.rb

@@ -65,12 +65,20 @@ module InventoryObject
   end
 
   def traverse_one arc
-    children[arc]
+    rvc_children[arc]
   end
 
   def children
     {}
   end
+  
+  def rvc_children
+    out = self.children
+    methods.grep(/rvc_list_children_/).each do |method|
+      out.merge!(self.send(method))
+    end
+    out
+  end
 
   def rvc_path
     [].tap do |a|

data/lib/rvc/modules/basic.rb

@@ -146,7 +146,7 @@ def ls obj
     return obj.rvc_ls
   end
 
-  children = obj.children
+  children = obj.rvc_children
   name_map = children.invert
   children, fake_children = children.partition { |k,v| v.is_a? VIM::ManagedEntity }
   i = 0
@@ -265,6 +265,9 @@ def info obj
   puts "path: #{obj.rvc_path_str}"
   if obj.respond_to? :display_info
     obj.display_info
+    obj.methods.grep(/rvc_display_info_/).sort.each do |method|
+      obj.send(method)
+    end
   else
     puts "class: #{obj.class.name}"
   end

data/lib/rvc/modules/cluster.rb

@@ -75,17 +75,61 @@ end
 
 opts :configure_ha do
   summary "Configure HA on a cluster"
-  arg :cluster, nil, :lookup => VIM::ClusterComputeResource
+  arg :cluster, nil, :lookup => VIM::ClusterComputeResource, :multi => true
   opt :disabled, "Disable HA", :default => false
 end
 
-def configure_ha cluster, opts
+def configure_ha clusters, opts
   spec = VIM::ClusterConfigSpecEx(
     :dasConfig => {
       :enabled => !opts[:disabled],
     }
   )
-  one_progress(cluster.ReconfigureComputeResource_Task :spec => spec, :modify => true)
+  tasks = clusters.map do |cluster|
+    cluster.ReconfigureComputeResource_Task(:spec => spec, :modify => true)
+  end
+  progress(tasks)
+  childtasks = tasks.map{|t| t.child_tasks}.flatten.compact
+  if childtasks && childtasks.length > 0
+    progress(childtasks)
+  end
+  
+end
+
+opts :configure_drs do
+  summary "Configure DRS on a cluster"
+  opt :disabled, "Disable HA", :default => false
+  opt :mode, "DRS mode (manual, partiallyAutomated, fullyAutomated)", :type => :string
+  arg :cluster, "Path to a Cluster", :lookup => VIM::ClusterComputeResource, :multi => true
+end
+
+def configure_drs clusters, opts
+  clusterSpec = VIM::ClusterConfigSpecEx(
+    :drsConfig => {
+      :defaultVmBehavior => opts[:mode] ? opts[:mode].to_sym : nil, 
+      :enabled => !opts[:disabled]
+    }
+  )
+  tasks = clusters.map do |cluster|
+    cluster.ReconfigureComputeResource_Task(:modify => true, :spec => clusterSpec)
+  end
+  progress(tasks)
+end
+
+opts :configure_swap do
+  summary "Configure VM Swap Placement on a cluster"
+  opt :mode, "Swap mode (hostLocal, vmDirectory)", :type => :string
+  arg :cluster, "Path to a Cluster", :lookup => VIM::ClusterComputeResource, :multi => true
+end
+
+def configure_swap clusters, opts
+  clusterSpec = VIM::ClusterConfigSpecEx(
+    :vmSwapPlacement => opts[:mode]
+  )
+  tasks = clusters.map do |cluster|
+    cluster.ReconfigureComputeResource_Task(:modify => true, :spec => clusterSpec)
+  end
+  progress(tasks)
 end
 
 opts :recommendations do
@@ -109,30 +153,41 @@ def recommendations cluster
   name_map = pc.collectMultiple(targets, 'name')
 
   # Compose the output (tries to avoid making any API calls)
-  out = Terminal::Table.new(['Key', 'Reason', 'Target', 'Actions']) do
-    recommendation.each do |r|
-      target_name = r.target ? name_map[r.target]['name'] : ""
-      actions = r.action.map do |a|
-        action = "#{a.class.wsdl_name}: #{name_map[a.target]['name']}"
-        dst = nil
-        if a.is_a?(RbVmomi::VIM::ClusterMigrationAction)
-          dst = a.drsMigration.destination
-        end
-        if a.is_a?(RbVmomi::VIM::StorageMigrationAction)
-          dst = a.destination
-        end
-        if dst
-          if !name_map[dst]
-            name_map[dst] = {'name' => dst.name}
-          end
-          action += " (to #{name_map[dst]['name']})"
+  t = Terminal::Table.new()
+  t << ['Key', 'Reason', 'Target', 'Actions']
+  recommendation.each do |r|
+    target_name = r.target ? name_map[r.target]['name'] : ""
+    actions = r.action.map do |a|
+      action = "#{a.class.wsdl_name}: #{name_map[a.target]['name']}"
+      dst = nil
+      if a.is_a?(RbVmomi::VIM::ClusterMigrationAction)
+        dst = a.drsMigration.destination
+      end
+      if a.is_a?(RbVmomi::VIM::StorageMigrationAction)
+        dst = a.destination
+      end
+      if dst
+        if !name_map[dst]
+          name_map[dst] = {'name' => dst.name}
         end
-        action
+        action += " (to #{name_map[dst]['name']})"
       end
-      add_row [r.key, r.reasonText, target_name, actions.join("\n")]
+      action
     end
+    t << [r.key, r.reasonText, target_name, actions.join("\n")]
+  end
+  puts t
+end
+
+def _filtered_cluster_recommendations cluster, key, type
+  recommendation = cluster.recommendation
+  if key && key.length > 0
+    recommendation.select! { |x| key.member?(x.key) }
   end
-  puts out
+  if type && type.length > 0
+    recommendation.select! { |x| (type & x.action.map { |y| y.class.wsdl_name }).length > 0 }
+  end
+  recommendation
 end
 
 opts :apply_recommendations do
@@ -144,13 +199,9 @@ end
 
 def apply_recommendations cluster, opts
   pc = cluster._connection.serviceContent.propertyCollector
-  recommendation = cluster.recommendation
-  if opts[:key] && opts[:key].length > 0
-    recommendation.select! { |x| opts[:key].member?(x.key) }
-  end
-  if opts[:type] && opts[:type].length > 0
-    recommendation.select! { |x| (opts[:type] & x.action.map { |y| y.class.wsdl_name }).length > 0 }
-  end
+  recommendation = _filtered_cluster_recommendations(
+    cluster, opts[:key], opts[:type]
+  )
   all_tasks = []
 
   # We do recommendations in chunks, because VC can't process more than a
@@ -160,16 +211,26 @@ def apply_recommendations cluster, opts
   # exceed the screensize with queued tasks
   while recommendation.length > 0
     recommendation.pop(20).each do |r|
-      targets = r.action.map { |y| y.target }
-      recent_tasks = pc.collectMultiple(targets, 'recentTask')
-      prev_tasks = targets.map { |x| recent_tasks[x]['recentTask'] }
-      cluster.ApplyRecommendation(:key => r.key)
-      recent_tasks = pc.collectMultiple(targets, 'recentTask')
-      tasks = targets.map { |x| recent_tasks[x]['recentTask'] }
-      all_tasks += (tasks.flatten - prev_tasks.flatten)
+      begin 
+        targets = r.action.map { |y| y.target }
+        recent_tasks = pc.collectMultiple(targets, 'recentTask')
+        prev_tasks = targets.map { |x| recent_tasks[x]['recentTask'] }
+        cluster.ApplyRecommendation(:key => r.key)
+        recent_tasks = pc.collectMultiple(targets, 'recentTask')
+        tasks = targets.map { |x| recent_tasks[x]['recentTask'] }
+        all_tasks += (tasks.flatten - prev_tasks.flatten)
+      rescue VIM::InvalidArgument
+      end
+    end
+
+    if all_tasks.length > 0
+      progress all_tasks
+      all_tasks = []
     end
 
-    progress all_tasks
+    recommendation = _filtered_cluster_recommendations(
+      cluster, opts[:key], opts[:type]
+    )
   end
 end
 

data/lib/rvc/modules/connection.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'rvc/vim'
+
 opts :switch do
   summary "Switch to another connection"
   arg :name, "Connection name"

data/lib/rvc/modules/device.rb

@@ -103,6 +103,41 @@ def add_net vm, network, opts
 end
 
 
+opts :reconfig_net do
+  summary "Attach a network adapter to a different network"
+  arg :device, nil, :lookup => VIM::VirtualDevice, :multi => true
+  opt :network, "Network to attach to", :lookup => VIM::Network, :required => true
+end
+
+def reconfig_net devs, opts
+  network = opts[:network]
+  case network
+  when VIM::DistributedVirtualPortgroup
+    switch, pg_key = network.collect 'config.distributedVirtualSwitch', 'key'
+    port = VIM.DistributedVirtualSwitchPortConnection(
+      :switchUuid => switch.uuid,
+      :portgroupKey => pg_key)
+    summary = network.name
+    backing = VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(:port => port)
+  when VIM::Network
+    summary = network.name
+    backing = VIM.VirtualEthernetCardNetworkBackingInfo(:deviceName => network.name)
+  else fail
+  end
+
+  vm_devs = devs.group_by(&:rvc_vm)
+  tasks = vm_devs.map do |vm,my_devs|
+    device_changes = my_devs.map do |dev|
+      dev = dev.dup
+      dev.backing = backing
+      { :operation => :edit, :device => dev }
+    end
+    spec = { :deviceChange => device_changes }
+    vm.ReconfigVM_Task(:spec => spec)
+  end
+  progress(tasks)
+end
+
 opts :add_disk do
   summary "Add a hard drive to a virtual machine"
   arg :vm, nil, :lookup => VIM::VirtualMachine
@@ -110,6 +145,7 @@ opts :add_disk do
   opt :size, 'Size', :default => '10G'
   opt :controller, 'Virtual controller', :type => :string, :lookup => VIM::VirtualController
   opt :file_op, 'File operation (create|reuse|replace)', :default => 'create'
+  opt :thick, "Use thick provisioning", :type => :boolean
 end
 
 def add_disk vm, path, opts
@@ -130,7 +166,7 @@ def add_disk vm, path, opts
     :backing => VIM.VirtualDiskFlatVer2BackingInfo(
       :fileName => filename,
       :diskMode => :persistent,
-      :thinProvisioned => true
+      :thinProvisioned => !(opts[:thick] == true),
     ),
     :capacityInKB => MetricNumber.parse(opts[:size]).to_i/1000,
     :controllerKey => controller.key,

data/lib/rvc/modules/diagnostics.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'rvc/vim'
+
 DEFAULT_SERVER_PLACEHOLDER = '0.0.0.0'
 
 def wait_for_multiple_tasks tasks, timeout
@@ -48,6 +50,80 @@ def wait_for_multiple_tasks tasks, timeout
   results
 end
 
+# http://stackoverflow.com/questions/3386233/how-to-get-exit-status-with-rubys-netssh-library
+def ssh_exec!(ssh, command)
+  stdout_data = ""
+  stderr_data = ""
+  exit_code = nil
+  exit_signal = nil
+  ssh.open_channel do |channel|
+    channel.exec(command) do |ch, success|
+      unless success
+        abort "FAILED: couldn't execute command (ssh.channel.exec)"
+      end
+      channel.on_data do |ch,data|
+        stdout_data+=data
+      end
+
+      channel.on_extended_data do |ch,type,data|
+        stderr_data+=data
+      end
+
+      channel.on_request("exit-status") do |ch,data|
+        exit_code = data.read_long
+      end
+
+    end
+  end
+  ssh.loop
+  [stdout_data, stderr_data, exit_code]
+end
+
+opts :restart_services do
+  summary "Restart all services in hosts"
+  arg :cluster, nil, :lookup => VIM::ComputeResource, :multi => true
+  opt :host, "Host name (multi ok)", type: :string, short: 'n', :multi => true
+  opt :password, "Host password (multi ok)", type: :string, short: 'p', :multi => true
+end
+
+def restart_services clusters, opts
+  hosts = opts[:host]
+  pwds = opts[:password]
+  puts "Need to specify password(s) for fixing" if pwds == []
+
+  hosts.each do |host|
+    finished = false
+    pwds.each do |pwd|
+      break if finished
+      puts "\nTrying restart #{host} with pwd #{pwd}"
+      begin
+        Net::SSH.start(host, "root", :password => pwd, :paranoid => false) do |ssh|
+          # HZ 1258412 discusses the commands to fix a node with hostd problems
+          cmd = "/sbin/chkconfig usbarbitrator off"
+          puts "Running #{cmd}"
+          out = ssh_exec!(ssh,cmd)
+          if out[2] != 0
+            puts "Failed to execute #{cmd} on host #{host}"
+            puts out[1]
+          end
+
+          cmd = "/sbin/services.sh restart > /tmp/restart_services.log 2>&1"
+          puts "Running #{cmd}"
+          out = ssh_exec!(ssh,cmd)
+          if out[2] != 0
+            puts "Failed to restart all services on host #{host}"
+            puts out[1]
+          else
+            puts "Host #{host} restarted all services"
+            finished = true
+          end
+        end
+      rescue Net::SSH::AuthenticationFailed
+        puts "Failed to authenticate on host #{host}"
+      end
+    end
+  end
+end
 
 opts :vm_create do
   summary "Check that VMs can be created on all hosts in a cluster"
@@ -55,6 +131,8 @@ opts :vm_create do
   opt :datastore, "Datastore to put (temporary) VMs on", :lookup => VIM::Datastore
   opt :vm_folder, "VM Folder to place (temporary) VMs in", :lookup => VIM::Folder
   opt :timeout, "Time to wait for VM creation to finish", :type => :int, :default => 3 * 60
+  opt :fix, "Fix the failing ESX hosts", :type => :boolean , :default => false
+  opt :password, "Passwords for fixing hosts", :type => :string, short: 'p', :multi => true
 end
 
 def vm_create clusters, opts
@@ -64,15 +142,34 @@ def vm_create clusters, opts
   err "vm_folder is a required parameter" unless vm_folder
 
   puts "Creating one VM per host ... (timeout = #{opts[:timeout]} sec)"
-  result = _vm_create clusters, datastore, vm_folder, opts
-
-  errors = result.select{|h, x| x['status'] != 'green'}
-  errors.each do |host, info|
-    puts "Failed to create VM on host #{host} (in cluster #{info['cluster']}): #{info['error']}"
+  errors = []
+  failed_hosts = []
+  begin
+    result = _vm_create clusters, datastore, vm_folder, opts
+    errors = result.select{|h, x| x['status'] != 'green'}
+    errors.each do |host, info|
+      puts "Failed to create VM on host #{host} (in cluster #{info['cluster']}): #{info['error']}"
+      err_msgs = ["Timed out", "InvalidState", "InvalidHostState", "InvalidHostConnectionState", "HostCommunication"]
+      err_msgs.each do |msg|
+        if info['error'].include? msg
+          failed_hosts << host
+          break
+        end
+      end
+    end
+  rescue Exception => e
+    puts "An error occurred:\n"
+    puts "e.message:", e.message
+    puts "e.backtrace:", e.backtrace.join("\n")
+    errors = [e]
   end
   if errors.length == 0
     puts "Success"
   end
+  if opts[:fix] && failed_hosts != []
+    opts[:host] = failed_hosts
+    restart_services(clusters, opts)
+  end
 end
 
 def _vm_create clusters, datastore, vm_folder, opts = {}
@@ -99,6 +196,7 @@ def _vm_create clusters, datastore, vm_folder, opts = {}
         :files => { :vmPathName => datastore_path },
         :numCPUs => 1,
         :memoryMB => 16,
+        :annotation => YAML.dump({'lease' => Time.now + 2 * opts[:timeout] + 60}),
         :deviceChange => [
           {
             :operation => :add,
@@ -118,11 +216,15 @@ def _vm_create clusters, datastore, vm_folder, opts = {}
           }
         ],
       }
-      task = vm_folder.CreateVM_Task(:config => config,
-                                     :pool => rp,
-                                     :host => host)
-      tasks_map[task] = host
-      hosts_infos[host][:create_task] = task
+      begin
+        task = vm_folder.CreateVM_Task(:config => config,
+                                       :pool => rp,
+                                       :host => host)
+        tasks_map[task] = host
+        hosts_infos[host][:create_task] = task
+      rescue
+        puts "Failed to create task for host #{host.name}"
+      end
     end
   end
   
@@ -148,6 +250,7 @@ def _vm_create clusters, datastore, vm_folder, opts = {}
 
     result = host_info[:create_result]
     result = host_info[:destroy_result] if result.is_a?(VIM::VirtualMachine)
+    error_detail = nil
     if result == nil
       error_str = nil
       status = 'green'
@@ -157,12 +260,17 @@ def _vm_create clusters, datastore, vm_folder, opts = {}
     else
       error_str = "#{result.fault.class.wsdl_name}: #{result.localizedMessage}"
       status = 'red'
+      begin
+        error_detail = result.fault.faultMessage
+      rescue
+      end
     end
 
     out[host_props['name']] = {
       'cluster' => cluster_props['name'],
       'status' => status,
-      'error' => error_str
+      'error' => error_str,
+      'error_detail' => error_detail,
     }    
   end
   out