facter 4.0.47 → 4.0.48

data/lib/facter/resolvers/{ssh_resolver.rb → ssh.rb}

@@ -2,7 +2,7 @@
 
 module Facter
   module Resolvers
-    class SshResolver < BaseResolver
+    class Ssh < BaseResolver
       @log = Facter::Log.new(self)
 
       init_resolver

data/lib/facter/resolvers/windows/{networking_resolver.rb → networking.rb}

@@ -28,6 +28,8 @@ module Facter
 
             Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
 
+            retrieve_domain_from_registry if !@fact_list[:domain] || @fact_list[:domain].empty?
+
             @fact_list[fact_name]
           end
 
@@ -130,6 +132,17 @@ module Facter
               @fact_list[:primary_interface] = name.to_s
             end
           end
+
+          def retrieve_domain_from_registry
+            ::Win32::Registry::HKEY_LOCAL_MACHINE.open('SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters') do |rg|
+              rg.each do |name, _value|
+                @fact_list[:domain] = rg[name] if name == 'Domain'
+              end
+            end
+          rescue Win32::Registry::Error
+            @log.debug('Could not read TCPIP Parameters from registry')
+            nil
+          end
         end
       end
     end

data/lib/facter/util/facts/facts_utils.rb

@@ -9,6 +9,22 @@ module Facter
                            'BHYVE' => 'bhyve' }.freeze
 
       PHYSICAL_HYPERVISORS = %w[physical xen0 vmware_server vmware_workstation openvzhn vserver_host].freeze
+      REDHAT_FAMILY = %w[redhat rhel fedora centos scientific ascendos cloudlinux psbm
+                         oraclelinux ovs oel amazon xenserver xcp-ng virtuozzo photon].freeze
+      DEBIAN_FAMILY = %w[debian ubuntu huaweios linuxmint devuan kde].freeze
+      SUSE_FAMILY = %w[sles sled suse].freeze
+      GENTOO_FAMILY = ['gentoo'].freeze
+      ARCH_FAMILY = %w[arch manjaro].freeze
+      MANDRAKE_FAMILY = %w[mandrake mandriva mageia].freeze
+      FAMILY_HASH = { 'RedHat' => REDHAT_FAMILY, 'Debian' => DEBIAN_FAMILY, 'Suse' => SUSE_FAMILY,
+                      'Gentoo' => GENTOO_FAMILY, 'Archlinux' => ARCH_FAMILY, 'Mandrake' => MANDRAKE_FAMILY }.freeze
+
+      class << self
+        def discover_family(os)
+          FAMILY_HASH.each { |key, array_value| return key if array_value.any? { |os_flavour| os =~ /#{os_flavour}/i } }
+          os
+        end
+      end
     end
   end
 end

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.0.47' unless defined?(VERSION)
+  VERSION = '4.0.48' unless defined?(VERSION)
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.47
+  version: 4.0.48
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.23
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.23
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.38'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
   requirement: !ruby/object:Gem::Requirement
@@ -834,72 +834,72 @@ files:
 - lib/facter/models/searched_fact.rb
 - lib/facter/patches/sysfilesystem/sys/statvfs.rb
 - lib/facter/resolvers/aio_agent_version.rb
-- lib/facter/resolvers/aix/architecture_resolver.rb
+- lib/facter/resolvers/aix/architecture.rb
 - lib/facter/resolvers/aix/disks.rb
 - lib/facter/resolvers/aix/ffi/ffi_helper.rb
-- lib/facter/resolvers/aix/filesystem_resolver.rb
-- lib/facter/resolvers/aix/hardware_resolver.rb
-- lib/facter/resolvers/aix/load_averages_resolver.rb
+- lib/facter/resolvers/aix/filesystem.rb
+- lib/facter/resolvers/aix/hardware.rb
+- lib/facter/resolvers/aix/load_averages.rb
 - lib/facter/resolvers/aix/memory.rb
 - lib/facter/resolvers/aix/mountpoints.rb
-- lib/facter/resolvers/aix/networking_resolver.rb
+- lib/facter/resolvers/aix/networking.rb
 - lib/facter/resolvers/aix/nim.rb
 - lib/facter/resolvers/aix/os_level.rb
 - lib/facter/resolvers/aix/partitions.rb
 - lib/facter/resolvers/aix/processors.rb
 - lib/facter/resolvers/aix/serialnumber.rb
-- lib/facter/resolvers/augeas_resolver.rb
+- lib/facter/resolvers/augeas.rb
 - lib/facter/resolvers/base_resolver.rb
 - lib/facter/resolvers/bsd/ffi/ffi_helper.rb
 - lib/facter/resolvers/bsd/processors.rb
 - lib/facter/resolvers/cloud.rb
 - lib/facter/resolvers/containers.rb
 - lib/facter/resolvers/debian_version.rb
-- lib/facter/resolvers/disk_resolver.rb
+- lib/facter/resolvers/disk.rb
+- lib/facter/resolvers/dmi.rb
 - lib/facter/resolvers/dmi_decode.rb
-- lib/facter/resolvers/dmi_resolver.rb
 - lib/facter/resolvers/ec2.rb
-- lib/facter/resolvers/eos_release_resolver.rb
-- lib/facter/resolvers/facterversion_resolver.rb
-- lib/facter/resolvers/filesystems_resolver.rb
-- lib/facter/resolvers/fips_enabled_resolver.rb
-- lib/facter/resolvers/freebsd/dmi_resolver.rb
+- lib/facter/resolvers/eos_release.rb
+- lib/facter/resolvers/facterversion.rb
+- lib/facter/resolvers/filesystems.rb
+- lib/facter/resolvers/fips_enabled.rb
+- lib/facter/resolvers/freebsd/dmi.rb
 - lib/facter/resolvers/freebsd/ffi/ffi_helper.rb
-- lib/facter/resolvers/freebsd/freebsd_version_resolver.rb
-- lib/facter/resolvers/freebsd/geom_resolver.rb
+- lib/facter/resolvers/freebsd/freebsd_version.rb
+- lib/facter/resolvers/freebsd/geom.rb
 - lib/facter/resolvers/freebsd/processors.rb
-- lib/facter/resolvers/freebsd/swap_memory_resolver.rb
-- lib/facter/resolvers/freebsd/system_memory_resolver.rb
-- lib/facter/resolvers/freebsd/virtual_resolver.rb
+- lib/facter/resolvers/freebsd/swap_memory.rb
+- lib/facter/resolvers/freebsd/system_memory.rb
+- lib/facter/resolvers/freebsd/virtual.rb
 - lib/facter/resolvers/gce.rb
-- lib/facter/resolvers/hostname_resolver.rb
-- lib/facter/resolvers/identity_resolver.rb
+- lib/facter/resolvers/hostname.rb
+- lib/facter/resolvers/identity.rb
 - lib/facter/resolvers/linux/docker_uptime.rb
 - lib/facter/resolvers/linux/load_averages.rb
 - lib/facter/resolvers/load_averages.rb
-- lib/facter/resolvers/lpar_resolver.rb
-- lib/facter/resolvers/lsb_release_resolver.rb
+- lib/facter/resolvers/lpar.rb
+- lib/facter/resolvers/lsb_release.rb
 - lib/facter/resolvers/lspci.rb
-- lib/facter/resolvers/macosx/dmi_resolver.rb
-- lib/facter/resolvers/macosx/filesystems_resolver.rb
-- lib/facter/resolvers/macosx/load_averages_resolver.rb
-- lib/facter/resolvers/macosx/mountpoints_resolver.rb
-- lib/facter/resolvers/macosx/processor_resolver.rb
-- lib/facter/resolvers/macosx/swap_memory_resolver.rb
-- lib/facter/resolvers/macosx/system_memory_resolver.rb
-- lib/facter/resolvers/macosx/system_profiler_resolver.rb
-- lib/facter/resolvers/memory_resolver.rb
-- lib/facter/resolvers/mountpoints_resolver.rb
-- lib/facter/resolvers/networking_linux_resolver.rb
-- lib/facter/resolvers/networking_resolver.rb
+- lib/facter/resolvers/macosx/dmi.rb
+- lib/facter/resolvers/macosx/filesystems.rb
+- lib/facter/resolvers/macosx/load_averages.rb
+- lib/facter/resolvers/macosx/mountpoints.rb
+- lib/facter/resolvers/macosx/processor.rb
+- lib/facter/resolvers/macosx/swap_memory.rb
+- lib/facter/resolvers/macosx/system_memory.rb
+- lib/facter/resolvers/macosx/system_profiler.rb
+- lib/facter/resolvers/memory.rb
+- lib/facter/resolvers/mountpoints.rb
+- lib/facter/resolvers/networking.rb
+- lib/facter/resolvers/networking_linux.rb
 - lib/facter/resolvers/open_vz.rb
-- lib/facter/resolvers/os_release_resolver.rb
+- lib/facter/resolvers/os_release.rb
 - lib/facter/resolvers/partitions.rb
-- lib/facter/resolvers/path_resolver.rb
-- lib/facter/resolvers/processors_resolver.rb
-- lib/facter/resolvers/redhat_release_resolver.rb
-- lib/facter/resolvers/ruby_resolver.rb
-- lib/facter/resolvers/selinux_resolver.rb
+- lib/facter/resolvers/path.rb
+- lib/facter/resolvers/processors.rb
+- lib/facter/resolvers/redhat_release.rb
+- lib/facter/resolvers/ruby.rb
+- lib/facter/resolvers/selinux.rb
 - lib/facter/resolvers/solaris/disks.rb
 - lib/facter/resolvers/solaris/dmi.rb
 - lib/facter/resolvers/solaris/dmi_sparc.rb
@@ -916,17 +916,17 @@ files:
 - lib/facter/resolvers/solaris/processors.rb
 - lib/facter/resolvers/solaris/zone.rb
 - lib/facter/resolvers/solaris/zone_name.rb
-- lib/facter/resolvers/ssh_resolver.rb
-- lib/facter/resolvers/suse_release_resolver.rb
-- lib/facter/resolvers/sw_vers_resolver.rb
-- lib/facter/resolvers/timezone_resolver.rb
-- lib/facter/resolvers/uname_resolver.rb
-- lib/facter/resolvers/uptime_resolver.rb
+- lib/facter/resolvers/ssh.rb
+- lib/facter/resolvers/suse_release.rb
+- lib/facter/resolvers/sw_vers.rb
+- lib/facter/resolvers/timezone.rb
+- lib/facter/resolvers/uname.rb
+- lib/facter/resolvers/uptime.rb
 - lib/facter/resolvers/virt_what.rb
 - lib/facter/resolvers/vmware.rb
 - lib/facter/resolvers/windows/aio_agent_version.rb
-- lib/facter/resolvers/windows/dmi_bios_resolver.rb
-- lib/facter/resolvers/windows/dmi_computersystem_resolver.rb
+- lib/facter/resolvers/windows/dmi_bios.rb
+- lib/facter/resolvers/windows/dmi_computersystem.rb
 - lib/facter/resolvers/windows/ffi/ffi.rb
 - lib/facter/resolvers/windows/ffi/hardware_ffi.rb
 - lib/facter/resolvers/windows/ffi/identity_ffi.rb
@@ -939,21 +939,21 @@ files:
 - lib/facter/resolvers/windows/ffi/performance_information.rb
 - lib/facter/resolvers/windows/ffi/system32_ffi.rb
 - lib/facter/resolvers/windows/ffi/system_info.rb
-- lib/facter/resolvers/windows/fips_resolver.rb
-- lib/facter/resolvers/windows/hardware_architecture_resolver.rb
-- lib/facter/resolvers/windows/identity_resolver.rb
-- lib/facter/resolvers/windows/kernel_resolver.rb
-- lib/facter/resolvers/windows/memory_resolver.rb
-- lib/facter/resolvers/windows/netkvm_resolver.rb
-- lib/facter/resolvers/windows/networking_resolver.rb
-- lib/facter/resolvers/windows/processors_resolver.rb
-- lib/facter/resolvers/windows/product_release_resolver.rb
+- lib/facter/resolvers/windows/fips.rb
+- lib/facter/resolvers/windows/hardware_architecture.rb
+- lib/facter/resolvers/windows/identity.rb
+- lib/facter/resolvers/windows/kernel.rb
+- lib/facter/resolvers/windows/memory.rb
+- lib/facter/resolvers/windows/netkvm.rb
+- lib/facter/resolvers/windows/networking.rb
+- lib/facter/resolvers/windows/processors.rb
+- lib/facter/resolvers/windows/product_release.rb
 - lib/facter/resolvers/windows/ssh.rb
-- lib/facter/resolvers/windows/system32_resolver.rb
-- lib/facter/resolvers/windows/uptime_resolver.rb
-- lib/facter/resolvers/windows/virtualization_resolver.rb
-- lib/facter/resolvers/windows/win_os_description_resolver.rb
-- lib/facter/resolvers/wpar_resolver.rb
+- lib/facter/resolvers/windows/system32.rb
+- lib/facter/resolvers/windows/uptime.rb
+- lib/facter/resolvers/windows/virtualization.rb
+- lib/facter/resolvers/windows/win_os_description.rb
+- lib/facter/resolvers/wpar.rb
 - lib/facter/resolvers/xen.rb
 - lib/facter/resolvers/zfs.rb
 - lib/facter/resolvers/zpool.rb
@@ -973,7 +973,6 @@ files:
 - lib/facter/util/resolvers/filesystem_helper.rb
 - lib/facter/util/resolvers/fingerprint.rb
 - lib/facter/util/resolvers/http.rb
-- lib/facter/util/resolvers/networking.rb
 - lib/facter/util/resolvers/networking/dhcp.rb
 - lib/facter/util/resolvers/networking/networking.rb
 - lib/facter/util/resolvers/networking/primary_interface.rb

data/lib/facter/resolvers/networking_linux_resolver.rb

@@ -1,258 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Resolvers
-    class NetworkingLinux < BaseResolver
-      init_resolver
-
-      DIRS = ['/var/lib/dhclient/', '/var/lib/dhcp/', '/var/lib/dhcp3/', '/var/lib/NetworkManager/', '/var/db/'].freeze
-      ROUTE_TYPES = %w[anycast
-                       unicast
-                       broadcast
-                       local
-                       nat
-                       unreachable
-                       prohibit
-                       blackhole
-                       throw].freeze
-
-      class << self
-        private
-
-        def post_resolve(fact_name)
-          @fact_list.fetch(fact_name) { retrieve_network_info(fact_name) }
-
-          @fact_list[fact_name]
-        end
-
-        def retrieve_network_info(fact_name)
-          mtu_and_indexes = interfaces_mtu_and_index
-          retrieve_interface_info(mtu_and_indexes)
-          add_info_from_routing_table
-          retrieve_primary_interface
-          Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
-          @fact_list[fact_name]
-        end
-
-        def interfaces_mtu_and_index
-          mtu_and_indexes = {}
-          output = Facter::Core::Execution.execute("ip link show", logger: log)
-          output.each_line do |line|
-            next unless line.include?('mtu')
-
-            mtu = line.match(/mtu (\d+)/)&.captures&.first&.to_i
-            index_tokens = line.split(':')
-            index = index_tokens[0].strip
-            # vlans are displayed as <vlan_name>@<physical_interface>
-            name = index_tokens[1].split('@').first.strip
-            mtu_and_indexes[name] = [index, mtu]
-          end
-          mtu_and_indexes
-        end
-
-        def retrieve_interface_info(mtu_and_indexes)
-          require 'socket'
-          interfaces = {}
-          Socket.getifaddrs.each do |interface|
-            interfaces[interface.name] = {} if interfaces[interface.name].nil?
-
-            if interfaces[interface.name][:mac].nil?
-              mac = extract_mac_address(interface)
-              interfaces[interface.name][:mac] = mac if mac
-            end
-
-            if interfaces[interface.name][:mtu].nil?
-              mtu = mtu_and_indexes.dig(interface.name, 1)
-              interfaces[interface.name][:mtu] = mtu unless mtu.nil?
-            end
-
-            if !interface.addr.nil? && !interface.netmask.nil?
-              begin
-                # ipv6 ips are retrieved as <ip>%<interface_name>
-                ip = interface.addr.ip_address.split('%').first if interface.addr.ip?
-                netmask = interface.netmask.ip_address
-                add_binding(interfaces, interface.name, ip, netmask, interface.addr.ipv4?)
-              rescue SocketError => e
-              end
-            end
-            find_dhcp!(interface.name, mtu_and_indexes, interfaces)
-          end
-
-          @fact_list[:interfaces] = interfaces
-        end
-
-        def extract_mac_address(interface)
-          mac = get_bonded_interface_mac(interface.name)
-          begin
-            if mac.nil?
-              if Socket.const_defined? :PF_LINK
-                mac = interface.addr&.getnameinfo&.first #sometimes it returns localhost, ip but mac also
-              elsif Socket.const_defined? :PF_PACKET
-                return if interface.addr.nil? || interface.addr.inspect_sockaddr.nil?
-
-                mac = interface.addr&.inspect_sockaddr[/hwaddr=([\h:]+)/, 1]
-              end
-            end
-          rescue StandardError => e
-            log.debug("Could not read mac, got #{e}")
-          end
-          mac if !mac.nil? && mac != '00:00:00:00:00:00' && mac =~ /^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/
-        end
-
-        def get_bonded_interface_mac(interface_name)
-          master = get_bond_master(interface_name)
-          return unless master
-
-          output = Facter::Util::FileHelper.safe_read("/proc/net/bonding/#{master}", nil)
-          return unless output
-
-          right_block = false
-          output.each_line do |line|
-            if line.strip == "Slave Interface: #{interface_name}"
-              right_block = true
-            elsif line.include? 'Slave Interface'
-              right_block = false
-            end
-            return Regexp.last_match(1) if right_block && line =~ /Permanent HW addr: (\S*)/
-          end
-        end
-
-        def get_bond_master(interface_name)
-          content = Facter::Core::Execution.execute("ip link show #{interface_name}", logger: log)
-          master = content.match(/master (\S*) /)
-          return master[1] if master
-
-          nil
-        end
-
-        def add_binding(interfaces, name, ip, netmask, ip_v4_type)
-          binding = Facter::Util::Resolvers::Networking.build_binding(ip, netmask)
-          return if binding.nil?
-
-          log.debug("Adding to interface #{name}, binding:\n#{binding}")
-          binding_key = ip_v4_type == true ? :bindings : :bindings6
-          interfaces[name][binding_key] = [] if interfaces[name][binding_key].nil?
-          interfaces[name][binding_key] << binding
-        end
-
-        def add_info_from_routing_table
-          routes4, routes6 = read_routing_table
-          compare_ips(routes4, :bindings)
-          compare_ips(routes6, :bindings6)
-        end
-
-
-        def read_routing_table
-          ipv4_output = Facter::Core::Execution.execute('ip route show', logger: log)
-          ipv6_output = Facter::Core::Execution.execute('ip -6 route show', logger: log)
-          routes4 = parse_routes(ipv4_output, 'ipv4')
-          routes6 = parse_routes(ipv6_output, 'ipv6')
-          [routes4, routes6]
-        end
-
-        def parse_routes(output, family)
-          routes = []
-          output.each_line do |line|
-            parts = line.split(' ').compact
-            next if parts.include?('linkdown')
-
-            route_type = parts[0]
-            parts.delete_at(0) if ROUTE_TYPES.include?(route_type)
-            next if family == 'ipv6' && !parts[0].include?(':')
-
-            route = construct_route(parts)
-            routes << route unless route[:ip].nil?
-          end
-          routes.uniq
-        end
-
-        def construct_route(parts)
-          route = {}
-          dev_index = parts.find_index { |elem| elem == 'dev' }
-          src_index = parts.find_index { |elem| elem == 'src' }
-          route[:interface] = parts[dev_index + 1] if dev_index
-          route[:ip] = parts[src_index + 1] if src_index
-          route
-        end
-
-        def compare_ips(routes, binding_key)
-          routes.each do |route|
-            # TODO we should simplify this
-            if @fact_list[:interfaces].key?(route[:interface])
-              if @fact_list[:interfaces][route[:interface]][binding_key].nil?
-                @fact_list[:interfaces][route[:interface]][binding_key] = [{ address: route[:ip] }]
-              elsif @fact_list[:interfaces][route[:interface]][binding_key].none? { |binding| binding[:address] == route[:ip] }
-                @fact_list[:interfaces][route[:interface]][binding_key] << { address: route[:ip] }
-              end
-            end
-          end
-        end
-
-        def find_dhcp!(interface_name, interface_indexes, interfaces)
-          return if !interfaces[interface_name] || interfaces[interface_name][:dhcp]
-
-          log.debug("Get DHCP for interface #{interface_name}")
-          unless interface_indexes[interface_name].nil?
-            index = interface_indexes[interface_name][0]
-            file_content = Facter::Util::FileHelper.safe_read("/run/systemd/netif/leases/#{index}", nil)
-            dhcp = file_content.match(/SERVER_ADDRESS=(.*)/) if file_content
-            if dhcp
-              interfaces[interface_name][:dhcp] = dhcp[1]
-            else
-              alternate_dhcp = retrieve_from_other_directories(interface_name)
-              interfaces[interface_name][:dhcp] = alternate_dhcp if alternate_dhcp
-            end
-          end
-          return unless interfaces[interface_name][:dhcp].nil?
-
-          output = Facter::Core::Execution.execute("dhcpcd -U #{interface_name}", logger: log)
-          result = output.match(/dhcp_server_identifier='(.*)'/)&.captures&.first
-          interfaces[interface_name][:dhcp] = result if result
-        end
-
-        def retrieve_from_other_directories(interface_name)
-          DIRS.each do |dir|
-            next unless File.readable?(dir)
-
-            lease_files = Dir.entries(dir).select { |file| file =~ /dhclient.*\.lease/ }
-            next if lease_files.empty?
-
-            lease_files.select do |file|
-              content = Facter::Util::FileHelper.safe_read("#{dir}#{file}", nil)
-              next unless content =~ /interface.*#{interface_name}/
-
-              dhcp = content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)
-              return dhcp[1] if dhcp
-            end
-          end
-          return unless File.readable?('/var/lib/NetworkManager/')
-
-          search_internal_leases(interface_name)
-        end
-
-        def search_internal_leases(interface_name)
-          files = Dir.entries('/var/lib/NetworkManager/').reject { |dir| dir =~ /^\.+$/ }
-          lease_file = files.find { |file| file =~ /internal.*#{interface_name}\.lease/ }
-          return unless lease_file
-
-          dhcp = Facter::Util::FileHelper.safe_read("/var/lib/NetworkManager/#{lease_file}", nil)
-
-          return unless dhcp
-
-          dhcp = dhcp.match(/SERVER_ADDRESS=(.*)/)
-          dhcp[1] if dhcp
-        end
-
-        def retrieve_primary_interface
-          primary_helper = Facter::Util::Resolvers::Networking::PrimaryInterface
-          primary_interface = primary_helper.read_from_proc_route
-          primary_interface ||= primary_helper.read_from_ip_route
-          primary_interface ||= primary_helper.find_in_interfaces(@fact_list[:interfaces])
-
-          @fact_list[:primary_interface] = primary_interface
-        end
-
-      end
-    end
-  end
-end