facter 4.0.20 → 4.0.21

data/lib/facts/{sles → aix}/processors/models.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Aix
     module Processors
       class Models
         FACT_NAME = 'processors.models'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Linux::Processors.resolve(:models)
+          fact_value = Facter::Resolvers::Aix::Processors.resolve(:models)
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end
       end

data/lib/facts/aix/processors/speed.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Processors
+      class Speed
+        FACT_NAME = 'processors.speed'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Aix::Processors.resolve(:speed)
+          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          Facter::ResolvedFact.new(FACT_NAME, speed)
+        end
+      end
+    end
+  end
+end

data/lib/facts/debian/{os/architecture.rb → architecture.rb}

@@ -10,6 +10,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:machine)
           fact_value = 'amd64' if fact_value == 'x86_64'
+          fact_value = 'i386' if fact_value =~ /i[3456]86|pentium/
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facts/debian/os/distro/release.rb

@@ -16,27 +16,15 @@ module Facts
           private
 
           def determine_release_for_os
-            os_name = Facter::Resolvers::OsRelease.resolve(:name)
-
-            if os_name =~ /Debian|Raspbian/
-              release = Facter::Resolvers::DebianVersion.resolve(:version)
-              return unless release
-
-              versions = release.split('.')
-              fact_value = {}
-              fact_value['full'] = release
-              fact_value['major'] = versions[0]
-              fact_value['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
-              fact_value
-            else
-              release = Facter::Resolvers::OsRelease.resolve(:version_id)
-              return unless release
-
-              {
-                'full' => release,
-                'major' => release
-              }
-            end
+            release = Facter::Resolvers::DebianVersion.resolve(:version)
+            return unless release
+
+            versions = release.split('.')
+            fact_value = {}
+            fact_value['full'] = release
+            fact_value['major'] = versions[0]
+            fact_value['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
+            fact_value
           end
         end
       end

data/lib/facts/debian/os/release.rb

@@ -20,27 +20,15 @@ module Facts
         private
 
         def determine_release_for_os
-          os_name = Facter::Resolvers::OsRelease.resolve(:name)
-
-          if os_name =~ /Debian|Raspbian/
-            release = Facter::Resolvers::DebianVersion.resolve(:version)
-            return unless release
-
-            versions = release.split('.')
-            fact_value = {}
-            fact_value['full'] = release
-            fact_value['major'] = versions[0]
-            fact_value['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
-            fact_value
-          else
-            release = Facter::Resolvers::OsRelease.resolve(:version_id)
-            return unless release
-
-            {
-              'full' => release,
-              'major' => release
-            }
-          end
+          release = Facter::Resolvers::DebianVersion.resolve(:version)
+          return unless release
+
+          versions = release.split('.')
+          fact_value = {}
+          fact_value['full'] = release
+          fact_value['major'] = versions[0]
+          fact_value['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
+          fact_value
         end
       end
     end

data/lib/facts/freebsd/os/release.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Os
+      class Release
+        FACT_NAME = 'os.release'
+        ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze
+
+        def call_the_resolver
+          installed_userland = Facter::Resolvers::Freebsd::FreebsdVersion.resolve(:installed_userland)
+
+          return Facter::ResolvedFact.new(FACT_NAME, nil) if !installed_userland || installed_userland.empty?
+
+          value = build_release_hash_from_version(installed_userland)
+
+          [Facter::ResolvedFact.new(FACT_NAME, value),
+           Facter::ResolvedFact.new(ALIASES.first, value[:major], :legacy),
+           Facter::ResolvedFact.new(ALIASES.last, installed_userland, :legacy)]
+        end
+
+        private
+
+        def build_release_hash_from_version(version_string)
+          version, branch_value = version_string.split('-', 2)
+          major_value, minor_value = version.split('.')
+          patchlevel_value = branch_value.split('-p')[1]
+
+          value = {
+            full: version_string,
+            major: major_value,
+            branch: branch_value
+          }
+
+          value[:minor] = minor_value if minor_value
+          value[:patchlevel] = patchlevel_value if patchlevel_value
+
+          value
+        end
+      end
+    end
+  end
+end

data/lib/facts/{sles → linux}/augeas/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Augeas
       class Version
         FACT_NAME = 'augeas.version'

data/lib/facts/linux/dhcp_servers.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    class DhcpServers
+      FACT_NAME = 'dhcp_servers'
+
+      def call_the_resolver
+        fact_value = construct_addresses_hash
+        fact_value = !fact_value || fact_value.empty? ? nil : fact_value
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+
+      private
+
+      def construct_addresses_hash
+        primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
+        interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
+        return unless interfaces
+
+        servers = { system: interfaces[primary][:dhcp] }
+        interfaces&.each { |interface_name, info| servers[interface_name] = info[:dhcp] if info[:dhcp] }
+        servers
+      end
+    end
+  end
+end

data/lib/facts/{sles → linux}/disks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     class Disks
       FACT_NAME = 'disks'
 

data/lib/facts/{sles → linux}/dmi/bios/release_date.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Dmi
       module Bios
         class ReleaseDate

data/lib/facts/{el → linux}/dmi/bios/vendor.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module Dmi
       module Bios
         class Vendor

data/lib/facts/{sles → linux}/dmi/bios/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Dmi
       module Bios
         class Version

data/lib/facts/{sles → linux}/dmi/board/manufacturer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Dmi
       module Board
         class Manufacturer

data/lib/facts/{el → linux}/dmi/board/product.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module Dmi
       module Board
         class Product

data/lib/facts/{el → linux}/dmi/board/serial_number.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module Dmi
       module Board
         class SerialNumber

data/lib/facts/{sles → linux}/dmi/chassis/asset_tag.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Dmi
       module Chassis
         class AssetTag

data/lib/facts/{sles → linux}/dmi/chassis/type.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Dmi
       module Chassis
         class Type

data/lib/facts/{el → linux}/dmi/manufacturer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module Dmi
       class Manufacturer
         FACT_NAME = 'dmi.manufacturer'

data/lib/facts/{el → linux}/dmi/product/name.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module Dmi
       module Product
         class Name

data/lib/facts/{sles → linux}/dmi/product/serial_number.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Dmi
       module Product
         class SerialNumber

data/lib/facts/{sles → linux}/dmi/product/uuid.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Dmi
       module Product
         class Uuid

data/lib/facts/{debian → linux}/facterversion.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Debian
+  module Linux
     class Facterversion
       FACT_NAME = 'facterversion'
 

data/lib/facts/{el → linux}/filesystems.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     class Filesystems
       FACT_NAME = 'filesystems'
 

data/lib/facts/{el → linux}/fips_enabled.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     class FipsEnabled
       FACT_NAME = 'fips_enabled'
 

data/lib/facts/{sles → linux}/identity/gid.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Identity
       class Gid
         FACT_NAME = 'identity.gid'

data/lib/facts/{el → linux}/identity/group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module Identity
       class Group
         FACT_NAME = 'identity.group'

data/lib/facts/{el → linux}/identity/privileged.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module Identity
       class Privileged
         FACT_NAME = 'identity.privileged'

data/lib/facts/{sles → linux}/identity/uid.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Identity
       class Uid
         FACT_NAME = 'identity.uid'

data/lib/facts/{el → linux}/identity/user.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module Identity
       class User
         FACT_NAME = 'identity.user'

data/lib/facts/{el → linux}/interfaces.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     class Interfaces
       FACT_NAME = 'interfaces'
 

data/lib/facts/linux/ipaddress6_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    class Ipaddress6Interfaces
+      FACT_NAME = 'ipaddress6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("ipaddress6_#{interface_name}", info[:ip6], :legacy) if info[:ip6]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facts/linux/ipaddress_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    class IpaddressInterfaces
+      FACT_NAME = 'ipaddress_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("ipaddress_#{interface_name}", info[:ip], :legacy) if info[:ip]
+        end
+
+        arr
+      end
+    end
+  end
+end