FACT-2679 Get DHCP for all interfaces on OSX

lib/facts/linux/dhcp_servers.rb

@@ -14,11 +14,11 @@ def call_the_resolver
       private
 
       def construct_addresses_hash
-        primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
+        primary_dhcp = Facter::Resolvers::NetworkingLinux.resolve(:dhcp)
         interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
         return unless interfaces
 
-        servers = { system: interfaces[primary][:dhcp] }
+        servers = { system: primary_dhcp }
         interfaces&.each { |interface_name, info| servers[interface_name] = info[:dhcp] if info[:dhcp] }
         servers
       end

lib/facts/linux/networking/dhcp.rb

@@ -7,10 +7,7 @@ class Dhcp
         FACT_NAME = 'networking.dhcp'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:dhcp] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:dhcp)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

lib/facts/linux/networking/domain.rb

@@ -9,6 +9,7 @@ class Domain
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Hostname.resolve(:domain)
+
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/linux/networking/fqdn.rb

@@ -9,6 +9,7 @@ class Fqdn
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Hostname.resolve(:fqdn)
+
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/linux/networking/hostname.rb

@@ -9,6 +9,7 @@ class Hostname
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Hostname.resolve(:hostname)
+
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/linux/networking/interfaces.rb

@@ -8,6 +8,7 @@ class Interfaces
 
         def call_the_resolver
           fact_value = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
+
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end
       end

lib/facts/linux/networking/ip.rb

@@ -8,10 +8,7 @@ class Ip
         ALIASES = 'ipaddress'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:ip] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:ip)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/linux/networking/ip6.rb

@@ -8,10 +8,7 @@ class Ip6
         ALIASES = 'ipaddress6'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:ip6] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:ip6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/linux/networking/mac.rb

@@ -8,10 +8,7 @@ class Mac
         ALIASES = 'macaddress'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:mac] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:mac)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/linux/networking/mtu.rb

@@ -7,10 +7,7 @@ class Mtu
         FACT_NAME = 'networking.mtu'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:mtu] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:mtu)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

lib/facts/linux/networking/netmask.rb

@@ -8,10 +8,7 @@ class Netmask
         ALIASES = 'netmask'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:netmask] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:netmask)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/linux/networking/netmask6.rb

@@ -8,10 +8,7 @@ class Netmask6
         ALIASES = 'netmask6'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:netmask6] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:netmask6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/linux/networking/network.rb

@@ -8,10 +8,7 @@ class Network
         ALIASES = 'network'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:network] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:network)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/linux/networking/network6.rb

@@ -8,10 +8,7 @@ class Network6
         ALIASES = 'network6'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:network6] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:network6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/linux/networking/scope6.rb

@@ -7,10 +7,7 @@ class Scope6
         FACT_NAME = 'networking.scope6'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-          primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-
-          fact_value = interfaces[primary][:scope6] if interfaces && interfaces[primary]
+          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:scope6)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

lib/facts/linux/scope6_interfaces.rb

@@ -8,17 +8,15 @@ class Scope6Interfaces
 
       def call_the_resolver
         resolved_facts = []
-        scope6_interfaces = {}
         interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
-        primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
-        interfaces&.each do |interface_name, info|
-          scope6_interfaces["scope6_#{interface_name}"] = info[:scope6] if info[:scope6]
-        end
+        primary_scope6 = Facter::Resolvers::NetworkingLinux.resolve(:scope6)
 
-        scope6_interfaces.each { |fact, value| resolved_facts << Facter::ResolvedFact.new(fact, value, :legacy) }
-        if interfaces && primary
-          resolved_facts << Facter::ResolvedFact.new('scope6', interfaces[primary][:scope6], :legacy)
+        interfaces&.each do |interface_name, info|
+          if info[:scope6]
+            resolved_facts << Facter::ResolvedFact.new("scope6_#{interface_name}", info[:scope6], :legacy)
+          end
         end
+        resolved_facts << Facter::ResolvedFact.new('scope6', primary_scope6, :legacy) if primary_scope6
         resolved_facts
       end
     end

lib/facts/macosx/networking/domain.rb

@@ -9,6 +9,7 @@ class Domain
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Hostname.resolve(:domain)
+
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/networking/fqdn.rb

@@ -9,6 +9,7 @@ class Fqdn
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Hostname.resolve(:fqdn)
+
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/networking/hostname.rb

@@ -9,6 +9,7 @@ class Hostname
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Hostname.resolve(:hostname)
+
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/networking/interfaces.rb

@@ -8,10 +8,6 @@ class Interfaces
 
         def call_the_resolver
           interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          dhcp = Facter::Resolvers::Macosx::Networking.resolve(:dhcp)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          interfaces[primary][:dhcp] = dhcp if interfaces && interfaces[primary]
 
           Facter::ResolvedFact.new(FACT_NAME, interfaces)
         end

lib/facts/macosx/networking/ip.rb

@@ -8,10 +8,7 @@ class Ip
         ALIASES = 'ipaddress'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :ip) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:ip)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/macosx/networking/ip6.rb

@@ -8,10 +8,7 @@ class Ip6
         ALIASES = 'ipaddress6'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :ip6) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:ip6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/macosx/networking/mac.rb

@@ -8,10 +8,7 @@ class Mac
         ALIASES = 'macaddress'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :mac) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:mac)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/macosx/networking/mtu.rb

@@ -7,10 +7,7 @@ class Mtu
         FACT_NAME = 'networking.mtu'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :mtu) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:mtu)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

lib/facts/macosx/networking/netmask.rb

@@ -8,10 +8,7 @@ class Netmask
         ALIASES = 'netmask'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :netmask) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:netmask)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/macosx/networking/netmask6.rb

@@ -8,10 +8,7 @@ class Netmask6
         ALIASES = 'netmask6'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :netmask6) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:netmask6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/macosx/networking/network.rb

@@ -8,10 +8,7 @@ class Network
         ALIASES = 'network'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :network) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:network)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/macosx/networking/network6.rb

@@ -8,10 +8,7 @@ class Network6
         ALIASES = 'network6'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :network6) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:network6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

lib/facts/macosx/networking/scope6.rb

@@ -7,10 +7,7 @@ class Scope6
         FACT_NAME = 'networking.scope6'
 
         def call_the_resolver
-          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
-          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
-
-          fact_value = interfaces.dig(primary, :scope6) unless interfaces.nil?
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:scope6)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end