ohai 8.10.0 → 8.11.1

data/lib/ohai/plugins/init_package.rb

@@ -20,6 +20,6 @@ Ohai.plugin(:InitPackage) do
   provides "init_package"
 
   collect_data(:linux) do
-    init_package File.exists?("/proc/1/comm") ? File.open("/proc/1/comm").gets.chomp : 'init'
+    init_package File.exists?("/proc/1/comm") ? File.open("/proc/1/comm").gets.chomp : "init"
   end
 end

data/lib/ohai/plugins/ip_scopes.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,15 +22,15 @@ Ohai.plugin(:IpScopes) do
 
   collect_data do
     begin
-      require 'ipaddr_extensions'
+      require "ipaddr_extensions"
 
-      network['interfaces'].keys.sort.each do |ifName|
-        next if network['interfaces'][ifName]['addresses'].nil?
+      network["interfaces"].keys.sort.each do |ifName|
+        next if network["interfaces"][ifName]["addresses"].nil?
 
-        interface = network['interfaces'][ifName]
-        interface['addresses'].each do |address,attrs|
+        interface = network["interfaces"][ifName]
+        interface["addresses"].each do |address, attrs|
           begin
-            attrs.merge! 'ip_scope' => address.to_ip.scope
+            attrs.merge! "ip_scope" => address.to_ip.scope
 
             if private_addr?(address) && !tunnel_iface?(interface)
               privateaddress(address)
@@ -52,6 +52,6 @@ Ohai.plugin(:IpScopes) do
   end
 
   def tunnel_iface?(interface)
-    interface['type'] == 'ppp'
+    interface["type"] == "ppp"
   end
 end

data/lib/ohai/plugins/java.rb

@@ -26,7 +26,7 @@ Ohai.plugin(:Java) do
     if so.exitstatus == 0
       so.stderr.split(/\r?\n/).each do |line|
         case line
-        when /java version \"([0-9\.\_]+)\"/
+        when /(?:java|openjdk) version \"([0-9\.\_]+)\"/
           java[:version] = $1
         when /^(.+Runtime Environment.*) \((build)\s*(.+)\)$/
           java[:runtime] = { "name" => $1, "build" => $3 }

data/lib/ohai/plugins/joyent.rb

@@ -20,9 +20,9 @@
 # Reference from: sm-summary command
 
 Ohai.plugin(:Joyent) do
-  provides 'joyent'
-  provides 'virtualization/guest_id'
-  depends 'os', 'platform', 'virtualization'
+  provides "joyent"
+  provides "virtualization/guest_id"
+  depends "os", "platform", "virtualization"
 
   def collect_product_file
     lines = []
@@ -37,7 +37,7 @@ Ohai.plugin(:Joyent) do
   end
 
   def collect_pkgsrc
-    if File.exist?('/opt/local/etc/pkg_install.conf')
+    if File.exist?("/opt/local/etc/pkg_install.conf")
       sm_pkgsrc = ::File.read("/opt/local/etc/pkg_install.conf").split("=")
       sm_pkgsrc[1].chomp
     else
@@ -46,7 +46,7 @@ Ohai.plugin(:Joyent) do
   end
 
   def is_smartos?
-    platform == 'smartos'
+    platform == "smartos"
   end
 
   collect_data do
@@ -58,14 +58,14 @@ Ohai.plugin(:Joyent) do
 
       # get zone id unless globalzone
       unless joyent[:sm_uuid] == "global"
-        joyent[:sm_id]            = virtualization[:guest_id]
+        joyent[:sm_id] = virtualization[:guest_id]
       end
 
       # retrieve image name and pkgsrc
       collect_product_file.each do |line|
         case line
         when /^Image/
-          sm_image = line.split(" ") 
+          sm_image = line.split(" ")
           joyent[:sm_image_id] = sm_image[1]
           joyent[:sm_image_ver] = sm_image[2]
         when /^Base Image/

data/lib/ohai/plugins/kernel.rb

@@ -80,7 +80,7 @@ Ohai.plugin(:Kernel) do
 
     so = shell_out("sysctl -n hw.optional.x86_64")
     if so.stdout.split($/)[0].to_i == 1
-      kernel[:machine] = 'x86_64'
+      kernel[:machine] = "x86_64"
     end
 
     modules = Mash.new
@@ -157,10 +157,10 @@ Ohai.plugin(:Kernel) do
     # EXAMPLE:
     # Id Loadaddr   Size Info Rev Module Name
     #  6  1180000   4623   1   1  specfs (filesystem for specfs)
-    module_description =  /[\s]*([\d]+)[\s]+([a-f\d]+)[\s]+([a-f\d]+)[\s]+(?:[\-\d]+)[\s]+(?:[\d]+)[\s]+([\S]+)[\s]+\((.+)\)$/
+    module_description = /[\s]*([\d]+)[\s]+([a-f\d]+)[\s]+([a-f\d]+)[\s]+(?:[\-\d]+)[\s]+(?:[\d]+)[\s]+([\S]+)[\s]+\((.+)\)$/
     so.stdout.lines do |line|
       if mod = module_description.match(line)
-        modules[mod[4]] = { :id => mod[1].to_i, :loadaddr => mod[2], :size => mod[3].to_i(16), :description => mod[5]}
+        modules[mod[4]] = { :id => mod[1].to_i, :loadaddr => mod[2], :size => mod[3].to_i(16), :description => mod[5] }
       end
     end
 
@@ -168,8 +168,8 @@ Ohai.plugin(:Kernel) do
   end
 
   collect_data(:windows) do
-    require 'win32ole'
-    require 'wmi-lite/wmi'
+    require "win32ole"
+    require "wmi-lite/wmi"
 
     WIN32OLE.codepage = WIN32OLE::CP_UTF8
 
@@ -177,7 +177,7 @@ Ohai.plugin(:Kernel) do
 
     kernel Mash.new
 
-    host = wmi.first_of('Win32_OperatingSystem')
+    host = wmi.first_of("Win32_OperatingSystem")
     kernel[:os_info] = Mash.new
     host.wmi_ole_object.properties_.each do |p|
       kernel[:os_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
@@ -188,10 +188,10 @@ Ohai.plugin(:Kernel) do
     kernel[:version] = "#{kernel[:os_info][:version]} #{kernel[:os_info][:csd_version]} Build #{kernel[:os_info][:build_number]}"
     kernel[:os] = os_lookup(kernel[:os_info][:os_type]) || languages[:ruby][:host_os]
 
-    host = wmi.first_of('Win32_ComputerSystem')
+    host = wmi.first_of("Win32_ComputerSystem")
     kernel[:cs_info] = Mash.new
     cs_info_blacklist = [
-      'oem_logo_bitmap'
+      "oem_logo_bitmap"
     ]
     host.wmi_ole_object.properties_.each do |p|
       if !cs_info_blacklist.include?(p.name.wmi_underscore)

data/lib/ohai/plugins/linode.rb

@@ -25,7 +25,7 @@ Ohai.plugin(:Linode) do
   # Returns true or false
   def has_linode_kernel?
     if kernel_data = kernel
-      kernel_data[:release].split('-').last =~ /linode/
+      kernel_data[:release].split("-").last =~ /linode/
     end
   end
 
@@ -33,7 +33,7 @@ Ohai.plugin(:Linode) do
   #
   # Returns true or false
   def looks_like_linode?
-    hint?('linode') || has_linode_kernel?
+    hint?("linode") || has_linode_kernel?
   end
 
   # Names linode ip address
@@ -45,7 +45,7 @@ Ohai.plugin(:Linode) do
   def get_ip_address(name, eth)
     if eth_iface = network[:interfaces][eth]
       eth_iface[:addresses].each do |key, info|
-        linode[name] = key if info['family'] == 'inet'
+        linode[name] = key if info["family"] == "inet"
       end
     end
   end
@@ -53,10 +53,13 @@ Ohai.plugin(:Linode) do
   collect_data do
     # Setup linode mash if it is a linode system
     if looks_like_linode?
+      Ohai::Log.debug("linode plugin: looks_like_linode? == true")
       linode Mash.new
       get_ip_address(:public_ip, :eth0)
       get_ip_address(:private_ip, "eth0:1")
-      hint?('linode').each{|k,v| linode[k] = v } if hint?('linode').kind_of?(Hash)
+      hint?("linode").each { |k, v| linode[k] = v } if hint?("linode").kind_of?(Hash)
+    else
+      Ohai::Log.debug("linode plugin: looks_like_linode? == false")
     end
   end
 end

data/lib/ohai/plugins/linux/cpu.rb

@@ -58,18 +58,18 @@ Ohai.plugin(:CPU) do
       when /cache size\s+:\s(.+)/
         cpuinfo[current_cpu]["cache_size"] = $1
       when /flags\s+:\s(.+)/
-        cpuinfo[current_cpu]["flags"] = $1.split(' ')
+        cpuinfo[current_cpu]["flags"] = $1.split(" ")
       when /bogomips per cpu:\s(.+)/
         cpuinfo["bogomips_per_cpu"] = $1
       when /features\s+:\s(.+)/
-        cpuinfo["features"] = $1.split(' ')
+        cpuinfo["features"] = $1.split(" ")
       when /processor\s(\d):\s(.+)/
         current_cpu = $1
         cpu_number += 1
         cpuinfo[current_cpu] = Mash.new
-        current_cpu_info = $2.split(',')
-        for i in current_cpu_info
-          name_value = i.split('=')
+        current_cpu_info = $2.split(",")
+        current_cpu_info.each do |i|
+          name_value = i.split("=")
           name = name_value[0].strip
           value = name_value[1].strip
           cpuinfo[current_cpu][name] = value

data/lib/ohai/plugins/linux/filesystem.rb

@@ -21,7 +21,7 @@ Ohai.plugin(:Filesystem) do
 
   def get_blk_cmd(attr, have_lsblk)
     if have_lsblk
-      attr = 'FSTYPE' if attr == 'TYPE'
+      attr = "FSTYPE" if attr == "TYPE"
       "lsblk -P -n -o NAME,#{attr}"
     else
       "blkid -s #{attr}"
@@ -30,7 +30,7 @@ Ohai.plugin(:Filesystem) do
 
   def get_blk_regex(attr, have_lsblk)
     if have_lsblk
-      attr = 'FSTYPE' if attr == 'TYPE'
+      attr = "FSTYPE" if attr == "TYPE"
       /^NAME="(\S+).*?" #{attr}="(\S+)"/
     else
       /^(\S+): #{attr}="(\S+)"/
@@ -47,7 +47,7 @@ Ohai.plugin(:Filesystem) do
 
   collect_data(:linux) do
     fs = Mash.new
-    have_lsblk = File.executable?('/bin/lsblk')
+    have_lsblk = File.executable?("/bin/lsblk")
 
     # Grab filesystem data from df
     so = shell_out("df -P")
@@ -95,56 +95,56 @@ Ohai.plugin(:Filesystem) do
       end
     end
 
-    have_lsblk = File.exist?('/bin/lsblk')
+    have_lsblk = File.exist?("/bin/lsblk")
 
     # Gather more filesystem types via libuuid, even devices that's aren't mounted
-    cmd = get_blk_cmd('TYPE', have_lsblk)
-    regex = get_blk_regex('TYPE', have_lsblk)
+    cmd = get_blk_cmd("TYPE", have_lsblk)
+    regex = get_blk_regex("TYPE", have_lsblk)
     so = shell_out(cmd)
     so.stdout.lines do |line|
       if line =~ regex
         filesystem = $1
         type = $2
-        filesystem = find_device(filesystem) unless filesystem.start_with?('/')
+        filesystem = find_device(filesystem) unless filesystem.start_with?("/")
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
         fs[filesystem][:fs_type] = type
       end
     end
 
     # Gather device UUIDs via libuuid
-    cmd = get_blk_cmd('UUID', have_lsblk)
-    regex = get_blk_regex('UUID', have_lsblk)
+    cmd = get_blk_cmd("UUID", have_lsblk)
+    regex = get_blk_regex("UUID", have_lsblk)
     so = shell_out(cmd)
     so.stdout.lines do |line|
       if line =~ regex
         filesystem = $1
         uuid = $2
-        filesystem = find_device(filesystem) unless filesystem.start_with?('/')
+        filesystem = find_device(filesystem) unless filesystem.start_with?("/")
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
         fs[filesystem][:uuid] = uuid
       end
     end
 
     # Gather device labels via libuuid
-    cmd = get_blk_cmd('LABEL', have_lsblk)
-    regex = get_blk_regex('LABEL', have_lsblk)
+    cmd = get_blk_cmd("LABEL", have_lsblk)
+    regex = get_blk_regex("LABEL", have_lsblk)
     so = shell_out(cmd)
     so.stdout.lines do |line|
       if line =~ regex
         filesystem = $1
         label = $2
-        filesystem = find_device(filesystem) unless filesystem.start_with?('/')
+        filesystem = find_device(filesystem) unless filesystem.start_with?("/")
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
         fs[filesystem][:label] = label
       end
     end
 
     # Grab any missing mount information from /proc/mounts
-    if File.exist?('/proc/mounts')
-      mounts = ''
+    if File.exist?("/proc/mounts")
+      mounts = ""
       # Due to https://tickets.opscode.com/browse/OHAI-196
       # we have to non-block read dev files. Ew.
-      f = File.open('/proc/mounts')
+      f = File.open("/proc/mounts")
       loop do
         begin
           data = f.read_nonblock(4096)

data/lib/ohai/plugins/linux/filesystem2.rb

@@ -34,16 +34,16 @@ Ohai.plugin(:Filesystem2) do
       regex = /NAME="(\S+).*?" UUID="(\S*)" LABEL="(\S*)" FSTYPE="(\S*)"/
       if line =~ regex
         dev = $1
-        dev = find_device(dev) unless dev.start_with?('/')
+        dev = find_device(dev) unless dev.start_with?("/")
         uuid = $2
         label = $3
         fs_type = $4
-        return {:dev => dev, :uuid => uuid, :label => label, :fs_type => fs_type}
+        return { :dev => dev, :uuid => uuid, :label => label, :fs_type => fs_type }
       end
     else
       bits = line.split
-      dev = bits.shift.split(':')[0]
-      f = {:dev => dev}
+      dev = bits.shift.split(":")[0]
+      f = { :dev => dev }
       bits.each do |keyval|
         if keyval =~ /(\S+)="(\S+)"/
           key = $1.downcase.to_sym
@@ -61,7 +61,7 @@ Ohai.plugin(:Filesystem2) do
     fs.each_value do |entry|
       view[entry[:device]] = Mash.new unless view[entry[:device]]
       entry.each do |key, val|
-        next if ['device', 'mount'].include?(key)
+        next if %w{device mount}.include?(key)
         view[entry[:device]][key] = val
       end
       view[entry[:device]][:mounts] ||= []
@@ -78,7 +78,7 @@ Ohai.plugin(:Filesystem2) do
       next unless entry[:mount]
       view[entry[:mount]] = Mash.new unless view[entry[:mount]]
       entry.each do |key, val|
-        next if ['mount', 'device'].include?(key)
+        next if %w{mount device}.include?(key)
         view[entry[:mount]][key] = val
       end
       view[entry[:mount]][:devices] ||= []
@@ -141,12 +141,12 @@ Ohai.plugin(:Filesystem2) do
       end
     end
 
-    have_lsblk = File.exist?('/bin/lsblk')
+    have_lsblk = File.exist?("/bin/lsblk")
     if have_lsblk
-      cmd = 'lsblk -n -P -o NAME,UUID,LABEL,FSTYPE'
+      cmd = "lsblk -n -P -o NAME,UUID,LABEL,FSTYPE"
     else
       # CentOS5 and other platforms don't have lsblk
-      cmd = 'blkid'
+      cmd = "blkid"
     end
 
     so = shell_out(cmd)
@@ -177,11 +177,11 @@ Ohai.plugin(:Filesystem2) do
     end
 
     # Grab any missing mount information from /proc/mounts
-    if File.exist?('/proc/mounts')
-      mounts = ''
+    if File.exist?("/proc/mounts")
+      mounts = ""
       # Due to https://tickets.opscode.com/browse/OHAI-196
       # we have to non-block read dev files. Ew.
-      f = File.open('/proc/mounts')
+      f = File.open("/proc/mounts")
       loop do
         begin
           data = f.read_nonblock(4096)
@@ -213,9 +213,9 @@ Ohai.plugin(:Filesystem2) do
     by_mountpoint = generate_mountpoint_view(fs)
 
     fs2 = Mash.new
-    fs2['by_device'] = by_device
-    fs2['by_mountpoint'] = by_mountpoint
-    fs2['by_pair'] = by_pair
+    fs2["by_device"] = by_device
+    fs2["by_mountpoint"] = by_mountpoint
+    fs2["by_pair"] = by_pair
 
     # Set the filesystem data
     filesystem2 fs2

data/lib/ohai/plugins/linux/mdadm.rb

@@ -17,7 +17,7 @@
 #
 
 Ohai.plugin(:Mdadm) do
-  provides 'mdadm'
+  provides "mdadm"
 
   def create_raid_device_mash(stdout)
     device_mash = Mash.new
@@ -51,9 +51,9 @@ Ohai.plugin(:Mdadm) do
 
   collect_data(:linux) do
     # gather a list of all raid arrays
-    if File.exist?('/proc/mdstat')
+    if File.exist?("/proc/mdstat")
       devices = []
-      File.open('/proc/mdstat').each do |line|
+      File.open("/proc/mdstat").each do |line|
         devices << Regexp.last_match[1] if line =~ /(md[0-9]+)/
       end
 

data/lib/ohai/plugins/linux/network.rb

@@ -46,11 +46,11 @@ Ohai.plugin(:Network) do
   end
 
   def is_openvz?
-    ::File.directory?('/proc/vz')
+    ::File.directory?("/proc/vz")
   end
 
   def is_openvz_host?
-    is_openvz? && ::File.directory?('/proc/bc')
+    is_openvz? && ::File.directory?("/proc/bc")
   end
 
   def extract_neighbors(family, iface, neigh_attr)
@@ -98,7 +98,7 @@ Ohai.plugin(:Network) do
           Ohai::Log.debug("Skipping route entry without a device: '#{line}'")
           next
         end
-        route_int = 'venet0:0' if is_openvz? && !is_openvz_host? && route_int == 'venet0' && iface['venet0:0']
+        route_int = "venet0:0" if is_openvz? && !is_openvz_host? && route_int == "venet0" && iface["venet0:0"]
 
         unless iface[route_int]
           Ohai::Log.debug("Skipping previously unseen interface from 'ip route show': #{route_int}")
@@ -107,13 +107,21 @@ Ohai.plugin(:Network) do
 
         route_entry = Mash.new(:destination => route_dest,
                                :family => family[:name])
-        %w[via scope metric proto src].each do |k|
+        %w{via scope metric proto src}.each do |k|
           route_entry[k] = $1 if route_ending =~ /\b#{k}\s+([^\s]+)\b/
         end
 
         # a sanity check, especially for Linux-VServer, OpenVZ and LXC:
         # don't report the route entry if the src address isn't set on the node
-        next if route_entry[:src] and not iface[route_int][:addresses].has_key? route_entry[:src]
+        # unless the interface has no addresses of this type at all
+        if route_entry[:src]
+          addr = iface[route_int][:addresses]
+          unless addr.nil? || addr.has_key?(route_entry[:src]) ||
+              addr.values.all? { |a| a["family"] != family[:name] }
+            Ohai::Log.debug("Skipping route entry whose src does not match the interface IP")
+            next
+          end
+        end
 
         iface[route_int][:routes] = Array.new unless iface[route_int][:routes]
         iface[route_int][:routes] << route_entry
@@ -126,6 +134,7 @@ Ohai.plugin(:Network) do
   # for information, default routes can be of this form :
   # - default via 10.0.2.4 dev br0
   # - default dev br0  scope link
+  # - default dev eth0  scope link src 1.1.1.1
   # - default via 10.0.3.1 dev eth1  src 10.0.3.2  metric 10
   # - default via 10.0.4.1 dev eth2  src 10.0.4.2  metric 20
 
@@ -141,19 +150,19 @@ Ohai.plugin(:Network) do
   # determine layer 1 details for the interface using ethtool
   def ethernet_layer_one(iface)
     return iface unless ethtool_binary = find_ethtool_binary
-    keys = %w[ Speed Duplex Port Transceiver Auto-negotiation MDI-X ]
+    keys = %w{ Speed Duplex Port Transceiver Auto-negotiation MDI-X }
     iface.each_key do |tmp_int|
-      next unless iface[tmp_int][:encapsulation] == 'Ethernet'
+      next unless iface[tmp_int][:encapsulation] == "Ethernet"
       so = shell_out("#{ethtool_binary} #{tmp_int}")
       so.stdout.lines do |line|
         line.chomp!
         Ohai::Log.debug("Parsing ethtool output: #{line}")
         line.lstrip!
-        k, v = line.split(': ')
+        k, v = line.split(": ")
         next unless keys.include? k
-        k.downcase!.tr!('-', '_')
-        if k == 'speed'
-          k = 'link_speed'   # This is not necessarily the maximum speed the NIC supports
+        k.downcase!.tr!("-", "_")
+        if k == "speed"
+          k = "link_speed" # This is not necessarily the maximum speed the NIC supports
           v = v[/\d+/].to_i
         end
         iface[tmp_int][k] = v
@@ -181,7 +190,7 @@ Ohai.plugin(:Network) do
         net_counters[tmp_int][int][:packets] = $2
         net_counters[tmp_int][int][:errors] = $3
         net_counters[tmp_int][int][:drop] = $4
-        if (int == :rx)
+        if int == :rx
           net_counters[tmp_int][int][:overrun] = $5
         else
           net_counters[tmp_int][int][:carrier] = $5
@@ -214,7 +223,7 @@ Ohai.plugin(:Network) do
       end
 
       if line =~ /state (\w+)/
-        iface[tmp_int]['state'] = $1.downcase
+        iface[tmp_int]["state"] = $1.downcase
       end
     end
     iface
@@ -258,7 +267,7 @@ Ohai.plugin(:Network) do
       iface[cint][:encapsulation] = linux_encaps_lookup($1)
       unless $2 == "00:00:00:00:00:00"
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-        iface[cint][:addresses][$2.upcase] = {"family" => "lladdr"}
+        iface[cint][:addresses][$2.upcase] = { "family" => "lladdr" }
       end
     end
   end
@@ -279,7 +288,7 @@ Ohai.plugin(:Network) do
 
       iface[cint] = Mash.new unless iface[cint] # Create the fake alias interface if needed
       iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][tmp_addr] = {"family" => "inet", "prefixlen" => tmp_prefix}
+      iface[cint][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
       iface[cint][:addresses][tmp_addr][:netmask] = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
 
       if line =~ /peer (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
@@ -304,52 +313,77 @@ Ohai.plugin(:Network) do
     if line =~ /inet6 ([a-f0-9\:]+)\/(\d+) scope (\w+)/
       iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
       tmp_addr = $1
-      iface[cint][:addresses][tmp_addr] = {"family" => "inet6", "prefixlen" => $2, "scope" => ($3.eql?("host") ? "Node" : $3.capitalize)}
+      iface[cint][:addresses][tmp_addr] = { "family" => "inet6", "prefixlen" => $2, "scope" => ($3.eql?("host") ? "Node" : $3.capitalize) }
     end
   end
 
   # returns the macaddress for interface from a hash of interfaces (iface elsewhere in this file)
   def get_mac_for_interface(interfaces, interface)
-    interfaces[interface][:addresses].select{|k,v| v["family"]=="lladdr"}.first.first unless interfaces[interface][:flags].include? "NOARP"
+    interfaces[interface][:addresses].select { |k, v| v["family"] == "lladdr" }.first.first unless interfaces[interface][:addresses].nil? || interfaces[interface][:flags].include?("NOARP")
   end
 
   # returns the default route with the lowest metric (unspecified metric is 0)
   def choose_default_route(routes)
-    default_route = routes.select do |r|
+    routes.select do |r|
       r[:destination] == "default"
-    end.sort do |x,y|
+    end.sort do |x, y|
       (x[:metric].nil? ? 0 : x[:metric].to_i) <=> (y[:metric].nil? ? 0 : y[:metric].to_i)
     end.first
   end
 
+  def interface_has_no_addresses_in_family?(iface, family)
+    return true if iface[:addresses].nil?
+    iface[:addresses].values.all? { |addr| addr["family"] != family }
+  end
+
+  def interface_have_address?(iface, address)
+    return false if iface[:addresses].nil?
+    iface[:addresses].key?(address)
+  end
+
+  def interface_address_not_link_level?(iface, address)
+    iface[:addresses][address][:scope].downcase != "link"
+  end
+
+  def interface_valid_for_route?(iface, address, family)
+    return true if interface_has_no_addresses_in_family?(iface, family)
+
+    interface_have_address?(iface, address) && interface_address_not_link_level?(iface, address)
+  end
+
+  def route_is_valid_default_route?(route, default_route)
+    # if the route destination is a default route, it's good
+    return true if route[:destination] == "default"
+
+    # the default route has a gateway and the route matches the gateway
+    !default_route[:via].nil? && IPAddress(route[:destination]).include?(IPAddress(default_route[:via]))
+  end
+
   # ipv4/ipv6 routes are different enough that having a single algorithm to select the favored route for both creates unnecessary complexity
   # this method attempts to deduce the route that is most important to the user, which is later used to deduce the favored values for {ip,mac,ip6}address
   # we only consider routes that are default routes, or those routes that get us to the gateway for a default route
   def favored_default_route(routes, iface, default_route, family)
     routes.select do |r|
       if family[:name] == "inet"
-        # selecting routes for ipv4
-        # using the source field when it's specified :
-        # 1) in the default route
-        # 2) in the route entry used to reach the default gateway
-        r[:src] and # it has a src field
-          iface[r[:dev]] and # the iface exists
-          iface[r[:dev]][:addresses].has_key? r[:src] and # the src ip is set on the node
-          iface[r[:dev]][:addresses][r[:src]][:scope].downcase != "link" and # this isn't a link level addresse
-          ( r[:destination] == "default" or
-            ( default_route[:via] and # the default route has a gateway
-              IPAddress(r[:destination]).include? IPAddress(default_route[:via]) # the route matches the gateway
-              )
-            )
+        # the route must have a source address
+        next if r[:src].nil? || r[:src].empty?
+
+        # the interface specified in the route must exist
+        route_interface = iface[r[:dev]]
+        next if route_interface.nil? # the interface specified in the route must exist
+
+        # the interface must have no addresses, or if it has the source address, the address must not
+        # be a link-level address
+        next unless interface_valid_for_route?(route_interface, r[:src], "inet")
+
+        # the route must either be a default route, or it must have a gateway which is accessible via the route
+        next unless route_is_valid_default_route?(r, default_route)
+
+        true
       elsif family[:name] == "inet6"
-        # selecting routes for ipv6
-        iface[r[:dev]] and # the iface exists
-          iface[r[:dev]][:state] == "up" and # the iface is up
-          ( r[:destination] == "default" or
-            ( default_route[:via] and # the default route has a gateway
-              IPAddress(r[:destination]).include? IPAddress(default_route[:via]) # the route matches the gateway
-              )
-            )
+        iface[r[:dev]] &&
+          iface[r[:dev]][:state] == "up" &&
+          route_is_valid_default_route?(r, default_route)
       end
     end.sort_by do |r|
       # sorting the selected routes:
@@ -365,7 +399,7 @@ Ohai.plugin(:Network) do
          IPAddress( r[:destination] == "default" ? family[:default_route] : r[:destination] ).prefix
        rescue
          0
-       end
+       end,
       ]
     end.first
   end
@@ -374,7 +408,7 @@ Ohai.plugin(:Network) do
   # If the 'ip' binary is available, this plugin may set {ip,mac,ip6}address. The network plugin should not overwrite these.
   # The older code section below that relies on the deprecated net-tools, e.g. netstat and ifconfig, provides less functionality.
   collect_data(:linux) do
-    require 'ipaddr'
+    require "ipaddr"
 
     iface = Mash.new
     net_counters = Mash.new
@@ -386,7 +420,7 @@ Ohai.plugin(:Network) do
 
     # ohai.plugin[:network][:default_route_table] = 'default'
     if configuration(:default_route_table).nil? || configuration(:default_route_table).empty?
-      default_route_table = 'main'
+      default_route_table = "main"
     else
       default_route_table = configuration(:default_route_table)
     end
@@ -403,14 +437,14 @@ Ohai.plugin(:Network) do
                     :name => "inet",
                     :default_route => "0.0.0.0/0",
                     :default_prefix => :default,
-                    :neighbour_attribute => :arp
+                    :neighbour_attribute => :arp,
                   }]
 
       families << {
                     :name => "inet6",
                     :default_route => "::/0",
                     :default_prefix => :default_inet6,
-                    :neighbour_attribute => :neighbour_inet6
+                    :neighbour_attribute => :neighbour_inet6,
                   } if ipv6_enabled?
 
       parse_ip_addr(iface)
@@ -430,11 +464,11 @@ Ohai.plugin(:Network) do
         default_route = choose_default_route(routes)
 
         if default_route.nil? or default_route.empty?
-          attribute_name == if family[:name] == "inet"
-                              "default_interface"
-                            else
-                              "default_#{family[:name]}_interface"
-                            end
+          attribute_name = if family[:name] == "inet"
+                             "default_interface"
+                           else
+                             "default_#{family[:name]}_interface"
+                           end
           Ohai::Log.debug("Unable to determine '#{attribute_name}' as no default routes were found for that interface family")
         else
           network["#{default_prefix}_interface"] = default_route[:dev]
@@ -476,7 +510,7 @@ Ohai.plugin(:Network) do
       begin
         so = shell_out("route -n")
         route_result = so.stdout.split($/).grep( /^0.0.0.0/ )[0].split( /[ \t]+/ )
-        network[:default_gateway], network[:default_interface] = route_result.values_at(1,7)
+        network[:default_gateway], network[:default_interface] = route_result.values_at(1, 7)
       rescue Ohai::Exceptions::Exec
         Ohai::Log.debug("Unable to determine default interface")
       end