beaker 2.18.0 → 2.19.0

data/lib/beaker/host.rb

@@ -20,6 +20,14 @@ module Beaker
         @command = command
       end
 
+      def has_key?(k)
+        cmd = PuppetCommand.new(@command, '--configprint all')
+        keys = @host.exec(cmd).stdout.split("\n").collect do |x|
+          x[/^[^\s]+/]
+        end
+        keys.include?(k)
+      end
+
       def [](k)
         cmd = PuppetCommand.new(@command, "--configprint #{k.to_s}")
         @host.exec(cmd).stdout.strip
@@ -206,8 +214,9 @@ module Beaker
     end
 
     #Return the ip address of this host
+    #Always pull fresh, because this can sometimes change
     def ip
-      self[:ip] ||= get_ip
+      self['ip'] = get_ip
     end
 
     #@return [Boolean] true if x86_64, false otherwise
@@ -216,13 +225,29 @@ module Beaker
     end
 
     def connection
-      @connection ||= SshConnection.connect( reachable_name,
+      # create new connection object if necessary
+      @connection ||= SshConnection.connect( { :ip => self['ip'], :vmhostname => self['vmhostname'], :hostname => @name },
                                              self['user'],
                                              self['ssh'], { :logger => @logger } )
+      # update connection information
+      if self['ip'] && (@connection.ip != self['ip'])
+        @connection.ip = self['ip']
+      end
+      if self['vmhostname'] && (@connection.vmhostname != self['vmhostname'])
+        @connection.vmhostname = self['vmhostname']
+      end
+      if @name && (@connection.hostname != @name)
+        @connection.hostname = @name
+      end
+      @connection
     end
 
     def close
       @connection.close if @connection
+      # update connection information
+      @connection.ip = self['ip'] if self['ip']
+      @connection.vmhostname = self['vmhostname'] if self['vmhostname']
+      @connection.hostname = @name
       @connection = nil
     end
 
@@ -234,7 +259,11 @@ module Beaker
         output_callback = nil
       else
         @logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{cmdline}"
-        output_callback = logger.method(:host_output)
+        if @options[:color_host_output]
+          output_callback = logger.method(:color_host_output)
+        else
+          output_callback = logger.method(:host_output)
+        end
       end
 
       unless $dry_run
@@ -457,12 +486,12 @@ module Beaker
   end
 
   [
-     'unix',
-     'aix',
-     'mac',
-     'freebsd',
-     'windows',
-     'pswindows',
+    'unix',
+    'aix',
+    'mac',
+    'freebsd',
+    'windows',
+    'pswindows',
   ].each do |lib|
     require "beaker/host/#{lib}"
   end

data/lib/beaker/host_prebuilt_steps.rb

@@ -14,6 +14,7 @@ module Beaker
     TRIES = 5
     UNIX_PACKAGES = ['curl', 'ntpdate']
     FREEBSD_PACKAGES = ['curl', 'perl5']
+    OPENBSD_PACKAGES = ['curl']
     WINDOWS_PACKAGES = ['curl']
     PSWINDOWS_PACKAGES = []
     SLES10_PACKAGES = ['curl']
@@ -103,6 +104,8 @@ module Beaker
           check_and_install_packages_if_needed(host, PSWINDOWS_PACKAGES)
         when host['platform'] =~ /freebsd/
           check_and_install_packages_if_needed(host, FREEBSD_PACKAGES)
+        when host['platform'] =~ /openbsd/
+          check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
         when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
@@ -319,6 +322,8 @@ module Beaker
           host.exec(Command.new('sudo cp -r .ssh /var/root/.'), {:pty => true})
         elsif host['platform'] =~ /freebsd/
           host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
+        elsif host['platform'] =~ /openbsd/
+          host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
         else
           host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), {:pty => true})
         end
@@ -336,7 +341,10 @@ module Beaker
     def hack_etc_hosts hosts, opts
       etc_hosts = "127.0.0.1\tlocalhost localhost.localdomain\n"
       hosts.each do |host|
-        etc_hosts += "#{host['vm_ip'] || host['ip'].to_s}\t#{host[:vmhostname] || host.name}\n"
+        ip = host['vm_ip'] || host['ip'].to_s
+        hostname = host[:vmhostname] || host.name
+        domain = get_domain_name(host)
+        etc_hosts += "#{ip}\t#{hostname}.#{domain} #{hostname}\n"
       end
       hosts.each do |host|
         set_etc_hosts(host, etc_hosts)
@@ -359,6 +367,8 @@ module Beaker
           host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config"))
         elsif host['platform'] =~ /freebsd/
           host.exec(Command.new("sudo sed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
+        elsif host['platform'] =~ /openbsd/
+          host.exec(Command.new("sudo perl -pi -e 's/^PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config"), {:pty => true} )
         elsif not host.is_powershell?
           host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
         else
@@ -371,7 +381,7 @@ module Beaker
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
-        elsif host['platform'] =~ /freebsd/
+        elsif host['platform'] =~ /(free|open)bsd/
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
         else
           logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
@@ -520,7 +530,7 @@ module Beaker
           host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("stopsrc -g ssh"))
           host.exec(Command.new("startsrc -g ssh"))
-        when /freebsd/
+        when /(free|open)bsd/
           host.exec(Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
         end
@@ -532,6 +542,13 @@ module Beaker
           host.exec(Command.new("touch #{host[:ssh_env_file]}"))
           #add the constructed env vars to this host
           host.add_env_var('PATH', '$PATH')
+          # FIXME
+          if host['platform'] =~ /openbsd-(\d)\.?(\d)-(.+)/
+            version = "#{$1}.#{$2}"
+            arch = $3
+            arch = 'amd64' if ['x64', 'x86_64'].include?(arch)
+            host.add_env_var('PKG_PATH', "http://ftp.openbsd.org/pub/OpenBSD/#{version}/packages/#{arch}/")
+          end
         end
         #add the env var set to this test host
         env.each_pair do |var, value|
@@ -539,14 +556,7 @@ module Beaker
         end
         # REMOVE POST BEAKER 3: backwards compatability, do some setup based upon the global type
         # this is the worst and i hate it
-        if host[:type]
-          case host[:type]
-          when /git|foss|aio/
-            Class.new.extend(Beaker::DSL).configure_foss_defaults_on(host)
-          when /pe/
-            Class.new.extend(Beaker::DSL).configure_pe_defaults_on(host)
-          end
-        end
+        Class.new.extend(Beaker::DSL).configure_type_defaults_on(host)
 
         #close the host to re-establish the connection with the new sshd settings
         host.close

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -127,7 +127,7 @@ module Beaker
 
     # Return all instances currently on ec2.
     # @see AwsSdk#instance_by_id
-    # @return [Array<AWS::EC2::Instance>] An array of AWS::EC2 instance objects
+    # @return [AWS::EC2::InstanceCollection] An array of AWS::EC2 instance objects
     def instances
       @ec2.instances
     end
@@ -142,7 +142,7 @@ module Beaker
 
     # Return all VPCs currently on ec2.
     # @see AwsSdk#vpc_by_id
-    # @return [Array<AWS::EC2::VPC>] An array of AWS::EC2 vpc objects
+    # @return [AWS::EC2::VPCCollection] An array of AWS::EC2 vpc objects
     def vpcs
       @ec2.vpcs
     end
@@ -157,7 +157,7 @@ module Beaker
 
     # Return all security groups currently on ec2.
     # @see AwsSdk#security_goup_by_id
-    # @return [Array<AWS::EC2::SecurityGroup>] An array of AWS::EC2 security group objects
+    # @return [AWS::EC2::SecurityGroupCollection] An array of AWS::EC2 security group objects
     def security_groups
       @ec2.security_groups
     end
@@ -224,7 +224,7 @@ module Beaker
 
     # Create an EC2 instance for host, tag it, and return it.
     #
-    # @return [AWS::EC2::Instance)]
+    # @return [void]
     # @api private
     def create_instance(host, ami_spec, subnet_id)
       amitype = host['vmname'] || host['platform']
@@ -489,28 +489,32 @@ module Beaker
       nil
     end
 
+    # Return a valid /etc/hosts line for a given host
+    #
+    # @param [Beaker::Host] host Beaker::Host object for generating /etc/hosts entry
+    # @param [Symbol] interface Symbol identifies which ip should be used for host
+    # @return [String] formatted hosts entry for host
+    # @api private
+    def etc_hosts_entry(host, interface = :ip)
+      name = host.name
+      domain = get_domain_name(host)
+      ip = host[interface.to_s]
+      "#{ip}\t#{name} #{name}.#{domain} #{host['dns_name']}\n"
+    end
+
     # Configure /etc/hosts for each node
     #
     # @return [void]
     # @api private
     def configure_hosts
       @hosts.each do |host|
-        etc_hosts = "127.0.0.1\tlocalhost localhost.localdomain\n"
-        name = host.name
-        domain = get_domain_name(host)
-        ip = host['private_ip']
-        etc_hosts += "#{ip}\t#{name} #{name}.#{domain} #{host['dns_name']}\n"
-        @hosts.each do |neighbor|
-          if neighbor == host
-            next
-          end
-          name = neighbor.name
-          domain = get_domain_name(neighbor)
-          ip = neighbor['ip']
-          etc_hosts += "#{ip}\t#{name} #{name}.#{domain} #{neighbor['dns_name']}\n"
+        host_entries = @hosts.map do |h|
+          h == host ? etc_hosts_entry(h, :private_ip) : etc_hosts_entry(h)
         end
-        set_etc_hosts(host, etc_hosts)
+        host_entries.unshift "127.0.0.1\tlocalhost localhost.localdomain\n"
+        set_etc_hosts(host, host_entries.join(''))
       end
+      nil
     end
 
     # Enables root for instances with custom username like ubuntu-amis

data/lib/beaker/hypervisor/docker.rb

@@ -176,6 +176,13 @@ module Beaker
           RUN apt-get update
           RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
         EOF
+      when /fedora-22/
+        dockerfile += <<-EOF
+          RUN dnf clean all
+          RUN dnf install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
+          RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
+          RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
+        EOF
       when /^el-/, /centos/, /fedora/, /redhat/, /eos/
         dockerfile += <<-EOF
           RUN yum clean all

data/lib/beaker/hypervisor/openstack.rb

@@ -153,6 +153,7 @@ module Beaker
       vm.volumes.each do |vol|
         @logger.debug "Deleting volume #{vol.name} for OpenStack host #{vm.name}"
         vm.detach_volume(vol.id)
+        vol.wait_for { ready? }
         vol.destroy
       end
     end

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -18,7 +18,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
   def self.provider_vfile_section(host, options)
     provider_section  = ""
     provider_section << "    v.vm.provider :virtualbox do |vb|\n"
-    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{options['vagrant_memsize'] ||= '1024'}']\n"
+    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{options['vagrant_memsize'] ||= '1024'}', '--cpus', '#{options['vagrant_cpus'] ||= '1'}']\n"
     provider_section << "      vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
 
     # Guest volume support
@@ -52,17 +52,22 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
       end
     end
 
+    provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnshostresolver1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
+
+    provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnsproxy1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
+
+    provider_section << "      vb.gui = true\n" unless host['vb_gui'].nil?
+
+    provider_section << "      [\"modifyvm\", :id, \"--cpuidset\", \"1\",\"000206a7\",\"02100800\",\"1fbae3bf\",\"bfebfbff\"\]" if /osx/i.match(host['platform'])
+
     if host['disk_path']
       unless File.exist?(host['disk_path'])
         host['disk_path'] = File.join(host['disk_path'], "#{host.name}.vmdk")
         provider_section << "      vb.customize ['createhd', '--filename', '#{host['disk_path']}', '--size', #{host['disk_size'] ||= 5 * 1024}, '--format', 'vmdk']\n"
       end
       provider_section << "      vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium','#{host['disk_path']}']\n"
-      provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnshostresolver1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
-      provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnsproxy1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
-      provider_section << "      vb.gui = true\n" unless host['vb_gui'].nil?
-      provider_section << "      [\"modifyvm\", :id, \"--cpuidset\", \"1\",\"000206a7\",\"02100800\",\"1fbae3bf\",\"bfebfbff\"\]" if /osx/i.match(host['platform'])
     end
+
     provider_section << "    end\n"
 
     provider_section

data/lib/beaker/hypervisor/vmpooler.rb

@@ -194,6 +194,10 @@ module Beaker
         http = Net::HTTP.new( uri.host, uri.port )
         request = Net::HTTP::Delete.new(uri.request_uri)
 
+        if @credentials[:vmpooler_token]
+          request['X-AUTH-TOKEN'] = @credentials[:vmpooler_token]
+        end
+
         begin
           response = http.request(request)
         rescue *SSH_EXCEPTIONS => e

data/lib/beaker/logger.rb

@@ -26,6 +26,7 @@ module Beaker
     BRIGHT_MAGENTA = "\e[01;35m"
     BRIGHT_CYAN    = "\e[01;36m"
     BRIGHT_WHITE   = "\e[01;37m"
+    NONE           = ""
 
     # The defined log levels.  Each log level also reports messages at levels lower than itself
     LOG_LEVELS      = {
@@ -186,6 +187,16 @@ module Beaker
       optionally_color GREY, string, false
     end
 
+    # Custom reporting for messages generated by host SUTs - to preserve output
+    # Will not print unless we are at {LOG_LEVELS} 'verbose' or higher.
+    # Preserves outout by not stripping out colour codes
+    # @param args[Array<String>] Strings to be reported
+    def color_host_output *args
+      return unless is_verbose?
+      string = args.join
+      optionally_color NONE, string, false
+    end
+
     # Custom reporting for performance/sysstat messages
     # Will not print unless we are at {LOG_LEVELS} 'debug' or higher.
     # @param args[Array<String>] Strings to be reported
@@ -270,7 +281,7 @@ module Beaker
       @destinations.each do |to|
         to.print color_code if @color
         to.send print_statement, convert( msg )
-        to.print NORMAL if @color
+        to.print NORMAL if @color unless color_code == NONE
       end
     end
 

data/lib/beaker/options/command_line_parser.rb

@@ -121,6 +121,15 @@ module Beaker
             @cmd_options[:color] = bool
           end
 
+          opts.on '--[no-]color-host-output',
+                  'Ensure SUT colored output is preserved',
+                  '(default: false)' do |bool|
+            @cmd_options[:color_host_output] = bool
+            if bool
+              @cmd_options[:color_host_output] = true
+            end
+          end
+
           opts.on '--log-level LEVEL',
                   'Log level',
                   'Supported LEVEL keywords:',