rvc 1.7.0 → 1.8.0

data/lib/rvc/modules/syslog.rb

@@ -0,0 +1,103 @@
+# Copyright (c) 2013 VMware, Inc.  All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'rvc/vim'
+
+begin
+  require 'net/ssh'
+rescue LoadError
+end
+
+opts :config_syslog do
+  summary "Configure Syslog"
+  arg :entity, nil, :lookup => [VIM, VIM::HostSystem, VIM::ComputeResource, VIM::ClusterComputeResource]
+  arg :ip, nil, :type => :string
+  opt :vc_root_pwd, "VC root password for SSH access", :default => "vmware"
+end
+
+def config_syslog entity, ip, opts
+  if entity.is_a?(VIM)
+    puts "#{Time.now}: Finding all Hosts inside VC"
+    $shell.fs.marks['vcrvc'] = entity
+    hosts = []
+    hosts += $shell.fs.lookup("~vcrvc/*/computers/*/host")
+    hosts += $shell.fs.lookup("~vcrvc/*/computers/*/hosts/*")
+  elsif entity.is_a?(VIM::ComputeResource)
+    hosts = entity.host
+  else
+    hosts = [entity]
+  end
+  if hosts.length == 0
+    err "No hosts found"
+  end
+  conn = hosts.first._connection
+  pc = conn.propertyCollector
+  
+  lock = Mutex.new
+  hosts_props = pc.collectMultiple(hosts,
+    'name', 
+    'runtime.connectionState',
+  )
+  connected_hosts = hosts_props.select do |k,v| 
+    v['runtime.connectionState'] == 'connected'
+  end.keys
+  host = connected_hosts.first
+  if !connected_hosts.first
+    err "Couldn't find any connected hosts"
+  end
+
+  puts "#{Time.now}: Configuring all ESX hosts ..."
+  loghost = "udp://#{ip}:514"
+  hosts.map do |host|
+    Thread.new do
+      begin 
+        c1 = conn.spawn_additional_connection
+        host  = host.dup_on_conn(c1)
+        hostName = host.name
+        lock.synchronize do 
+          puts "#{Time.now}: Configuring syslog on #{hostName}"
+        end
+        syslog = host.esxcli.system.syslog
+        syslog.config.set(:loghost => loghost)
+        syslog.reload
+      rescue Exception => ex
+        puts "#{Time.now}: #{host.name}: Got exception: #{ex.class}: #{ex.message}"
+      end
+    end
+  end.each{|t| t.join}
+  puts "#{Time.now}: Done configuring syslog on all hosts"
+  
+  local = "#{File.dirname(__FILE__)}/configurevCloudSuiteSyslog.sh"
+  osType = conn.serviceContent.about.osType
+  if File.exists?(local) && osType == "linux-x64"
+    puts "#{Time.now}: Configuring VCVA ..."
+    Net::SSH.start(conn.host, "root", :password => opts[:vc_root_pwd], 
+                   :paranoid => false) do |ssh|
+      ssh.scp.upload!(local, "/tmp/configurevCloudSuiteSyslog.sh")
+      cmd = "sh /tmp/configurevCloudSuiteSyslog.sh vcsa #{ip}"
+      puts "#{Time.now}: Running '#{cmd}' on VCVA"
+      puts ssh.exec!(cmd)
+    end
+    puts "#{Time.now}: Done with VC"
+  else
+    puts "#{Time.now}: VC isn't Linux, skipping ..."
+  end
+  puts "#{Time.now}: Done"
+end

data/lib/rvc/modules/vds.rb

@@ -636,10 +636,10 @@ end
 opts :create_vmknic do
   summary "Create a vmknic on vDS on one or more hosts. Always uses DHCP"
   arg :portgroup, nil, :lookup => VIM::Network
-  arg :host, nil, :lookup => VIM::HostSystem, :multi => true
+  arg :hosts, nil, :lookup => VIM::HostSystem, :multi => true
 end
 
-def create_vmknic portgroup, hosts, opts
+def create_vmknic portgroup, hosts
   if !portgroup.is_a?(VIM::DistributedVirtualPortgroup)
     err "Legacy switches not supported yet"
   end
@@ -660,3 +660,60 @@ def create_vmknic portgroup, hosts, opts
     puts "Host #{host.name}: Added vmknic #{vmknic_name}"
   end
 end
+
+opts :migrate_vmknic do
+  summary "Migrate a vmknic from a standard vSwitch to a vDS."
+  arg :host, nil, :lookup => VIM::HostSystem
+  arg :vmknic, nil
+  arg :portgroup, nil, :lookup => VIM::Network
+end
+
+def migrate_vmknic host, vmknic, portgroup
+  if !portgroup.is_a?(VIM::DistributedVirtualPortgroup)
+    err "Only migration from standard to a distributed vSwitch is supported for now."
+  end
+  ns = host.configManager.networkSystem
+
+  # Find the VMkernel interface.
+  vmk_dev = nil
+  ns.networkInfo.vnic.each do |vnic|
+    if vnic.device == vmknic
+      vmk_dev = vnic
+      break
+    end
+  end
+
+  # Find the source portgroup.
+  src_pg = nil
+  ns.networkInfo.portgroup.each do |pg|
+    if pg.spec.name == vmk_dev.portgroup
+      src_pg = pg
+      break
+    end
+  end
+
+  ns.UpdateNetworkConfig(
+    changeMode: 'modify',
+    config: VIM::HostNetworkConfig(
+      portgroup: [
+        VIM::HostPortGroupConfig(
+          changeOperation: 'remove',
+          spec: src_pg.spec
+        )
+      ],
+      vnic: [
+        VIM::HostVirtualNicConfig(
+          changeOperation: 'edit',
+          device: vmknic,
+          portgroup: src_pg.spec.name,
+          spec: VIM::HostVirtualNicSpec(
+            distributedVirtualPort: VIM::DistributedVirtualSwitchPortConnection(
+              portgroupKey: portgroup.key,
+              switchUuid: portgroup.config.distributedVirtualSwitch.uuid
+            )
+          )
+        )
+      ]
+    )
+  )
+end

data/lib/rvc/modules/vim.rb

@@ -81,7 +81,7 @@ def connect uri, opts
     if env_rev && env_rev.to_f == 0
       vim.rev = env_rev
     else
-      vim.rev = [rev, env_rev || '5.1'].min
+      vim.rev = [rev, env_rev || '5.5'].min
     end
   end
 

data/lib/rvc/modules/vm.rb

@@ -103,7 +103,25 @@ opts :shutdown_guest do
 end
 
 def shutdown_guest vms, opts
-  vms.each(&:ShutdownGuest)
+  conn = vms.first._connection
+  pc = conn.propertyCollector
+  vmsProps = pc.collectMultiple(vms, 'runtime.powerState', 
+                                'guest.toolsRunningStatus', 'name')
+  vms.each do |vm|
+    if vmsProps[vm]['runtime.powerState'] != 'poweredOn'
+      puts "VM #{vmsProps[vm]['name']} not powered on, skipping"
+      next
+    end
+    if vmsProps[vm]['guest.toolsRunningStatus'] != 'guestToolsRunning'
+      puts "VM #{vmsProps[vm]['name']} doesn't have tools running, skipping"
+      next
+    end
+    begin
+      vm.ShutdownGuest
+    rescue Exception => ex
+      puts "VM #{vmsProps[vm]['name']}: #{ex.class}: #{ex.message}"
+    end
+  end
   wait_for_shutdown vms, opts unless opts[:timeout].nil?
 end
 
@@ -274,7 +292,16 @@ rvc_alias :kill
 rvc_alias :kill, :k
 
 def kill vms
-  on_vms = vms.select { |x| x.summary.runtime.powerState == 'poweredOn' }
+  on_vms = []
+  vms.each do |vm|
+    begin
+      if vm.summary.runtime.powerState == 'poweredOn'
+        on_vms.push(vm)
+      end
+    rescue Exception => ex
+      puts "vm.rb:kill: Skipping current object #{vm} due to Exception: #{ex.message}"
+    end
+  end
   off on_vms unless on_vms.empty?
   shell.cmds.basic.destroy vms unless vms.empty?
 end
@@ -516,6 +543,7 @@ opts :clone do
   opt :host, "Host", :short => 'o', :type => :string, :lookup => VIM::HostSystem
   opt :template, "Create a template", :short => 't'
   opt :linked, "Create a linked clone", :short => 'l'
+  opt :customizationspecname, "Customization spec", :type => :string, :short => 's'
   opt :power_on, "Power on VM after clone"
 end
 
@@ -528,9 +556,19 @@ def clone src, dst, opts
     diskMoveType = :moveChildMostDiskBacking
   end
 
+  if opts[:customizationspecname]
+     begin
+        spec = src._connection.serviceContent.customizationSpecManager.GetCustomizationSpec(:name => opts[:customizationspecname]).spec
+     rescue
+        print "Customization Spec '#{opts[:customizationspecname]}'  not found\n"
+        return
+     end
+  end
+
   task = src.CloneVM_Task(:folder => folder,
                           :name => name,
                           :spec => {
+                            :customization => spec,
                             :location => {
                               :diskMoveType => diskMoveType,
                               :host => opts[:host],
@@ -574,15 +612,26 @@ def annotate vm, str
   vm.ReconfigVM_Task(:spec => { :annotation => str }).wait_for_completion
 end
 
-
 opts :modify_cpu do
   summary "Change CPU configuration"
   arg :vm, nil, :lookup => VIM::VirtualMachine
   opt :num, "New number of CPUs", :type => :int, :required => true
+  opt :reservation, "Reservation in Mhz", :type => :int
+  opt :limit, "Limit in Mhz. -1 means no limit", :type => :int
 end
 
 def modify_cpu vm, opts
-  spec = { :numCPUs => opts[:num] }
+  alloc, = vm.collect 'config.cpuAllocation'
+  if opts[:reservation]
+    alloc.reservation = opts[:reservation]
+  end
+  if opts[:limit]
+    alloc.limit = opts[:limit]
+  end
+  spec = { 
+    :numCPUs => opts[:num],
+    :cpuAllocation => alloc, 
+  }
   tasks [vm], :ReconfigVM, :spec => spec
 end
 
@@ -591,12 +640,26 @@ opts :modify_memory do
   summary "Change memory configuration"
   arg :vm, nil, :lookup => VIM::VirtualMachine
   opt :size, "New memory size in MB", :type => :int, :required => true
+  opt :reservation, "Reservation in MB", :type => :int
+  opt :limit, "Limit in MB. -1 means no limit", :type => :int
 end
 
 def modify_memory vm, opts
-  err "VM needs to be off" unless vm.summary.runtime.powerState == 'poweredOff'
   err "memory must be a multiple of 4MB" unless ( opts[:size]  % 4 ) == 0
-  spec = { :memoryMB => opts[:size] }
+
+  #alloc, = vm.collect 'config.memoryAllocation'
+  alloc = VIM::ResourceAllocationInfo()
+  if opts[:reservation]
+    alloc.reservation = opts[:reservation]
+  end
+  if opts[:limit]
+    alloc.limit = opts[:limit]
+  end
+
+  spec = { 
+    :memoryMB => opts[:size], 
+    :memoryAllocation => alloc, 
+  }
   tasks [vm], :ReconfigVM, :spec => spec
 end
 
@@ -630,7 +693,7 @@ def vm_ip vm
 
   ip = if summary.guest.ipAddress and summary.guest.ipAddress != '127.0.0.1'
     summary.guest.ipAddress
-  elsif note = YAML.load(summary.config.annotation) and note.is_a? Hash and note.member? 'ip'
+  elsif note = YAML.load(summary.config.annotation) and note.is_a? Hash and note['ip']
     note['ip']
   else
     err "no IP known for this VM"

data/lib/rvc/modules/vm_guest.rb

@@ -1,30 +1,54 @@
+# Copyright (c) 2013 VMware, Inc.  All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'rvc/vim'
+
 opts :authenticate do
   summary "Authenticate within guest"
-  arg :vm, nil, :lookup => VIM::VirtualMachine
+  arg :vm, nil, :lookup => VIM::VirtualMachine, :multi => true
   opt :interactive_session, "Allow command to interact with desktop", :default => false, :type => :bool
   opt :password, "Password in guest", :type => :string
   opt :username, "Username in guest", :default => "root", :type => :string
 end
 
-def authenticate vm, opts
-  auth = ((@auths ||= {})[vm] ||= {})[opts[:username]]
-
-  if opts[:password].nil? or opts[:password].empty?
-    opts[:password] = ask("password: ") { |q| q.echo = false }
-  end
-
-  auth = VIM.NamePasswordAuthentication(
-    :username => opts[:username],
-    :password => opts[:password],
-    :interactiveSession => opts[:interactive_session]
-  )
-
-  @auths[vm][opts[:username]] = auth
-  begin
-    check_auth vm, opts
-  rescue
-    clear_auth vm, opts
-    err "Could not authenticate: #{$!}"
+def authenticate vms, opts
+  vms.each do |vm|
+    auth = ((@auths ||= {})[vm] ||= {})[opts[:username]]
+  
+    if opts[:password].nil? or opts[:password].empty?
+      opts[:password] = ask("password: ") { |q| q.echo = false }
+    end
+  
+    auth = VIM.NamePasswordAuthentication(
+      :username => opts[:username],
+      :password => opts[:password],
+      :interactiveSession => opts[:interactive_session]
+    )
+  
+    @auths[vm][opts[:username]] = auth
+    begin
+      check_auth vm, opts
+    rescue
+      clear_auth vm, opts
+      err "Could not authenticate: #{$!}"
+    end
   end
 end
 
@@ -240,6 +264,67 @@ def rmfile vm, opts
     )
 end
 
+def generic_http_download uri, local_path
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = true
+  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  #http.set_debug_output $stderr
+  http.start
+
+#  headers = { 'cookie' => connection.cookie }
+  headers = {}
+  http_path = "#{uri.path}?#{uri.query}"
+  http.request_get(http_path, headers) do |res|
+    case res
+    when Net::HTTPOK
+      len = res.content_length
+      count = 0
+      File.open(local_path, 'wb') do |io|
+        res.read_body do |segment|
+          count += segment.length
+          io.write segment
+          $stdout.write "\e[0G\e[Kdownloading #{count}/#{len} bytes (#{(count*100)/len}%)"
+          $stdout.flush
+        end
+      end
+      $stdout.puts
+    else
+      err "download failed: #{res.message}"
+    end
+  end
+end
+  
+def generic_http_upload local_path, uri, size = nil
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = true
+  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  #http.set_debug_output $stderr
+  http.start
+
+
+  open(local_path, 'rb') do |io|
+    stream = ProgressStream.new(io, size || io.stat.size) do |s|
+      $stdout.write "\e[0G\e[Kuploading #{s.count}/#{s.len} bytes (#{(s.count*100)/s.len}%)"
+      $stdout.flush
+    end
+
+    headers = {
+      'content-length' => (size || io.stat.size).to_s,
+      'Content-Type' => 'application/octet-stream',
+    }
+    http_path = "#{uri.path}?#{uri.query}"
+
+    request = Net::HTTP::Put.new http_path, headers
+    request.body_stream = stream
+    res = http.request(request)
+    $stdout.puts
+    case res
+    when Net::HTTPOK
+    else
+      err "upload failed: #{res.message}"
+    end
+  end
+end
 
 opts :download_file do
   summary "Download file from guest"
@@ -265,14 +350,14 @@ def download_file vm, opts
 
   download_uri = URI.parse(download_url.gsub /http(s?):\/\/\*:[0-9]*/, "")
   download_path = "#{download_uri.path}?#{download_uri.query}"
-
-  http_download vm._connection, download_path, opts[:local_path]
+  
+  generic_http_download download_uri, opts[:local_path]
 end
 
 
 opts :upload_file do
   summary "Upload file to guest"
-  arg :vm, nil, :lookup => VIM::VirtualMachine
+  arg :vm, nil, :lookup => VIM::VirtualMachine, :multi => true
   opt :group_id, "Group ID of file", :type => :int
   opt :guest_path, "Path in guest to upload to", :required => true, :type => :string
   opt :local_path, "Local file to upload", :required => true, :type => :string
@@ -282,35 +367,45 @@ opts :upload_file do
   opt :username, "Username in guest", :default => "root", :type => :string
 end
 
-def upload_file vm, opts
-  guestOperationsManager = vm._connection.serviceContent.guestOperationsManager
-  err "This command requires vSphere 5 or greater" unless guestOperationsManager.respond_to? :fileManager
-  fileManager = guestOperationsManager.fileManager
-
-  opts[:permissions] = opts[:permissions].to_i(8) if opts[:permissions]
-
-  auth = get_auth vm, opts
-
-  file = File.new(opts[:local_path], 'rb')
-
-  upload_url = fileManager.
-    InitiateFileTransferToGuest(
-      :vm => vm,
-      :auth => auth,
-      :guestFilePath => opts[:guest_path],
-      :fileAttributes => VIM.GuestPosixFileAttributes(
-        :groupId => opts[:group_id],
-        :ownerId => opts[:owner_id],
-        :permissions => opts[:permissions]
-      ),
-      :fileSize => file.size,
-      :overwrite => opts[:overwrite]
-    )
-
-  upload_uri = URI.parse(upload_url.gsub /http(s?):\/\/\*:[0-9]*/, "")
-  upload_path = "#{upload_uri.path}?#{upload_uri.query}"
-
-  http_upload vm._connection, opts[:local_path], upload_path
+def upload_file vms, opts
+  vms.each do |vm|
+    guestOperationsManager = vm._connection.serviceContent.guestOperationsManager
+    err "This command requires vSphere 5 or greater" unless guestOperationsManager.respond_to? :fileManager
+    fileManager = guestOperationsManager.fileManager
+  
+    opts[:permissions] = opts[:permissions].to_i(8) if opts[:permissions]
+  
+    auth = get_auth vm, opts
+  
+    file_size = nil
+    if opts[:local_path] =~ /^http:/
+      # XXX: Not acceptable for big files
+      file_size = open(opts[:local_path], 'rb').read.length
+    else
+      err "local file does not exist" unless File.exists? local_path
+      file = File.new(opts[:local_path], 'rb')
+      file_size = file.size
+    end  
+  
+    upload_url = fileManager.
+      InitiateFileTransferToGuest(
+        :vm => vm,
+        :auth => auth,
+        :guestFilePath => opts[:guest_path],
+        :fileAttributes => VIM.GuestPosixFileAttributes(
+          :groupId => opts[:group_id],
+          :ownerId => opts[:owner_id],
+          :permissions => opts[:permissions]
+        ),
+        :fileSize => file_size,
+        :overwrite => opts[:overwrite]
+      )
+  
+    upload_uri = URI.parse(upload_url.gsub /http(s?):\/\/\*:[0-9]*/, "")
+    upload_path = "#{upload_uri.path}?#{upload_uri.query}"
+  
+    generic_http_upload opts[:local_path], upload_uri, file_size
+  end
 end
 
 
@@ -431,7 +526,7 @@ end
 # Process commands
 opts :start_program do
   summary "Run program in guest"
-  arg :vm, nil, :lookup => VIM::VirtualMachine
+  arg :vm, nil, :lookup => VIM::VirtualMachine, :multi => true
   opt :arguments, "Arguments of command", :default => "", :type => :string
   opt :background, "Don't wait for process to finish", :default => false, :type => :bool
   opt :delay, "Interval in seconds", :type => :float, :default => 5.0
@@ -444,47 +539,51 @@ opts :start_program do
   conflicts :background, :delay
 end
 
-def start_program vm, opts
-  guestOperationsManager = vm._connection.serviceContent.guestOperationsManager
-  err "This command requires vSphere 5 or greater" unless guestOperationsManager.respond_to? :processManager
-  processManager = guestOperationsManager.processManager
-
-  auth = get_auth vm, opts
-
-  pid = processManager.
-    StartProgramInGuest(
-      :vm => vm,
-      :auth => auth,
-      :spec => VIM.GuestProgramSpec(
-        :arguments => opts[:arguments],
-        :programPath => opts[:program_path],
-        :envVariables => opts[:env],
-        :workingDirectory => opts[:working_directory]
-      )
-    )
-
-  Timeout.timeout opts[:timeout] do
-    while true
-      processes = processManager.
-        ListProcessesInGuest(
-          :vm => vm,
-          :auth => auth,
-          :pids => [pid]
+def start_program vms, opts
+  vms.each do |vm|
+    guestOperationsManager = vm._connection.serviceContent.guestOperationsManager
+    err "This command requires vSphere 5 or greater" unless guestOperationsManager.respond_to? :processManager
+    processManager = guestOperationsManager.processManager
+  
+    auth = get_auth vm, opts
+  
+    pid = processManager.
+      StartProgramInGuest(
+        :vm => vm,
+        :auth => auth,
+        :spec => VIM.GuestProgramSpec(
+          :arguments => opts[:arguments],
+          :programPath => opts[:program_path],
+          :envVariables => opts[:env],
+          :workingDirectory => opts[:working_directory]
         )
-      process = processes.first
-
-      if !process.endTime.nil?
-        if process.exitCode != 0
-          err "Process failed with exit code #{process.exitCode}"
+      )
+  
+    begin
+      Timeout.timeout opts[:timeout] do
+        while true
+          processes = processManager.
+            ListProcessesInGuest(
+              :vm => vm,
+              :auth => auth,
+              :pids => [pid]
+            )
+          process = processes.first
+    
+          if !process.endTime.nil?
+            if process.exitCode != 0
+              err "Process failed with exit code #{process.exitCode}"
+            end
+            break
+          elsif opts[:background]
+            break
+          end
+    
+          sleep opts[:delay]
         end
-        break
-      elsif opts[:background]
-        break
       end
-
-      sleep opts[:delay]
+    rescue Timeout::Error
+      err "Timed out waiting for process to finish."
     end
   end
-rescue Timeout::Error
-  err "Timed out waiting for process to finish."
 end