ohai 8.6.0.alpha.1 → 8.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12feba79315d30d742f71e9c26690a64ad71d11e
-  data.tar.gz: fcf8ae37a2db845807a95a41deccf634a3373ff8
+  metadata.gz: e00fe8c9c7789a01f275184d7cfe7a6bbc4a8631
+  data.tar.gz: 2368b6c70151bf9b89ee2dc2d3518a8d10add807
 SHA512:
-  metadata.gz: a901bb634ac4cc771412dd23140c7c6af7d52e0123e9ba010d7debe478ccc678e7acfcf8302c7c9be972b4fcccc25c8a73d58872c985640ba66998be96785541
-  data.tar.gz: 4f792e178bf51309803110aad9c9ddb107aa7724417437013b845918d89244f09320389179bb12278ea3e57a86551d1ef2768592345f42a77d34eba40f8b4cff
+  metadata.gz: 9aa2d69b2544e9b270429795f02e3db9e8d2b978c16afba7fecfd377cfac3553c8da4a350a1e8d4edc55577c0a64d8d1d2266dc8135f1d354455494fb7b741c5
+  data.tar.gz: 523a0112f688c7536c5f4bff387ec0218f4ba8f0c97e995917dba271c2f41137c4793e572c826f3050ca577b4a0483c776c98376bd71a93913b61f388db8a79c

data/Rakefile

@@ -1,18 +1,7 @@
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rubygems/specification'
+require "bundler/gem_tasks"
 require 'date'
 require 'ohai/version'
 
-gemspec = eval(IO.read("ohai.gemspec"))
-
-Gem::PackageTask.new(gemspec).define
-
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{gem install pkg/ohai-#{Ohai::VERSION}.gem}
-end
-
 begin
   require 'rspec/core/rake_task'
 

data/lib/ohai/config.rb

@@ -18,7 +18,9 @@
 #
 
 require 'chef-config/config'
+require 'ohai/exception'
 require 'ohai/log'
+require 'ohai/plugin_config'
 
 module Ohai
   Config = ChefConfig::Config
@@ -93,6 +95,7 @@ module Ohai
       default :hints_path, Ohai::Config.default_hints_path
       default :log_level, :auto
       default :log_location, STDERR
+      default :plugin, Ohai::PluginConfig.new { |h, k| h[k] = Ohai::PluginConfig.new }
       default :plugin_path, Ohai::Config.default_plugin_path
     end
 

data/lib/ohai/dsl/plugin/versionvii.rb

@@ -100,6 +100,47 @@ module Ohai
         def require_plugin(*args)
           Ohai::Log.warn("[UNSUPPORTED OPERATION] \'require_plugin\' is no longer supported. Please use \'depends\' instead.\nIgnoring plugin(s) #{args.join(", ")}")
         end
+
+        def configuration(option, *options)
+          return nil if plugin_config.nil? || !plugin_config.key?(option)
+          value = plugin_config[option]
+          options.each do |opt|
+            return nil unless value.key?(opt)
+            value = value[opt]
+          end
+          value
+        end
+
+        private
+        def plugin_config
+          @plugin_config ||= fetch_plugin_config
+        end
+
+        def fetch_plugin_config
+          # DMI => ["DMI"]
+          # Memory => ["", "Memory"]
+          # NetworkListeners => ["", "Network", "", "Listeners"]
+          # SSHHostKey => ["SSH", "Host", "", "Key"]
+          parts = self.name.to_s.split(/([A-Z][a-z]+)/)
+          # ["DMI"] => ["DMI"]
+          # ["", "Memory"] => ["Memory"]
+          # ["", "Network", "", "Listeners"] => ["Network", "Listeners"]
+          # ["SSH", "Host", "", "Key"] => ["SSH", "Host", "Key"]
+          parts.delete_if { |part| part.empty? }
+          # ["DMI"] => :dmi
+          # ["Memory"] => :memory
+          # ["Network", "Listeners"] => :network_listeners
+          # ["SSH", "Host", "Key"] => :ssh_host_key
+          snake_case_name = parts.map { |part| part.downcase }.join("_").to_sym
+
+          # Plugin names in config hashes are auto-vivified, so we check with
+          # key? to avoid falsely instantiating a configuration hash.
+          if Ohai.config[:plugin].key?(snake_case_name)
+            Ohai.config[:plugin][snake_case_name]
+          else
+            nil
+          end
+        end
       end
     end
   end

data/lib/ohai/exception.rb

@@ -28,5 +28,6 @@ module Ohai
     class DependencyCycle < Error; end
     class DependencyNotFound < Error; end
     class AttributeSyntaxError < Error; end
+    class PluginConfigError < Error; end
   end
 end

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -0,0 +1,64 @@
+#
+# Author:: Alexey Karpik <alexey.karpik@rightscale.com>
+# Author:: Peter Schroeter <peter.schroeter@rightscale.com>
+# Author:: Stas Turlo <stanislav.turlo@rightscale.com>
+# Copyright:: Copyright (c) 2010-2014 RightScale Inc
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'net/https'
+require 'uri'
+
+# http://sldn.softlayer.com/reference/services/SoftLayer_Resource_Metadata
+module ::Ohai::Mixin::SoftlayerMetadata
+  SOFTLAYER_API_QUERY_URL = 'https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata' unless defined?(SOFTLAYER_API_QUERY_URL)
+
+  def fetch_metadata
+    metadata  = {
+      'public_fqdn'   => fetch_metadata_item("getFullyQualifiedDomainName.txt"),
+      'local_ipv4'    => fetch_metadata_item("getPrimaryBackendIpAddress.txt"),
+      'public_ipv4'   => fetch_metadata_item("getPrimaryIpAddress.txt"),
+      'region'        => fetch_metadata_item("getDatacenter.txt"),
+      'instance_id'   => fetch_metadata_item("getId.txt")
+    }
+  end
+
+  # Softlayer's metadata api is only available over HTTPS.
+  # Ruby by default does not link to the system's CA bundle
+  # however Chef-omnibus should set SSL_CERT_FILE to point to a valid file.
+  # Manually supply and specify a suitable CA bundle here or
+  # set the SSL_CERT_FILE file environment variable to a valid value otherwise.
+  def ca_file_location
+    ::Ohai::Config[:ca_file]
+  end
+
+  def fetch_metadata_item(item)
+    full_url = "#{SOFTLAYER_API_QUERY_URL}/#{item}"
+    u = URI(full_url)
+    net = ::Net::HTTP.new(u.hostname, u.port)
+    net.ssl_version = "TLSv1"
+    net.use_ssl = true
+    net.ca_file = ca_file_location
+    res = net.get(u.request_uri)
+    if res.code.to_i.between?(200,299)
+      res.body
+    else
+      ::Ohai::Log.error("Unable to fetch item #{full_url}: status (#{res.code}) body (#{res.body})")
+      nil
+    end
+  rescue => e
+    ::Ohai::Log.error("Unable to fetch softlayer metadata from #{u}: #{e.class}: #{e.message}")
+    raise e
+  end
+end

data/lib/ohai/plugin_config.rb

@@ -0,0 +1,46 @@
+#
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'ohai/exception'
+
+module Ohai
+  class PluginConfig < Hash
+
+    def []=(key, value_or_hash)
+      enforce_symbol(key)
+      enforce_symbol_keys(value_or_hash) if value_or_hash.is_a?(Hash)
+      super(key, value_or_hash)
+    end
+
+    private
+
+    def enforce_symbol(key)
+      unless key.is_a?(Symbol)
+        msg = "Expected Symbol, got #{key.inspect}"
+        raise Ohai::Exceptions::PluginConfigError, msg
+      end
+    end
+
+    def enforce_symbol_keys(hash)
+      hash.each do |key, value|
+        enforce_symbol(key)
+        enforce_symbol_keys(value) if value.is_a?(Hash)
+      end
+    end
+
+  end
+end

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

@@ -22,32 +22,37 @@ Ohai.plugin(:CPU) do
 
   collect_data(:aix) do
     cpu Mash.new
-
-    # IBM is the only maker of CPUs for AIX systems.
-    cpu[:vendor_id] = "IBM"
+    
+    cpu[:total] = shell_out("pmcycles -m").stdout.lines.length
     # At least one CPU will be available, but we'll wait to increment this later.
     cpu[:available] = 0
-    cpu[:total] = 0
 
     cpudevs = shell_out("lsdev -Cc processor").stdout.lines
-    cpudevs.each do |c|
-      cpu[:total] += 1
+    #from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
+    #on AIX number of cores and processors are considered same 
+    cpu[:real] = cpu[:cores] = cpudevs.length 
+    cpudevs.each.with_index do |c,i|
       name, status, location = c.split
-      cpu[name] = Mash.new
-      cpu[name][:status] = status
-      cpu[name][:location] = location
+      index = i.to_s
+      cpu[index] = Mash.new
+      cpu[index][:status] = status
+      cpu[index][:location] = location
       if status =~ /Available/
-  	cpu[:available] += 1
-  	lsattr = shell_out("lsattr -El #{name}").stdout.lines
-  	lsattr.each do |attribute|
+        cpu[:available] += 1
+        lsattr = shell_out("lsattr -El #{name}").stdout.lines
+        lsattr.each do |attribute|
           attrib, value = attribute.split
-          cpu[name][attrib] = value
-  	end
+          if attrib == "type"
+            cpu[index][:model_name] = value
+          elsif attrib == "frequency"
+            cpu[index][:mhz] = value.to_i / (1000 * 1000) #convert from hz to MHz
+          else
+            cpu[index][attrib] = value
+          end
+		end
+        # IBM is the only maker of CPUs for AIX systems.
+        cpu[index][:vendor_id] = "IBM"
       end
     end
-
-    # Every AIX system has proc0.
-    cpu[:model] = cpu[:proc0][:type]
-    cpu[:mhz] = cpu[:proc0][:frequency].to_i / 1024
   end
 end

data/lib/ohai/plugins/aix/memory.rb

@@ -20,9 +20,16 @@ Ohai.plugin(:Memory) do
   provides "memory"
 
   collect_data(:aix) do
-    memory = Mash.new
+    memory Mash.new
+    memory[:swap] = Mash.new
 
     meminfo = shell_out("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'").stdout
-    memory[:total], u, memory[:free] = meminfo.split
+    total_in_mb, u, free_in_mb = meminfo.split
+    memory[:total] = "#{total_in_mb.to_i * 1024}kB"
+    memory[:free] = "#{free_in_mb.to_i * 1024}kB"
+    
+    swapinfo = shell_out("swap -s").stdout.split #returns swap info in 4K blocks
+    memory[:swap]['total'] = "#{(swapinfo[2].to_i) * 4}kB"
+    memory[:swap]['free'] = "#{(swapinfo[10].to_i) * 4}kB"
   end
 end

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

@@ -56,7 +56,7 @@ Ohai.plugin(:Network) do
     end
 
     # List the interfaces in system.
-    so = shell_out("lsdev -Cc if")
+    so = shell_out("lsdev -Cc if | grep Available")
     so.stdout.lines.each do |line|
       if line =~ /(\S+) (\S+)\s+(.+)/
         interface = $1

data/lib/ohai/plugins/cloud.rb

@@ -25,6 +25,7 @@ Ohai.plugin(:Cloud) do
   depends "openstack"
   depends "azure"
   depends "digital_ocean"
+  depends "softlayer"
 
   # Make top-level cloud hashes
   #
@@ -60,7 +61,7 @@ Ohai.plugin(:Cloud) do
     private_ips = gce['instance']["networkInterfaces"].collect do |interface|
       interface['ip']
     end.compact
-    
+
     cloud[:public_ips] += public_ips
     cloud[:private_ips] += private_ips
     cloud[:public_ipv4] +=  public_ips
@@ -108,7 +109,7 @@ Ohai.plugin(:Cloud) do
   end
 
   # Fill cloud hash with rackspace values
-  def get_rackspace_values 
+  def get_rackspace_values
     cloud[:public_ips] << rackspace['public_ipv4'] if rackspace['public_ipv4']
     cloud[:private_ips] << rackspace['local_ipv4'] if rackspace['local_ipv4']
     cloud[:public_ipv4] = rackspace['public_ipv4']
@@ -245,7 +246,31 @@ Ohai.plugin(:Cloud) do
     cloud[:provider] = "digital_ocean"
   end
 
-  collect_data do    
+  # ----------------------------------------
+  # softlayer
+  # ----------------------------------------
+
+  # Is current cloud softlayer?
+  #
+  # === Return
+  # true:: If softlayer Hash is defined
+  # false:: Otherwise
+  def on_softlayer?
+    softlayer != nil
+  end
+
+  # Fill cloud hash with softlayer values
+  def get_softlayer_values
+    cloud[:public_ipv4] = softlayer['public_ipv4']
+    cloud[:local_ipv4] = softlayer['local_ipv4']
+    cloud[:public_ips] << softlayer['public_ipv4'] if softlayer['public_ipv4']
+    cloud[:private_ips] << softlayer['local_ipv4'] if softlayer['local_ipv4']
+    cloud[:public_hostname] = softlayer['public_fqdn']
+    cloud[:provider] = 'softlayer'
+  end
+
+
+  collect_data do
     # setup gce cloud
     if on_gce?
       create_objects
@@ -292,5 +317,11 @@ Ohai.plugin(:Cloud) do
       create_objects
       get_digital_ocean_values
     end
+
+    # setup softlayer cloud
+    if on_softlayer?
+      create_objects
+      get_softlayer_values
+    end
   end
 end

data/lib/ohai/plugins/ec2.rb

@@ -18,6 +18,7 @@
 # limitations under the License.
 
 require 'ohai/mixin/ec2_metadata'
+require 'base64'
 
 Ohai.plugin(:EC2) do
   include Ohai::Mixin::Ec2Metadata
@@ -58,6 +59,11 @@ Ohai.plugin(:EC2) do
         ec2[k] = v
       end
       ec2[:userdata] = self.fetch_userdata
+      #ASCII-8BIT is equivalent to BINARY in this case
+      if ec2[:userdata].encoding.to_s == "ASCII-8BIT"
+        Ohai::Log.debug("Binary UserData Found. Storing in base64")
+        ec2[:userdata] = Base64.encode64(ec2[:userdata])
+      end
     else
       Ohai::Log.debug("looks_like_ec2? == false")
       false

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

@@ -41,6 +41,246 @@ Ohai.plugin(:Network) do
     ["/sbin/ip", "/usr/bin/ip", "/bin/ip"].any? { |path| File.exist?(path) }
   end
 
+  def is_openvz?
+    ::File.directory?('/proc/vz')
+  end
+
+  def is_openvz_host?
+    is_openvz? && ::File.directory?('/proc/bc')
+  end
+
+  def extract_neighbors(family, iface, neigh_attr)
+    so = shell_out("ip -f #{family[:name]} neigh show")
+    so.stdout.lines do |line|
+      if line =~ /^([a-f0-9\:\.]+)\s+dev\s+([^\s]+)\s+lladdr\s+([a-fA-F0-9\:]+)/
+        interface = iface[$2]
+        unless interface
+          Ohai::Log.warn("neighbor list has entries for unknown interface #{interface}")
+          next
+        end
+        interface[neigh_attr] = Mash.new unless interface[neigh_attr]
+        interface[neigh_attr][$1] = $3.downcase
+      end
+    end
+    iface
+  end
+
+  # checking the routing tables
+  # why ?
+  # 1) to set the default gateway and default interfaces attributes
+  # 2) on some occasions, the best way to select node[:ipaddress] is to look at
+  #    the routing table source field.
+  # 3) and since we're at it, let's populate some :routes attributes
+  # (going to do that for both inet and inet6 addresses)
+  def check_routing_table(family, iface)
+    so = shell_out("ip -o -f #{family[:name]} route show")
+    so.stdout.lines do |line|
+      line.strip!
+      Ohai::Log.debug("Parsing #{line}")
+      if line =~ /\\/
+        parts = line.split('\\')
+        route_dest = parts.shift.strip
+        route_endings = parts
+      elsif line =~ /^([^\s]+)\s(.*)$/
+        route_dest = $1
+        route_endings = [$2]
+      else
+        next
+      end
+      route_endings.each do |route_ending|
+        if route_ending =~ /\bdev\s+([^\s]+)\b/
+          route_int = $1
+        else
+          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']
+
+        unless iface[route_int]
+          Ohai::Log.debug("Skipping previously unseen interface from 'ip route show': #{route_int}")
+          next
+        end
+
+        route_entry = Mash.new(:destination => route_dest,
+                               :family => family[:name])
+        %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]
+
+        iface[route_int][:routes] = Array.new unless iface[route_int][:routes]
+        iface[route_int][:routes] << route_entry
+      end
+    end
+    iface
+  end
+
+  # now looking at the routes to set the default attributes
+  # for information, default routes can be of this form :
+  # - default via 10.0.2.4 dev br0
+  # - default dev br0  scope link
+  # - 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
+
+  # using a temporary var to hold routes and their interface name
+  def parse_routes(family, iface)
+    iface.collect do |i, iv|
+      iv[:routes].collect do |r|
+        r.merge(:dev => i) if r[:family] == family[:name]
+      end.compact if iv[:routes]
+    end.compact.flatten
+  end
+
+
+  def link_statistics(iface, net_counters)
+    so = shell_out("ip -d -s link")
+    tmp_int = nil
+    on_rx = true
+    so.stdout.lines do |line|
+      if line =~ IPROUTE_INT_REGEX
+        tmp_int = $2
+        iface[tmp_int] = Mash.new unless iface[tmp_int]
+        net_counters[tmp_int] = Mash.new unless net_counters[tmp_int]
+      end
+
+      if line =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+        int = on_rx ? :rx : :tx
+        net_counters[tmp_int][int] = Mash.new unless net_counters[tmp_int][int]
+        net_counters[tmp_int][int][:bytes] = $1
+        net_counters[tmp_int][int][:packets] = $2
+        net_counters[tmp_int][int][:errors] = $3
+        net_counters[tmp_int][int][:drop] = $4
+        if (int == :rx)
+          net_counters[tmp_int][int][:overrun] = $5
+        else
+          net_counters[tmp_int][int][:carrier] = $5
+          net_counters[tmp_int][int][:collisions] = $6
+        end
+
+        on_rx = !on_rx
+      end
+
+      if line =~ /qlen (\d+)/
+        net_counters[tmp_int][:tx] = Mash.new unless net_counters[tmp_int][:tx]
+        net_counters[tmp_int][:tx][:queuelen] = $1
+      end
+
+      if line =~ /vlan id (\d+)/ or line =~ /vlan protocol ([\w\.]+) id (\d+)/
+        if $2
+          tmp_prot = $1
+          tmp_id = $2
+        else
+          tmp_id = $1
+        end
+        iface[tmp_int][:vlan] = Mash.new unless iface[tmp_int][:vlan]
+        iface[tmp_int][:vlan][:id] = tmp_id
+        iface[tmp_int][:vlan][:protocol] = tmp_prot if tmp_prot
+
+        vlan_flags = line.scan(/(REORDER_HDR|GVRP|LOOSE_BINDING)/)
+        if vlan_flags.length > 0
+          iface[tmp_int][:vlan][:flags] = vlan_flags.flatten.uniq
+        end
+      end
+
+      if line =~ /state (\w+)/
+        iface[tmp_int]['state'] = $1.downcase
+      end
+    end
+    iface
+  end
+
+  def match_iproute(iface, line, cint)
+    if line =~ IPROUTE_INT_REGEX
+      cint = $2
+      iface[cint] = Mash.new
+      if cint =~ /^(\w+)(\d+.*)/
+        iface[cint][:type] = $1
+        iface[cint][:number] = $2
+      end
+
+      if line =~ /mtu (\d+)/
+        iface[cint][:mtu] = $1
+      end
+
+      flags = line.scan(/(UP|BROADCAST|DEBUG|LOOPBACK|POINTTOPOINT|NOTRAILERS|LOWER_UP|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC)/)
+      if flags.length > 1
+        iface[cint][:flags] = flags.flatten.uniq
+      end
+    end
+    cint
+  end
+
+  def parse_ip_addr(iface)
+    so = shell_out("ip addr")
+    cint = nil
+    so.stdout.lines do |line|
+      cint = match_iproute(iface, line, cint)
+
+      parse_ip_addr_link_line(cint, iface, line)
+      cint = parse_ip_addr_inet_line(cint, iface, line)
+      parse_ip_addr_inet6_line(cint, iface, line)
+    end
+  end
+
+
+  def parse_ip_addr_link_line(cint, iface, line)
+    if line =~ /link\/(\w+) ([\da-f\:]+) /
+      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"}
+      end
+    end
+  end
+
+  def parse_ip_addr_inet_line(cint, iface, line)
+    if line =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/(\d{1,2}))?/
+      tmp_addr, tmp_prefix = $1, $3
+      tmp_prefix ||= "32"
+      original_int = nil
+
+      # Are we a formerly aliased interface?
+      if line =~ /#{cint}:(\d+)$/
+        sub_int = $1
+        alias_int = "#{cint}:#{sub_int}"
+        original_int = cint
+        cint = alias_int
+      end
+
+      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][: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})/
+        iface[cint][:addresses][tmp_addr][:peer] = $1
+      end
+
+      if line =~ /brd (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+        iface[cint][:addresses][tmp_addr][:broadcast] = $1
+      end
+
+      if line =~ /scope (\w+)/
+        iface[cint][:addresses][tmp_addr][:scope] = ($1.eql?("host") ? "Node" : $1.capitalize)
+      end
+
+      # If we found we were an an alias interface, restore cint to its original value
+      cint = original_int unless original_int.nil?
+    end
+    cint
+  end
+
+  def parse_ip_addr_inet6_line(cint, iface, line)
+    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)}
+    end
+  end
+
   collect_data(:linux) do
     require 'ipaddr'
 
@@ -73,204 +313,19 @@ Ohai.plugin(:Network) do
                     :neighbour_attribute => :neighbour_inet6
                   } if ipv6_enabled?
 
-      so = shell_out("ip addr")
-      cint = nil
-      so.stdout.lines do |line|
-        if line =~ IPROUTE_INT_REGEX
-          cint = $2
-          iface[cint] = Mash.new
-          if cint =~ /^(\w+)(\d+.*)/
-            iface[cint][:type] = $1
-            iface[cint][:number] = $2
-          end
-
-          if line =~ /mtu (\d+)/
-            iface[cint][:mtu] = $1
-          end
-
-          flags = line.scan(/(UP|BROADCAST|DEBUG|LOOPBACK|POINTTOPOINT|NOTRAILERS|LOWER_UP|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC)/)
-          if flags.length > 1
-            iface[cint][:flags] = flags.flatten.uniq
-          end
-        end
-        if line =~ /link\/(\w+) ([\da-f\:]+) /
-          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" }
-          end
-        end
-        if line =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/(\d{1,2}))?/
-          tmp_addr, tmp_prefix = $1, $3
-          tmp_prefix ||= "32"
-          original_int = nil
-
-          # Are we a formerly aliased interface?
-          if line =~ /#{cint}:(\d+)$/
-            sub_int = $1
-            alias_int = "#{cint}:#{sub_int}"
-            original_int = cint
-            cint = alias_int
-          end
+      parse_ip_addr(iface)
 
-          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][: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})/
-            iface[cint][:addresses][tmp_addr][:peer] = $1
-          end
-
-          if line =~ /brd (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-            iface[cint][:addresses][tmp_addr][:broadcast] = $1
-          end
-
-          if line =~ /scope (\w+)/
-            iface[cint][:addresses][tmp_addr][:scope] = ($1.eql?("host") ? "Node" : $1.capitalize)
-          end
-
-          # If we found we were an an alias interface, restore cint to its original value
-          cint = original_int unless original_int.nil?
-        end
-        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) }
-        end
-      end
-
-      so = shell_out("ip -d -s link")
-      tmp_int = nil
-      on_rx = true
-      so.stdout.lines do |line|
-        if line =~ IPROUTE_INT_REGEX
-          tmp_int = $2
-          iface[tmp_int] = Mash.new unless iface[tmp_int]
-          net_counters[tmp_int] = Mash.new unless net_counters[tmp_int]
-        end
-
-        if line =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
-          int = on_rx ? :rx : :tx
-          net_counters[tmp_int][int] = Mash.new unless net_counters[tmp_int][int]
-          net_counters[tmp_int][int][:bytes] = $1
-          net_counters[tmp_int][int][:packets] = $2
-          net_counters[tmp_int][int][:errors] = $3
-          net_counters[tmp_int][int][:drop] = $4
-          if(int == :rx)
-            net_counters[tmp_int][int][:overrun] = $5
-          else
-            net_counters[tmp_int][int][:carrier] = $5
-            net_counters[tmp_int][int][:collisions] = $6
-          end
-
-          on_rx = !on_rx
-        end
-
-        if line =~ /qlen (\d+)/
-          net_counters[tmp_int][:tx] = Mash.new unless net_counters[tmp_int][:tx]
-          net_counters[tmp_int][:tx][:queuelen] = $1
-        end
-
-        if line =~ /vlan id (\d+)/ or line =~ /vlan protocol ([\w\.]+) id (\d+)/
-          if $2
-            tmp_prot = $1
-            tmp_id = $2
-          else
-            tmp_id = $1
-          end
-          iface[tmp_int][:vlan] = Mash.new unless iface[tmp_int][:vlan]
-          iface[tmp_int][:vlan][:id] = tmp_id
-          iface[tmp_int][:vlan][:protocol] = tmp_prot if tmp_prot
-
-          vlan_flags = line.scan(/(REORDER_HDR|GVRP|LOOSE_BINDING)/)
-          if vlan_flags.length > 0
-            iface[tmp_int][:vlan][:flags] = vlan_flags.flatten.uniq
-          end
-        end
-
-        if line =~ /state (\w+)/
-          iface[tmp_int]['state'] = $1.downcase
-        end
-      end
+      iface = link_statistics(iface, net_counters)
 
       families.each do |family|
         neigh_attr = family[:neighbour_attribute]
         default_prefix = family[:default_prefix]
 
-        so = shell_out("ip -f #{family[:name]} neigh show")
-        so.stdout.lines do |line|
-          if line =~ /^([a-f0-9\:\.]+)\s+dev\s+([^\s]+)\s+lladdr\s+([a-fA-F0-9\:]+)/
-            unless iface[$2]
-              Ohai::Log.warn("neighbour list has entries for unknown interface #{iface[$2]}")
-              next
-            end
-            iface[$2][neigh_attr] = Mash.new unless iface[$2][neigh_attr]
-            iface[$2][neigh_attr][$1] = $3.downcase
-          end
-        end
-
-        # checking the routing tables
-        # why ?
-        # 1) to set the default gateway and default interfaces attributes
-        # 2) on some occasions, the best way to select node[:ipaddress] is to look at
-        #    the routing table source field.
-        # 3) and since we're at it, let's populate some :routes attributes
-        # (going to do that for both inet and inet6 addresses)
-        so = shell_out("ip -o -f #{family[:name]} route show")
-        so.stdout.lines do |line|
-          line.strip!
-          Ohai::Log.debug("Parsing #{line}")
-          if line =~ /\\/
-            parts = line.split('\\')
-            route_dest = parts.shift.strip
-            route_endings = parts
-          elsif line =~ /^([^\s]+)\s(.*)$/
-            route_dest = $1
-            route_endings = [$2]
-          else
-            next
-          end
-          route_endings.each do |route_ending|
-            if route_ending =~ /\bdev\s+([^\s]+)\b/
-              route_int = $1
-            else
-              Ohai::Log.debug("Skipping route entry without a device: '#{line}'")
-              next
-            end
-
-            unless iface[route_int]
-              Ohai::Log.debug("Skipping previously unseen interface from 'ip route show': #{route_int}")
-              next
-            end
-
-            route_entry = Mash.new( :destination => route_dest,
-                                    :family => family[:name] )
-            %w[via scope metric proto src].each do |k|
-              route_entry[k] = $1 if route_ending =~ /\b#{k}\s+([^\s]+)\b/
-            end
+        iface = extract_neighbors(family, iface, neigh_attr)
 
-            # 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]
+        iface = check_routing_table(family, iface)
 
-            iface[route_int][:routes] = Array.new unless iface[route_int][:routes]
-            iface[route_int][:routes] << route_entry
-          end
-        end
-        # now looking at the routes to set the default attributes
-        # for information, default routes can be of this form :
-        # - default via 10.0.2.4 dev br0
-        # - default dev br0  scope link
-        # - 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
-
-        # using a temporary var to hold routes and their interface name
-        routes = iface.collect do |i,iv|
-          iv[:routes].collect do |r|
-            r.merge(:dev=>i) if r[:family] == family[:name]
-          end.compact if iv[:routes]
-        end.compact.flatten
+        routes = parse_routes(family, iface)
 
         # using a temporary var to hold the default route
         # in case there are more than 1 default route, sort it by its metric