beaker 2.18.3 → 2.19.0

data/lib/beaker/host.rb

@@ -214,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
@@ -224,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
 
@@ -242,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

data/lib/beaker/host/unix/pkg.rb

@@ -65,6 +65,11 @@ module Unix::Pkg
         execute("zypper --non-interactive in #{name}", opts)
       when /el-4/
         @logger.debug("Package installation not supported on rhel4")
+      when /fedora-22/
+        if version
+          name = "#{name}-#{version}"
+        end
+        execute("dnf -y #{cmdline_args} install #{name}", opts)
       when /cisco|fedora|centos|eos|el-/
         if version
           name = "#{name}-#{version}"
@@ -121,6 +126,8 @@ module Unix::Pkg
         execute("zypper --non-interactive rm #{name}", opts)
       when /el-4/
         @logger.debug("Package uninstallation not supported on rhel4")
+      when /fedora-22/
+        execute("dnf -y #{cmdline_args} remove #{name}", opts)
       when /cisco|fedora|centos|eos|el-/
         execute("yum -y #{cmdline_args} remove #{name}", opts)
       when /ubuntu|debian|cumulus/
@@ -145,6 +152,8 @@ module Unix::Pkg
         execute("zypper --non-interactive --no-gpg-checks up #{name}", opts)
       when /el-4/
         @logger.debug("Package upgrade is not supported on rhel4")
+      when /fedora-22/
+        execute("dnf -y #{cmdline_args} update #{name}", opts)
       when /cisco|fedora|centos|eos|el-/
         execute("yum -y #{cmdline_args} update #{name}", opts)
       when /ubuntu|debian|cumulus/

data/lib/beaker/host/windows/exec.rb

@@ -3,6 +3,9 @@ module Windows::Exec
 
   def reboot
     exec(Beaker::Command.new('shutdown /r /t 0 /d p:4:1 /c "Beaker::Host reboot command issued"'), :expect_connection_failure => true)
+    # rebooting on windows is sloooooow
+    # give it some breathing room before attempting a reconnect
+    sleep(30)
   end
 
   ABS_CMD = 'c:\\\\windows\\\\system32\\\\cmd.exe'

data/lib/beaker/host_prebuilt_steps.rb

@@ -341,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)
@@ -553,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/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:',

data/lib/beaker/options/options_hash.rb

@@ -1,44 +1,11 @@
+require 'stringify-hash'
+
 module Beaker
   module Options
 
     # A hash that treats Symbol and String keys interchangeably
     # and recursively merges hashes
-    class OptionsHash < Hash
-
-      # The dividor between elements when OptionsHash is dumped
-      DIV = '    '
-
-      # The end of line when dumping
-      EOL = "\n"
-
-      # Get value for given key, search for both k as String and k as Symbol,
-      # if not present return nil
-      #
-      # @param [Object] k The key to find, searches for both k as String
-      #                   and k as Symbol
-      #
-      # @example Use this method to return the value for a given key
-      #     a['key'] = 'value'
-      #     a['key'] == a[:key] == 'value'
-      #
-      # @return [nil, Object] Return the Object found at given key,
-      #                       or nil if no Object found
-      def [] k
-        super(k.to_s) || super(k.to_sym)
-      end
-
-      # Set Symbol key to Object value
-      # @param [Object] k The key to associated with the value,
-      #                   converted to Symbol key
-      # @param [Object] v The value to store in the ObjectHash
-      #
-      # @example Use this method to set the value for a key
-      #     a['key'] = 'value'
-      #
-      # @return [Object] Return the Object value just stored
-      def []=k,v
-        super(k.to_sym, v)
-      end
+    class OptionsHash < StringifyHash
 
       # Determine if type of ObjectHash is pe, defaults to true
       #
@@ -66,271 +33,11 @@ module Beaker
           :pe
         when /foss/
           :foss
-        when /aio/
-          :aio
         else
           :foss
         end
       end
 
-      # Determine if key is stored in ObjectHash
-      # @param [Object] k The key to find in ObjectHash, searches for
-      #                   both k as String and k as Symbol
-      #
-      # @example Use this method to set the value for a key
-      #     a['key'] = 'value'
-      #     a.has_key[:key] == true
-      #
-      # @return [Boolean]
-      def has_key? k
-        super(k.to_s) || super(k.to_sym)
-      end
-
-      # Determine key=>value entry in OptionsHash, remove both value at
-      # String key and value at Symbol key
-      #
-      # @param [Object] k The key to delete in ObjectHash,
-      # deletes both k as String and k as Symbol
-      #
-      # @example Use this method to set the value for a key
-      #     a['key'] = 'value'
-      #     a.delete[:key] == 'value'
-      #
-      # @return [Object, nil] The Object deleted at value,
-      # nil if no Object deleted
-      def delete k
-        super(k.to_s) || super(k.to_sym)
-      end
-
-      # Recursively merge and OptionsHash with an OptionsHash or Hash
-      #
-      # @param [OptionsHash]       base The hash to merge into
-      # @param [OptionsHash, Hash] hash The hash to merge from
-      #
-      # @example
-      #   base = { :key => { :subkey1 => 'subval', :subkey2 => 'subval' } }
-      #   hash = { :key => { :subkey1 => 'newval'} }
-      #
-      #   rmerge(base, hash)
-      #   #=>  {:key =>
-      #           {:subkey1 => 'newval',
-      #            :subkey2 => 'subval'}}
-      #
-      # @return [OptionsHash] The combined bash and hash
-      def rmerge base, hash
-        return base unless hash.is_a?(Hash) || hash.is_a?(OptionsHash)
-        hash.each do |key, v|
-          if (base[key].is_a?(Hash) || base[key].is_a?(OptionsHash)) && (hash[key].is_a?(Hash) || hash[key].is_a?(OptionsHash))
-            rmerge(base[key], hash[key])
-          elsif hash[key].is_a?(Hash)
-            base[key] = OptionsHash.new.merge(hash[key])
-          else
-            base[key]= hash[key]
-          end
-        end
-        base
-      end
-
-      # Create new OptionsHash from recursively merged self with an OptionsHash or Hash
-      #
-      # @param [OptionsHash, Hash] hash The hash to merge from
-      #
-      # @example
-      #   base = { :key => { :subkey1 => 'subval', :subkey2 => 'subval' } }
-      #   hash = { :key => { :subkey1 => 'newval'} }
-      #
-      #   base.merge(hash)
-      #   #=> {:key =>
-      #         {:subkey1 => 'newval',
-      #          :subkey2 => 'subval' }
-      #
-      # @return [OptionsHash] The combined hash
-      def merge hash
-        #make a deep copy into an empty hash object
-        merged_hash = rmerge(OptionsHash.new, self)
-        rmerge(merged_hash, hash)
-      end
-
-      # Recursively merge self with an OptionsHash or Hash
-      #
-      # @param [OptionsHash, Hash] hash The hash to merge from
-      #
-      # @example
-      #   base = { :key => { :subkey1 => 'subval', :subkey2 => 'subval' } }
-      #   hash = { :key => { :subkey1 => 'newval'} }
-      #
-      #   base.merge!(hash)
-      #   #=> {:key =>
-      #         {:subkey1 => 'newval',
-      #          :subkey2 => 'subval' }
-      #
-      # @return [OptionsHash] The combined hash
-      def merge! hash
-        rmerge(self, hash)
-      end
-
-      # Helper for formatting collections
-      # Computes the indentation level for elements of the collection
-      # Yields indentation to block to so the caller can create
-      # map of element strings
-      # Places delimiters in the correct location
-      # Joins everything with correct EOL
-      #
-      #
-      # !@visibility private
-      def as_coll( opening, closing, in_lvl, in_inc, &block )
-        delim_indent = in_inc * in_lvl
-        elem_indent  = in_inc * (in_lvl + 1)
-
-        open_brace  = opening
-        close_brace = delim_indent + closing
-
-        fmtd_coll = block.call( elem_indent )
-        str_coll = fmtd_coll.join( ',' + EOL )
-
-        return open_brace + EOL + str_coll + EOL + close_brace
-      end
-
-      # Pretty prints a collection
-      #
-      # @param [Enumerable] collection The collection to be printed
-      # @param [Integer]    in_lvl     The level of indentation
-      # @param [String]     in_inc     The increment to indent
-      #
-      # @example
-      #   base = {:key => { :subkey1 => 'subval', :subkey2 => ['subval'] }}
-      #   self.fmt_collection( base )
-      #   #=> '{
-      #            "key": {
-      #                "subkey": "subval",
-      #                "subkey2": [
-      #                    "subval"
-      #                ]
-      #            }
-      #        }'
-      #
-      # @return [String] The collection as a pretty JSON object
-      def fmt_collection( collection, in_lvl = 0, in_inc = DIV )
-        if collection.respond_to? :each_pair
-          string = fmt_assoc( collection, in_lvl, in_inc )
-        else
-          string = fmt_list( collection, in_lvl, in_inc )
-        end
-
-        return string
-      end
-
-      # Pretty prints an associative collection
-      #
-      # @param [#each_pair] coll    The collection to be printed
-      # @param [Integer]    in_lvl  The level of indentation
-      # @param [String]     in_inc  The increment to indent
-      #
-      # @example
-      #   base = { :key => 'value', :key2 => 'value' }
-      #   self.fmt_assoc( base )
-      #   #=> '{
-      #            "key": "value",
-      #            "key2": "value"
-      #        }'
-      #
-      # @return [String] The collection as a pretty JSON object
-      def fmt_assoc( coll, in_lvl = 0, in_inc = DIV )
-        if coll.empty?
-          return '{}'
-        else
-          as_coll '{', '}', in_lvl, in_inc do |elem_indent|
-            coll.map do |key, value|
-              assoc_line = elem_indent + '"' + key.to_s + '"' + ': '
-              assoc_line += fmt_value( value, in_lvl, in_inc )
-            end
-          end
-        end
-      end
-
-      # Pretty prints a list collection
-      #
-      # @param [#each]    coll    The collection to be printed
-      # @param [Integer]  in_lvl  The level of indentation
-      # @param [String]   in_inc  The increment to indent
-      #
-      # @example
-      #   base = [ 'first', 'second' ]
-      #   self.fmt_list( base )
-      #   #=> '[
-      #            "first",
-      #            "second"
-      #        ]'
-      #
-      # @return [String] The collection as a pretty JSON object
-      def fmt_list( coll, in_lvl = 0, in_inc = DIV )
-        if coll.empty?
-          return '[]'
-        else
-          as_coll '[', ']', in_lvl, in_inc do |indent|
-            coll.map do |el|
-              indent + fmt_value( el, in_lvl, in_inc )
-            end
-          end
-        end
-      end
-
-      # Chooses between collection and primitive formatting
-      #
-      # !@visibility private
-      def fmt_value( value, in_lvl = 0, in_inc = DIV )
-        if value.kind_of? Enumerable and not value.is_a? String
-          fmt_collection( value, in_lvl + 1, in_inc )
-        else
-          fmt_basic( value )
-        end
-      end
-
-      # Pretty prints primitive JSON values
-      #
-      # @param [Object] value The collection to be printed
-      #
-      # @example
-      #   self.fmt_value( 4 )
-      #   #=> '4'
-      #
-      # @example
-      #   self.fmt_value( true )
-      #   #=> 'true'
-      #
-      # @example
-      #   self.fmt_value( nil )
-      #   #=> 'null'
-      #
-      # @example
-      #   self.fmt_value( 'string' )
-      #   #=> '"string"'
-      #
-      # @return [String] The value as a valid JSON primitive
-      def fmt_basic( value )
-        case value
-        when Numeric, TrueClass, FalseClass then value.to_s
-        when NilClass then "null"
-        else "\"#{value}\""
-        end
-      end
-
-      # Pretty print the options as JSON
-      #
-      # @example
-      #   base = { :key => { :subkey1 => 'subval', :subkey2 => 'subval' } }
-      #   base.dump
-      #   #=>  '{
-      #             "key": {
-      #                 "subkey1": "subval",
-      #                 "subkey2": 2
-      #             }
-      #         }
-      #
-      # @return [String] The description of self
-      def dump
-        fmt_collection( self, 0, DIV )
-      end
     end
   end
 end