diff --git a/lib/facts/debian/os/architecture.rb b/lib/facts/debian/architecture.rb similarity index 100% rename from lib/facts/debian/os/architecture.rb rename to lib/facts/debian/architecture.rb diff --git a/lib/facts/debian/augeas/version.rb b/lib/facts/debian/augeas/version.rb deleted file mode 100644 index 2f608cebb..000000000 --- a/lib/facts/debian/augeas/version.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Augeas - class Version - FACT_NAME = 'augeas.version' - ALIASES = 'augeasversion' - - def call_the_resolver - fact_value = Facter::Resolvers::Augeas.resolve(:augeas_version) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/disks.rb b/lib/facts/debian/disks.rb deleted file mode 100644 index 1f2fb576c..000000000 --- a/lib/facts/debian/disks.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class Disks - FACT_NAME = 'disks' - - def call_the_resolver - disks = Facter::Resolvers::Linux::Disk.resolve(:disks) - - Facter::ResolvedFact.new(FACT_NAME, disks) - end - end - end -end diff --git a/lib/facts/debian/dmi/bios/release_date.rb b/lib/facts/debian/dmi/bios/release_date.rb deleted file mode 100644 index 0b84ffa69..000000000 --- a/lib/facts/debian/dmi/bios/release_date.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Bios - class ReleaseDate - FACT_NAME = 'dmi.bios.release_date' - ALIASES = 'bios_release_date' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:bios_date) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/bios/vendor.rb b/lib/facts/debian/dmi/bios/vendor.rb deleted file mode 100644 index f6c33f7b8..000000000 --- a/lib/facts/debian/dmi/bios/vendor.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Bios - class Vendor - FACT_NAME = 'dmi.bios.vendor' - ALIASES = 'bios_vendor' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/bios/version.rb b/lib/facts/debian/dmi/bios/version.rb deleted file mode 100644 index c8babe28f..000000000 --- a/lib/facts/debian/dmi/bios/version.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Bios - class Version - FACT_NAME = 'dmi.bios.version' - ALIASES = 'bios_version' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:bios_version) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/board/manufacturer.rb b/lib/facts/debian/dmi/board/manufacturer.rb deleted file mode 100644 index 48e078a0d..000000000 --- a/lib/facts/debian/dmi/board/manufacturer.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Board - class Manufacturer - FACT_NAME = 'dmi.board.manufacturer' - ALIASES = 'boardmanufacturer' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:board_vendor) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/board/product.rb b/lib/facts/debian/dmi/board/product.rb deleted file mode 100644 index c46cb979d..000000000 --- a/lib/facts/debian/dmi/board/product.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Board - class Product - FACT_NAME = 'dmi.board.product' - ALIASES = 'boardproductname' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:board_name) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/board/serial_number.rb b/lib/facts/debian/dmi/board/serial_number.rb deleted file mode 100644 index 37c7cf74b..000000000 --- a/lib/facts/debian/dmi/board/serial_number.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Board - class SerialNumber - FACT_NAME = 'dmi.board.serial_number' - ALIASES = 'boardserialnumber' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:board_serial) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/chassis/asset_tag.rb b/lib/facts/debian/dmi/chassis/asset_tag.rb deleted file mode 100644 index e0763ffc8..000000000 --- a/lib/facts/debian/dmi/chassis/asset_tag.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Chassis - class AssetTag - FACT_NAME = 'dmi.chassis.asset_tag' - ALIASES = 'chassisassettag' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:chassis_asset_tag) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/chassis/type.rb b/lib/facts/debian/dmi/chassis/type.rb deleted file mode 100644 index 8ebf7cc44..000000000 --- a/lib/facts/debian/dmi/chassis/type.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Chassis - class Type - FACT_NAME = 'dmi.chassis.type' - ALIASES = 'chassistype' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:chassis_type) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/manufacturer.rb b/lib/facts/debian/dmi/manufacturer.rb deleted file mode 100644 index 1052e581d..000000000 --- a/lib/facts/debian/dmi/manufacturer.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - class Manufacturer - FACT_NAME = 'dmi.manufacturer' - ALIASES = 'manufacturer' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:sys_vendor) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/dmi/product/name.rb b/lib/facts/debian/dmi/product/name.rb deleted file mode 100644 index 591cf4309..000000000 --- a/lib/facts/debian/dmi/product/name.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Product - class Name - FACT_NAME = 'dmi.product.name' - ALIASES = 'productname' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:product_name) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/product/serial_number.rb b/lib/facts/debian/dmi/product/serial_number.rb deleted file mode 100644 index 12930d5ad..000000000 --- a/lib/facts/debian/dmi/product/serial_number.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Product - class SerialNumber - FACT_NAME = 'dmi.product.serial_number' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:product_serial) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/debian/dmi/product/uuid.rb b/lib/facts/debian/dmi/product/uuid.rb deleted file mode 100644 index b5fa65ae1..000000000 --- a/lib/facts/debian/dmi/product/uuid.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Dmi - module Product - class Uuid - FACT_NAME = 'dmi.product.uuid' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:product_uuid) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/debian/filesystems.rb b/lib/facts/debian/filesystems.rb deleted file mode 100644 index 8aa24d23d..000000000 --- a/lib/facts/debian/filesystems.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class Filesystems - FACT_NAME = 'filesystems' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Filesystems.resolve(:systems) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/debian/fips_enabled.rb b/lib/facts/debian/fips_enabled.rb deleted file mode 100644 index be6ca6d48..000000000 --- a/lib/facts/debian/fips_enabled.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class FipsEnabled - FACT_NAME = 'fips_enabled' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::FipsEnabled.resolve(:fips_enabled) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/debian/identity/gid.rb b/lib/facts/debian/identity/gid.rb deleted file mode 100644 index a16941c33..000000000 --- a/lib/facts/debian/identity/gid.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Identity - class Gid - FACT_NAME = 'identity.gid' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:gid) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/debian/identity/group.rb b/lib/facts/debian/identity/group.rb deleted file mode 100644 index e79fa5646..000000000 --- a/lib/facts/debian/identity/group.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Identity - class Group - FACT_NAME = 'identity.group' - ALIASES = 'gid' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:group) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/identity/privileged.rb b/lib/facts/debian/identity/privileged.rb deleted file mode 100644 index 7d8f5ba60..000000000 --- a/lib/facts/debian/identity/privileged.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Identity - class Privileged - FACT_NAME = 'identity.privileged' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:privileged) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/debian/identity/uid.rb b/lib/facts/debian/identity/uid.rb deleted file mode 100644 index 07d169468..000000000 --- a/lib/facts/debian/identity/uid.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Identity - class Uid - FACT_NAME = 'identity.uid' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:uid) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/debian/identity/user.rb b/lib/facts/debian/identity/user.rb deleted file mode 100644 index 6af4b20a0..000000000 --- a/lib/facts/debian/identity/user.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Identity - class User - FACT_NAME = 'identity.user' - ALIASES = 'id' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:user) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/interfaces.rb b/lib/facts/debian/interfaces.rb deleted file mode 100644 index 8f10ccdae..000000000 --- a/lib/facts/debian/interfaces.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class Interfaces - FACT_NAME = 'interfaces' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:interfaces) - - Facter::ResolvedFact.new(FACT_NAME, fact_value && !fact_value.empty? ? fact_value.keys.sort.join(',') : nil, - :legacy) - end - end - end -end diff --git a/lib/facts/debian/kernelrelease.rb b/lib/facts/debian/kernelrelease.rb deleted file mode 100644 index 9cb5ab76a..000000000 --- a/lib/facts/debian/kernelrelease.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class Kernelrelease - FACT_NAME = 'kernelrelease' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:kernelrelease) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/debian/load_averages.rb b/lib/facts/debian/load_averages.rb deleted file mode 100644 index 01b422ba5..000000000 --- a/lib/facts/debian/load_averages.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class LoadAverages - FACT_NAME = 'load_averages' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::LoadAverages.resolve(:load_averages) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/debian/memory/swap/available.rb b/lib/facts/debian/memory/swap/available.rb deleted file mode 100644 index ced67903b..000000000 --- a/lib/facts/debian/memory/swap/available.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module Swap - class Available - FACT_NAME = 'memory.swap.available' - ALIASES = 'swapfree' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/swap/capacity.rb b/lib/facts/debian/memory/swap/capacity.rb deleted file mode 100644 index c50f69684..000000000 --- a/lib/facts/debian/memory/swap/capacity.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module Swap - class Capacity - FACT_NAME = 'memory.swap.capacity' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_capacity) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/swap/total.rb b/lib/facts/debian/memory/swap/total.rb deleted file mode 100644 index c0947d0e4..000000000 --- a/lib/facts/debian/memory/swap/total.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module Swap - class Total - FACT_NAME = 'memory.swap.total' - ALIASES = 'swapsize' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/swap/total_bytes.rb b/lib/facts/debian/memory/swap/total_bytes.rb deleted file mode 100644 index 3f33c1e5a..000000000 --- a/lib/facts/debian/memory/swap/total_bytes.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module Swap - class TotalBytes - FACT_NAME = 'memory.swap.total_bytes' - ALIASES = 'swapsize_mb' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/swap/used.rb b/lib/facts/debian/memory/swap/used.rb deleted file mode 100644 index 617704188..000000000 --- a/lib/facts/debian/memory/swap/used.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module Swap - class Used - FACT_NAME = 'memory.swap.used' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_used_bytes) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/swap/used_bytes.rb b/lib/facts/debian/memory/swap/used_bytes.rb deleted file mode 100644 index b54bd2125..000000000 --- a/lib/facts/debian/memory/swap/used_bytes.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module Swap - class UsedBytes - FACT_NAME = 'memory.swap.used_bytes' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_used_bytes) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/system/capacity.rb b/lib/facts/debian/memory/system/capacity.rb deleted file mode 100644 index 747471138..000000000 --- a/lib/facts/debian/memory/system/capacity.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module System - class Capacity - FACT_NAME = 'memory.system.capacity' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:capacity) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/system/total.rb b/lib/facts/debian/memory/system/total.rb deleted file mode 100644 index 127896f64..000000000 --- a/lib/facts/debian/memory/system/total.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module System - class Total - FACT_NAME = 'memory.system.total' - ALIASES = 'memorysize' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:total) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/system/total_bytes.rb b/lib/facts/debian/memory/system/total_bytes.rb deleted file mode 100644 index 5c6e0514b..000000000 --- a/lib/facts/debian/memory/system/total_bytes.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module System - class TotalBytes - FACT_NAME = 'memory.system.total_bytes' - ALIASES = 'memorysize_mb' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:total) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/system/used.rb b/lib/facts/debian/memory/system/used.rb deleted file mode 100644 index d6f771efe..000000000 --- a/lib/facts/debian/memory/system/used.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module System - class Used - FACT_NAME = 'memory.system.used' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:used_bytes) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/debian/memory/system/used_bytes.rb b/lib/facts/debian/memory/system/used_bytes.rb deleted file mode 100644 index 2df704c7c..000000000 --- a/lib/facts/debian/memory/system/used_bytes.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Memory - module System - class UsedBytes - FACT_NAME = 'memory.system.used_bytes' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:used_bytes) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/debian/mountpoints.rb b/lib/facts/debian/mountpoints.rb deleted file mode 100644 index 778619e0c..000000000 --- a/lib/facts/debian/mountpoints.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class Mountpoints - FACT_NAME = 'mountpoints' - - def call_the_resolver - mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(FACT_NAME.to_sym) - return Facter::ResolvedFact.new(FACT_NAME, nil) unless mountpoints - - fact = {} - mountpoints.each do |mnt| - fact[mnt[:path].to_sym] = mnt.reject { |k| k == :path } - end - - Facter::ResolvedFact.new(FACT_NAME, fact) - end - end - end -end diff --git a/lib/facts/debian/networking/domain.rb b/lib/facts/debian/networking/domain.rb deleted file mode 100644 index de3224f35..000000000 --- a/lib/facts/debian/networking/domain.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Networking - class Domain - FACT_NAME = 'networking.domain' - ALIASES = '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 - end - end -end diff --git a/lib/facts/debian/networking/fqdn.rb b/lib/facts/debian/networking/fqdn.rb deleted file mode 100644 index b23df84fb..000000000 --- a/lib/facts/debian/networking/fqdn.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Networking - class Fqdn - FACT_NAME = 'networking.fqdn' - ALIASES = '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 - end - end -end diff --git a/lib/facts/debian/networking/hostname.rb b/lib/facts/debian/networking/hostname.rb deleted file mode 100644 index c8ffcf1c5..000000000 --- a/lib/facts/debian/networking/hostname.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Networking - class Hostname - FACT_NAME = 'networking.hostname' - ALIASES = '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 - end - end -end diff --git a/lib/facts/debian/networking/interfaces.rb b/lib/facts/debian/networking/interfaces.rb deleted file mode 100644 index 4a58dbaf4..000000000 --- a/lib/facts/debian/networking/interfaces.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Networking - class Interfaces - FACT_NAME = 'networking.interfaces' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:interfaces) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/debian/networking/ip.rb b/lib/facts/debian/networking/ip.rb deleted file mode 100644 index a0804cda7..000000000 --- a/lib/facts/debian/networking/ip.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Networking - class Ip - FACT_NAME = 'networking.ip' - ALIASES = 'ipaddress' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:ip) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/networking/mac.rb b/lib/facts/debian/networking/mac.rb deleted file mode 100644 index 8ae248f06..000000000 --- a/lib/facts/debian/networking/mac.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Networking - class Mac - FACT_NAME = 'networking.mac' - ALIASES = 'macaddress' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:macaddress) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/networking/primary.rb b/lib/facts/debian/networking/primary.rb deleted file mode 100644 index 7aa5192cf..000000000 --- a/lib/facts/debian/networking/primary.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Networking - class Primary - FACT_NAME = 'networking.primary' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface) - - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/debian/os/distro/release.rb b/lib/facts/debian/os/distro/release.rb index b041bcd24..559a6df4d 100644 --- a/lib/facts/debian/os/distro/release.rb +++ b/lib/facts/debian/os/distro/release.rb @@ -16,27 +16,15 @@ def call_the_resolver 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 diff --git a/lib/facts/debian/os/hardware.rb b/lib/facts/debian/os/hardware.rb deleted file mode 100644 index 581a92a7a..000000000 --- a/lib/facts/debian/os/hardware.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Os - class Hardware - FACT_NAME = 'os.hardware' - ALIASES = 'hardwaremodel' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:machine) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/os/name.rb b/lib/facts/debian/os/name.rb deleted file mode 100644 index ad13db282..000000000 --- a/lib/facts/debian/os/name.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Os - class Name - FACT_NAME = 'os.name' - ALIASES = 'operatingsystem' - - def call_the_resolver - fact_value = Facter::Resolvers::OsRelease.resolve(:name) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/os/release.rb b/lib/facts/debian/os/release.rb index 06b0b041c..20e56ae0f 100644 --- a/lib/facts/debian/os/release.rb +++ b/lib/facts/debian/os/release.rb @@ -20,27 +20,15 @@ def call_the_resolver 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 diff --git a/lib/facts/debian/os/selinux/config_mode.rb b/lib/facts/debian/os/selinux/config_mode.rb deleted file mode 100644 index 2e0082f65..000000000 --- a/lib/facts/debian/os/selinux/config_mode.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Os - module Selinux - class ConfigMode - FACT_NAME = 'os.selinux.config_mode' - ALIASES = 'selinux_config_mode' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:config_mode) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/os/selinux/config_policy.rb b/lib/facts/debian/os/selinux/config_policy.rb deleted file mode 100644 index 90ac2dc32..000000000 --- a/lib/facts/debian/os/selinux/config_policy.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Os - module Selinux - class ConfigPolicy - FACT_NAME = 'os.selinux.config_policy' - ALIASES = 'selinux_config_policy' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:config_policy) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/os/selinux/current_mode.rb b/lib/facts/debian/os/selinux/current_mode.rb deleted file mode 100644 index 7d2fe7535..000000000 --- a/lib/facts/debian/os/selinux/current_mode.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Os - module Selinux - class CurrentMode - FACT_NAME = 'os.selinux.current_mode' - ALIASES = 'selinux_current_mode' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:current_mode) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/os/selinux/enabled.rb b/lib/facts/debian/os/selinux/enabled.rb deleted file mode 100644 index dc7c2d8f9..000000000 --- a/lib/facts/debian/os/selinux/enabled.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Os - module Selinux - class Enabled - FACT_NAME = 'os.selinux.enabled' - ALIASES = 'selinux' - - def call_the_resolver - selinux = Facter::Resolvers::SELinux.resolve(:enabled) - - [Facter::ResolvedFact.new(FACT_NAME, selinux), - Facter::ResolvedFact.new(ALIASES, selinux, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/os/selinux/enforced.rb b/lib/facts/debian/os/selinux/enforced.rb deleted file mode 100644 index e7f5304d6..000000000 --- a/lib/facts/debian/os/selinux/enforced.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Os - module Selinux - class Enforced - FACT_NAME = 'os.selinux.enforced' - ALIASES = 'selinux_enforced' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:enforced) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/os/selinux/policy_version.rb b/lib/facts/debian/os/selinux/policy_version.rb deleted file mode 100644 index 5b29301c5..000000000 --- a/lib/facts/debian/os/selinux/policy_version.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Os - module Selinux - class PolicyVersion - FACT_NAME = 'os.selinux.policy_version' - ALIASES = 'selinux_policyversion' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:policy_version) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/debian/partitions.rb b/lib/facts/debian/partitions.rb deleted file mode 100644 index 2b7eb2f53..000000000 --- a/lib/facts/debian/partitions.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class Partitions - FACT_NAME = 'partitions' - - def call_the_resolver - Facter::ResolvedFact.new(FACT_NAME, partitions) - end - - def partitions - parts = Facter::Resolvers::Partitions.resolve(:partitions) - mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(:mountpoints) - return parts unless mountpoints - - mountpoints.each do |mnt| - next unless parts[mnt[:device]] - - parts[mnt[:device]].merge!(mount: mnt[:path]) - end - parts.empty? ? nil : parts - end - end - end -end diff --git a/lib/facts/debian/processors/count.rb b/lib/facts/debian/processors/count.rb deleted file mode 100644 index 7b667ddd8..000000000 --- a/lib/facts/debian/processors/count.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Processors - class Count - FACT_NAME = 'processors.count' - ALIASES = 'processorcount' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Processors.resolve(:processors) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/processors/models.rb b/lib/facts/debian/processors/models.rb deleted file mode 100644 index 230f67e1c..000000000 --- a/lib/facts/debian/processors/models.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Processors - class Models - FACT_NAME = 'processors.models' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Processors.resolve(:models) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/debian/processors/physicalcount.rb b/lib/facts/debian/processors/physicalcount.rb deleted file mode 100644 index a501cc3eb..000000000 --- a/lib/facts/debian/processors/physicalcount.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Processors - class Physicalcount - FACT_NAME = 'processors.physicalcount' - ALIASES = 'physicalprocessorcount' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Processors.resolve(:physical_count) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/puppet_version.rb b/lib/facts/debian/puppet_version.rb deleted file mode 100644 index 250ef3734..000000000 --- a/lib/facts/debian/puppet_version.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class PuppetVersion - FACT_NAME = 'puppetversion' - - def call_the_resolver - fact_value = Facter::Resolvers::PuppetVersionResolver.resolve(:puppetversion) - - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/debian/ruby/platform.rb b/lib/facts/debian/ruby/platform.rb deleted file mode 100644 index ee6b1607d..000000000 --- a/lib/facts/debian/ruby/platform.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Ruby - class Platform - FACT_NAME = 'ruby.platform' - ALIASES = 'rubyplatform' - - def call_the_resolver - fact_value = Facter::Resolvers::Ruby.resolve(:platform) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/ruby/sitedir.rb b/lib/facts/debian/ruby/sitedir.rb deleted file mode 100644 index 26c3acbef..000000000 --- a/lib/facts/debian/ruby/sitedir.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Ruby - class Sitedir - FACT_NAME = 'ruby.sitedir' - ALIASES = 'rubysitedir' - - def call_the_resolver - fact_value = Facter::Resolvers::Ruby.resolve(:sitedir) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/ruby/version.rb b/lib/facts/debian/ruby/version.rb deleted file mode 100644 index b34e02864..000000000 --- a/lib/facts/debian/ruby/version.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module Ruby - class Version - FACT_NAME = 'ruby.version' - ALIASES = 'rubyversion' - - def call_the_resolver - fact_value = Facter::Resolvers::Ruby.resolve(:version) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/ssh.rb b/lib/facts/debian/ssh.rb deleted file mode 100644 index f5b13bded..000000000 --- a/lib/facts/debian/ssh.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class Ssh - FACT_NAME = 'ssh' - - def call_the_resolver - result = Facter::Resolvers::SshResolver.resolve(:ssh) - ssh_facts = {} - result.each { |ssh| ssh_facts.merge!(create_ssh_fact(ssh)) } - Facter::ResolvedFact.new(FACT_NAME, ssh_facts) - end - - private - - def create_ssh_fact(ssh) - { ssh.name.to_sym => - { fingerprints: { sha1: ssh.fingerprint.sha1, - sha256: ssh.fingerprint.sha256 }, - key: ssh.key, - type: ssh.type } } - end - end - end -end diff --git a/lib/facts/debian/system_uptime/days.rb b/lib/facts/debian/system_uptime/days.rb deleted file mode 100644 index 6456dfb9b..000000000 --- a/lib/facts/debian/system_uptime/days.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module SystemUptime - class Days - FACT_NAME = 'system_uptime.days' - ALIASES = 'uptime_days' - - def call_the_resolver - fact_value = Facter::Resolvers::Uptime.resolve(:days) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/system_uptime/hours.rb b/lib/facts/debian/system_uptime/hours.rb deleted file mode 100644 index 9695523df..000000000 --- a/lib/facts/debian/system_uptime/hours.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module SystemUptime - class Hours - FACT_NAME = 'system_uptime.hours' - ALIASES = 'uptime_hours' - - def call_the_resolver - fact_value = Facter::Resolvers::Uptime.resolve(:hours) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/system_uptime/seconds.rb b/lib/facts/debian/system_uptime/seconds.rb deleted file mode 100644 index 5d7548963..000000000 --- a/lib/facts/debian/system_uptime/seconds.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module SystemUptime - class Seconds - FACT_NAME = 'system_uptime.seconds' - ALIASES = 'uptime_seconds' - - def call_the_resolver - fact_value = Facter::Resolvers::Uptime.resolve(:seconds) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/system_uptime/uptime.rb b/lib/facts/debian/system_uptime/uptime.rb deleted file mode 100644 index 22266884d..000000000 --- a/lib/facts/debian/system_uptime/uptime.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - module SystemUptime - class Uptime - FACT_NAME = 'system_uptime.uptime' - ALIASES = 'uptime' - - def call_the_resolver - fact_value = Facter::Resolvers::Uptime.resolve(:uptime) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/debian/timezone.rb b/lib/facts/debian/timezone.rb deleted file mode 100644 index ec6ea077a..000000000 --- a/lib/facts/debian/timezone.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Debian - class Timezone - FACT_NAME = 'timezone' - - def call_the_resolver - fact_value = Facter::Resolvers::Timezone.resolve(:timezone) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/el/augeas/version.rb b/lib/facts/el/augeas/version.rb deleted file mode 100644 index 2c272ffee..000000000 --- a/lib/facts/el/augeas/version.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Augeas - class Version - FACT_NAME = 'augeas.version' - ALIASES = 'augeasversion' - - def call_the_resolver - fact_value = Facter::Resolvers::Augeas.resolve(:augeas_version) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/el/dmi/bios/vendor.rb b/lib/facts/el/dmi/bios/vendor.rb deleted file mode 100644 index 8584e6e98..000000000 --- a/lib/facts/el/dmi/bios/vendor.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Dmi - module Bios - class Vendor - FACT_NAME = 'dmi.bios.vendor' - ALIASES = 'bios_vendor' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/dmi/board/manufacturer.rb b/lib/facts/el/dmi/board/manufacturer.rb deleted file mode 100644 index 380958c0a..000000000 --- a/lib/facts/el/dmi/board/manufacturer.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Dmi - module Board - class Manufacturer - FACT_NAME = 'dmi.board.manufacturer' - ALIASES = 'boardmanufacturer' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:board_vendor) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/dmi/board/product.rb b/lib/facts/el/dmi/board/product.rb deleted file mode 100644 index dbec27ecb..000000000 --- a/lib/facts/el/dmi/board/product.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Dmi - module Board - class Product - FACT_NAME = 'dmi.board.product' - ALIASES = 'boardproductname' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:board_name) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/dmi/chassis/asset_tag.rb b/lib/facts/el/dmi/chassis/asset_tag.rb deleted file mode 100644 index e9d66d8c7..000000000 --- a/lib/facts/el/dmi/chassis/asset_tag.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Dmi - module Chassis - class AssetTag - FACT_NAME = 'dmi.chassis.asset_tag' - ALIASES = 'chassisassettag' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:chassis_asset_tag) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/dmi/chassis/type.rb b/lib/facts/el/dmi/chassis/type.rb deleted file mode 100644 index f8f42f240..000000000 --- a/lib/facts/el/dmi/chassis/type.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Dmi - module Chassis - class Type - FACT_NAME = 'dmi.chassis.type' - ALIASES = 'chassistype' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:chassis_type) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/dmi/product/serial_number.rb b/lib/facts/el/dmi/product/serial_number.rb deleted file mode 100644 index 61b77da28..000000000 --- a/lib/facts/el/dmi/product/serial_number.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Dmi - module Product - class SerialNumber - FACT_NAME = 'dmi.product.serial_number' - ALIASES = 'serialnumber' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:product_serial) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/dmi/product/uuid.rb b/lib/facts/el/dmi/product/uuid.rb deleted file mode 100644 index f50b609d7..000000000 --- a/lib/facts/el/dmi/product/uuid.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Dmi - module Product - class Uuid - FACT_NAME = 'dmi.product.uuid' - ALIASES = 'uuid' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:product_uuid) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/facterversion.rb b/lib/facts/el/facterversion.rb deleted file mode 100644 index 22fbe4f52..000000000 --- a/lib/facts/el/facterversion.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - class Facterversion - FACT_NAME = 'facterversion' - - def call_the_resolver - fact_value = Facter::Resolvers::Facterversion.resolve(:facterversion) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/el/identity/gid.rb b/lib/facts/el/identity/gid.rb deleted file mode 100644 index 37ab6dd61..000000000 --- a/lib/facts/el/identity/gid.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Identity - class Gid - FACT_NAME = 'identity.gid' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:gid) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/el/identity/group.rb b/lib/facts/el/identity/group.rb deleted file mode 100644 index e58c9ba3d..000000000 --- a/lib/facts/el/identity/group.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Identity - class Group - FACT_NAME = 'identity.group' - ALIASES = 'gid' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:group) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/el/kernel.rb b/lib/facts/el/kernel.rb deleted file mode 100644 index c0a347fa2..000000000 --- a/lib/facts/el/kernel.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - class Kernel - FACT_NAME = 'kernel' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:kernelname) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/el/kernelmajversion.rb b/lib/facts/el/kernelmajversion.rb deleted file mode 100644 index 26fb500bc..000000000 --- a/lib/facts/el/kernelmajversion.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - class Kernelmajversion - FACT_NAME = 'kernelmajversion' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:kernelrelease) - Facter::ResolvedFact.new(FACT_NAME, major_version(fact_value)) - end - - private - - def major_version(fact_value) - value_split = fact_value.split('.') - return value_split[0] if value_split.length <= 1 - - value_split[0] + '.' + value_split[1] - end - end - end -end diff --git a/lib/facts/el/kernelversion.rb b/lib/facts/el/kernelversion.rb deleted file mode 100644 index c4aca78c4..000000000 --- a/lib/facts/el/kernelversion.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - class Kernelversion - FACT_NAME = 'kernelversion' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:kernelrelease) - Facter::ResolvedFact.new(FACT_NAME, version(fact_value)) - end - - private - - def version(fact_value) - version_token = fact_value.split('-') - version_token[0] - end - end - end -end diff --git a/lib/facts/el/memory/swap/available_bytes.rb b/lib/facts/el/memory/swap/available_bytes.rb deleted file mode 100644 index 56b06c7df..000000000 --- a/lib/facts/el/memory/swap/available_bytes.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Memory - module Swap - class AvailableBytes - FACT_NAME = 'memory.swap.available_bytes' - ALIASES = 'swapfree_mb' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/memory/swap/capacity.rb b/lib/facts/el/memory/swap/capacity.rb deleted file mode 100644 index 6cb549134..000000000 --- a/lib/facts/el/memory/swap/capacity.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Memory - module Swap - class Capacity - FACT_NAME = 'memory.swap.capacity' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_capacity) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/el/memory/system/available.rb b/lib/facts/el/memory/system/available.rb deleted file mode 100644 index 225dfa59c..000000000 --- a/lib/facts/el/memory/system/available.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Memory - module System - class Available - FACT_NAME = 'memory.system.available' - ALIASES = 'memoryfree' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:memfree) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/memory/system/available_bytes.rb b/lib/facts/el/memory/system/available_bytes.rb deleted file mode 100644 index 7a964c44d..000000000 --- a/lib/facts/el/memory/system/available_bytes.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Memory - module System - class AvailableBytes - FACT_NAME = 'memory.system.available_bytes' - ALIASES = 'memoryfree_mb' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:memfree) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/memory/system/capacity.rb b/lib/facts/el/memory/system/capacity.rb deleted file mode 100644 index 5ed975e44..000000000 --- a/lib/facts/el/memory/system/capacity.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Memory - module System - class Capacity - FACT_NAME = 'memory.system.capacity' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:capacity) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/el/memory/system/total.rb b/lib/facts/el/memory/system/total.rb deleted file mode 100644 index 05e050958..000000000 --- a/lib/facts/el/memory/system/total.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Memory - module System - class Total - FACT_NAME = 'memory.system.total' - ALIASES = 'memorysize' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:total) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/memory/system/total_bytes.rb b/lib/facts/el/memory/system/total_bytes.rb deleted file mode 100644 index 2270d6177..000000000 --- a/lib/facts/el/memory/system/total_bytes.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Memory - module System - class TotalBytes - FACT_NAME = 'memory.system.total_bytes' - ALIASES = 'memorysize_mb' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:total) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/memory/system/used.rb b/lib/facts/el/memory/system/used.rb deleted file mode 100644 index eec72abdf..000000000 --- a/lib/facts/el/memory/system/used.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Memory - module System - class Used - FACT_NAME = 'memory.system.used' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:used_bytes) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/el/mountpoints.rb b/lib/facts/el/mountpoints.rb deleted file mode 100644 index d230d441c..000000000 --- a/lib/facts/el/mountpoints.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - class Mountpoints - FACT_NAME = 'mountpoints' - - def call_the_resolver - mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(FACT_NAME.to_sym) - return Facter::ResolvedFact.new(FACT_NAME, nil) unless mountpoints - - fact = {} - mountpoints.each do |mnt| - fact[mnt[:path].to_sym] = mnt.reject { |k| k == :path } - end - - Facter::ResolvedFact.new(FACT_NAME, fact) - end - end - end -end diff --git a/lib/facts/el/networking/interfaces.rb b/lib/facts/el/networking/interfaces.rb deleted file mode 100644 index f115bca91..000000000 --- a/lib/facts/el/networking/interfaces.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Networking - class Interfaces - FACT_NAME = 'networking.interfaces' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:interfaces) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/el/networking/ip.rb b/lib/facts/el/networking/ip.rb deleted file mode 100644 index a613f063b..000000000 --- a/lib/facts/el/networking/ip.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Networking - class Ip - FACT_NAME = 'networking.ip' - ALIASES = 'ipaddress' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:ip) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/el/networking/mac.rb b/lib/facts/el/networking/mac.rb deleted file mode 100644 index 005c756e1..000000000 --- a/lib/facts/el/networking/mac.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Networking - class Mac - FACT_NAME = 'networking.mac' - ALIASES = 'macaddress' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:macaddress) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/el/networking/primary.rb b/lib/facts/el/networking/primary.rb deleted file mode 100644 index 57e255c04..000000000 --- a/lib/facts/el/networking/primary.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Networking - class Primary - FACT_NAME = 'networking.primary' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface) - - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/el/os/architecture.rb b/lib/facts/el/os/architecture.rb deleted file mode 100644 index 66e99481d..000000000 --- a/lib/facts/el/os/architecture.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Os - class Architecture - FACT_NAME = 'os.architecture' - ALIASES = 'architecture' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:machine) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/el/os/selinux/config_policy.rb b/lib/facts/el/os/selinux/config_policy.rb deleted file mode 100644 index 0da37feea..000000000 --- a/lib/facts/el/os/selinux/config_policy.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Os - module Selinux - class ConfigPolicy - FACT_NAME = 'os.selinux.config_policy' - ALIASES = 'selinux_config_policy' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:config_policy) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/el/partitions.rb b/lib/facts/el/partitions.rb deleted file mode 100644 index fd8f0af11..000000000 --- a/lib/facts/el/partitions.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - class Partitions - FACT_NAME = 'partitions' - - def call_the_resolver - Facter::ResolvedFact.new(FACT_NAME, partitions) - end - - def partitions - parts = Facter::Resolvers::Partitions.resolve(:partitions) - mountpoints = Facter::Resolvers::Linux::Mountpoints.resolve(:mountpoints) - return parts unless mountpoints - - mountpoints.each do |mnt| - next unless parts[mnt[:device]] - - parts[mnt[:device]].merge!(mount: mnt[:path]) - end - parts.empty? ? nil : parts - end - end - end -end diff --git a/lib/facts/el/path.rb b/lib/facts/el/path.rb deleted file mode 100644 index 15481f576..000000000 --- a/lib/facts/el/path.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - class Path - FACT_NAME = 'path' - - def call_the_resolver - fact_value = Facter::Resolvers::Path.resolve(:path) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/el/processors/count.rb b/lib/facts/el/processors/count.rb deleted file mode 100644 index c8066a52c..000000000 --- a/lib/facts/el/processors/count.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Processors - class Count - FACT_NAME = 'processors.count' - ALIASES = 'processorcount' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Processors.resolve(:processors) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/el/processors/isa.rb b/lib/facts/el/processors/isa.rb deleted file mode 100644 index 33f9993f6..000000000 --- a/lib/facts/el/processors/isa.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Processors - class Isa - FACT_NAME = 'processors.isa' - ALIASES = 'hardwareisa' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:processor) - fact_value = get_isa(fact_value) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - - private - - def get_isa(fact_value) - value_split = fact_value.split('.') - - value_split.last - end - end - end - end -end diff --git a/lib/facts/el/processors/physicalcount.rb b/lib/facts/el/processors/physicalcount.rb deleted file mode 100644 index d1e014139..000000000 --- a/lib/facts/el/processors/physicalcount.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Processors - class Physicalcount - FACT_NAME = 'processors.physicalcount' - ALIASES = 'physicalprocessorcount' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Processors.resolve(:physical_count) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/el/ruby/version.rb b/lib/facts/el/ruby/version.rb deleted file mode 100644 index 8809f324d..000000000 --- a/lib/facts/el/ruby/version.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module Ruby - class Version - FACT_NAME = 'ruby.version' - ALIASES = 'rubyversion' - - def call_the_resolver - fact_value = Facter::Resolvers::Ruby.resolve(:version) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/el/sshalgorithmkey.rb b/lib/facts/el/sshalgorithmkey.rb deleted file mode 100644 index 05c36fd93..000000000 --- a/lib/facts/el/sshalgorithmkey.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - class Sshalgorithmkey - FACT_NAME = 'ssh.*key' - TYPE = :legacy - - def call_the_resolver - facts = [] - result = Facter::Resolvers::SshResolver.resolve(:ssh) - result.each { |ssh| facts << Facter::ResolvedFact.new("ssh#{ssh.name.to_sym}key", ssh.key, :legacy) } - facts - end - end - end -end diff --git a/lib/facts/el/system_uptime/days.rb b/lib/facts/el/system_uptime/days.rb deleted file mode 100644 index c5ebebc30..000000000 --- a/lib/facts/el/system_uptime/days.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module El - module SystemUptime - class Days - FACT_NAME = 'system_uptime.days' - ALIASES = 'uptime_days' - - def call_the_resolver - fact_value = Facter::Resolvers::Uptime.resolve(:days) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/augeas/version.rb b/lib/facts/linux/augeas/version.rb similarity index 96% rename from lib/facts/sles/augeas/version.rb rename to lib/facts/linux/augeas/version.rb index 0d1a06021..62ff14ba2 100644 --- a/lib/facts/sles/augeas/version.rb +++ b/lib/facts/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' diff --git a/lib/facts/el/disks.rb b/lib/facts/linux/disks.rb similarity index 94% rename from lib/facts/el/disks.rb rename to lib/facts/linux/disks.rb index 1dac7f5b3..f883e5c69 100644 --- a/lib/facts/el/disks.rb +++ b/lib/facts/linux/disks.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class Disks FACT_NAME = 'disks' diff --git a/lib/facts/el/dmi/bios/release_date.rb b/lib/facts/linux/dmi/bios/release_date.rb similarity index 96% rename from lib/facts/el/dmi/bios/release_date.rb rename to lib/facts/linux/dmi/bios/release_date.rb index 01224b3ea..b4758053d 100644 --- a/lib/facts/el/dmi/bios/release_date.rb +++ b/lib/facts/linux/dmi/bios/release_date.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Dmi module Bios class ReleaseDate diff --git a/lib/facts/sles/dmi/bios/vendor.rb b/lib/facts/linux/dmi/bios/vendor.rb similarity index 96% rename from lib/facts/sles/dmi/bios/vendor.rb rename to lib/facts/linux/dmi/bios/vendor.rb index b85d08834..129545344 100644 --- a/lib/facts/sles/dmi/bios/vendor.rb +++ b/lib/facts/linux/dmi/bios/vendor.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Dmi module Bios class Vendor diff --git a/lib/facts/el/dmi/bios/version.rb b/lib/facts/linux/dmi/bios/version.rb similarity index 96% rename from lib/facts/el/dmi/bios/version.rb rename to lib/facts/linux/dmi/bios/version.rb index a5dcf87e1..86792d2ea 100644 --- a/lib/facts/el/dmi/bios/version.rb +++ b/lib/facts/linux/dmi/bios/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Dmi module Bios class Version diff --git a/lib/facts/sles/dmi/board/manufacturer.rb b/lib/facts/linux/dmi/board/manufacturer.rb similarity index 96% rename from lib/facts/sles/dmi/board/manufacturer.rb rename to lib/facts/linux/dmi/board/manufacturer.rb index d541ee468..cf2faaee7 100644 --- a/lib/facts/sles/dmi/board/manufacturer.rb +++ b/lib/facts/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 diff --git a/lib/facts/sles/dmi/board/product.rb b/lib/facts/linux/dmi/board/product.rb similarity index 96% rename from lib/facts/sles/dmi/board/product.rb rename to lib/facts/linux/dmi/board/product.rb index a3d6177df..5246bf722 100644 --- a/lib/facts/sles/dmi/board/product.rb +++ b/lib/facts/linux/dmi/board/product.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Dmi module Board class Product diff --git a/lib/facts/el/dmi/board/serial_number.rb b/lib/facts/linux/dmi/board/serial_number.rb similarity index 96% rename from lib/facts/el/dmi/board/serial_number.rb rename to lib/facts/linux/dmi/board/serial_number.rb index 282eb8313..62e4c0aee 100644 --- a/lib/facts/el/dmi/board/serial_number.rb +++ b/lib/facts/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 diff --git a/lib/facts/sles/dmi/chassis/asset_tag.rb b/lib/facts/linux/dmi/chassis/asset_tag.rb similarity index 96% rename from lib/facts/sles/dmi/chassis/asset_tag.rb rename to lib/facts/linux/dmi/chassis/asset_tag.rb index d494810d7..3f1f58c5c 100644 --- a/lib/facts/sles/dmi/chassis/asset_tag.rb +++ b/lib/facts/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 diff --git a/lib/facts/sles/dmi/chassis/type.rb b/lib/facts/linux/dmi/chassis/type.rb similarity index 96% rename from lib/facts/sles/dmi/chassis/type.rb rename to lib/facts/linux/dmi/chassis/type.rb index 9bb6acbbc..e55526a23 100644 --- a/lib/facts/sles/dmi/chassis/type.rb +++ b/lib/facts/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 diff --git a/lib/facts/el/dmi/manufacturer.rb b/lib/facts/linux/dmi/manufacturer.rb similarity index 96% rename from lib/facts/el/dmi/manufacturer.rb rename to lib/facts/linux/dmi/manufacturer.rb index bcfd3f180..972e11a68 100644 --- a/lib/facts/el/dmi/manufacturer.rb +++ b/lib/facts/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' diff --git a/lib/facts/el/dmi/product/name.rb b/lib/facts/linux/dmi/product/name.rb similarity index 96% rename from lib/facts/el/dmi/product/name.rb rename to lib/facts/linux/dmi/product/name.rb index 21bace09c..928a87221 100644 --- a/lib/facts/el/dmi/product/name.rb +++ b/lib/facts/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 diff --git a/lib/facts/sles/dmi/product/serial_number.rb b/lib/facts/linux/dmi/product/serial_number.rb similarity index 96% rename from lib/facts/sles/dmi/product/serial_number.rb rename to lib/facts/linux/dmi/product/serial_number.rb index 8ce02f5c6..fd679f363 100644 --- a/lib/facts/sles/dmi/product/serial_number.rb +++ b/lib/facts/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 diff --git a/lib/facts/sles/dmi/product/uuid.rb b/lib/facts/linux/dmi/product/uuid.rb similarity index 96% rename from lib/facts/sles/dmi/product/uuid.rb rename to lib/facts/linux/dmi/product/uuid.rb index 832e77d6f..f0908e6ab 100644 --- a/lib/facts/sles/dmi/product/uuid.rb +++ b/lib/facts/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 diff --git a/lib/facts/debian/facterversion.rb b/lib/facts/linux/facterversion.rb similarity index 94% rename from lib/facts/debian/facterversion.rb rename to lib/facts/linux/facterversion.rb index 837e64d13..3e81698a4 100644 --- a/lib/facts/debian/facterversion.rb +++ b/lib/facts/linux/facterversion.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux class Facterversion FACT_NAME = 'facterversion' diff --git a/lib/facts/el/filesystems.rb b/lib/facts/linux/filesystems.rb similarity index 95% rename from lib/facts/el/filesystems.rb rename to lib/facts/linux/filesystems.rb index 663cf3c5f..b198b4323 100644 --- a/lib/facts/el/filesystems.rb +++ b/lib/facts/linux/filesystems.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class Filesystems FACT_NAME = 'filesystems' diff --git a/lib/facts/el/fips_enabled.rb b/lib/facts/linux/fips_enabled.rb similarity index 95% rename from lib/facts/el/fips_enabled.rb rename to lib/facts/linux/fips_enabled.rb index fcd695c59..9d71eafcc 100644 --- a/lib/facts/el/fips_enabled.rb +++ b/lib/facts/linux/fips_enabled.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class FipsEnabled FACT_NAME = 'fips_enabled' diff --git a/lib/facts/sles/identity/gid.rb b/lib/facts/linux/identity/gid.rb similarity index 95% rename from lib/facts/sles/identity/gid.rb rename to lib/facts/linux/identity/gid.rb index 11a2f848e..d9849c8da 100644 --- a/lib/facts/sles/identity/gid.rb +++ b/lib/facts/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' diff --git a/lib/facts/sles/identity/group.rb b/lib/facts/linux/identity/group.rb similarity index 96% rename from lib/facts/sles/identity/group.rb rename to lib/facts/linux/identity/group.rb index 4e75f5533..e881f9138 100644 --- a/lib/facts/sles/identity/group.rb +++ b/lib/facts/linux/identity/group.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Identity class Group FACT_NAME = 'identity.group' diff --git a/lib/facts/el/identity/privileged.rb b/lib/facts/linux/identity/privileged.rb similarity index 95% rename from lib/facts/el/identity/privileged.rb rename to lib/facts/linux/identity/privileged.rb index 5c25c8895..8cd4e6dea 100644 --- a/lib/facts/el/identity/privileged.rb +++ b/lib/facts/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' diff --git a/lib/facts/el/identity/uid.rb b/lib/facts/linux/identity/uid.rb similarity index 95% rename from lib/facts/el/identity/uid.rb rename to lib/facts/linux/identity/uid.rb index 8091ab458..330696145 100644 --- a/lib/facts/el/identity/uid.rb +++ b/lib/facts/linux/identity/uid.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Identity class Uid FACT_NAME = 'identity.uid' diff --git a/lib/facts/el/identity/user.rb b/lib/facts/linux/identity/user.rb similarity index 96% rename from lib/facts/el/identity/user.rb rename to lib/facts/linux/identity/user.rb index 8a5111ee4..f1071bb78 100644 --- a/lib/facts/el/identity/user.rb +++ b/lib/facts/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' diff --git a/lib/facts/el/interfaces.rb b/lib/facts/linux/interfaces.rb similarity index 96% rename from lib/facts/el/interfaces.rb rename to lib/facts/linux/interfaces.rb index d96a57f56..0549d3986 100644 --- a/lib/facts/el/interfaces.rb +++ b/lib/facts/linux/interfaces.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class Interfaces FACT_NAME = 'interfaces' diff --git a/lib/facts/debian/kernel.rb b/lib/facts/linux/kernel.rb similarity index 94% rename from lib/facts/debian/kernel.rb rename to lib/facts/linux/kernel.rb index 848022e78..aa3137843 100644 --- a/lib/facts/debian/kernel.rb +++ b/lib/facts/linux/kernel.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux class Kernel FACT_NAME = 'kernel' diff --git a/lib/facts/debian/kernelmajversion.rb b/lib/facts/linux/kernelmajversion.rb similarity index 97% rename from lib/facts/debian/kernelmajversion.rb rename to lib/facts/linux/kernelmajversion.rb index 40f8d66d0..600895726 100644 --- a/lib/facts/debian/kernelmajversion.rb +++ b/lib/facts/linux/kernelmajversion.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux class Kernelmajversion FACT_NAME = 'kernelmajversion' diff --git a/lib/facts/el/kernelrelease.rb b/lib/facts/linux/kernelrelease.rb similarity index 95% rename from lib/facts/el/kernelrelease.rb rename to lib/facts/linux/kernelrelease.rb index 0a37b1197..4896ffcf7 100644 --- a/lib/facts/el/kernelrelease.rb +++ b/lib/facts/linux/kernelrelease.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class Kernelrelease FACT_NAME = 'kernelrelease' diff --git a/lib/facts/debian/kernelversion.rb b/lib/facts/linux/kernelversion.rb similarity index 95% rename from lib/facts/debian/kernelversion.rb rename to lib/facts/linux/kernelversion.rb index 408dafb90..e4aeddd4e 100644 --- a/lib/facts/debian/kernelversion.rb +++ b/lib/facts/linux/kernelversion.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux class Kernelversion FACT_NAME = 'kernelversion' diff --git a/lib/facts/el/load_averages.rb b/lib/facts/linux/load_averages.rb similarity index 95% rename from lib/facts/el/load_averages.rb rename to lib/facts/linux/load_averages.rb index e689d86da..63f873c2e 100644 --- a/lib/facts/el/load_averages.rb +++ b/lib/facts/linux/load_averages.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class LoadAverages FACT_NAME = 'load_averages' diff --git a/lib/facts/debian/lsbdistrelease.rb b/lib/facts/linux/lsbdistrelease.rb similarity index 97% rename from lib/facts/debian/lsbdistrelease.rb rename to lib/facts/linux/lsbdistrelease.rb index 22c17a6c3..5711ee912 100644 --- a/lib/facts/debian/lsbdistrelease.rb +++ b/lib/facts/linux/lsbdistrelease.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux class Lsbdistrelease FACT_NAME = 'lsbdistrelease' ALIASES = %w[lsbmajdistrelease lsbminordistrelease].freeze diff --git a/lib/facts/el/memory/swap/available.rb b/lib/facts/linux/memory/swap/available.rb similarity index 97% rename from lib/facts/el/memory/swap/available.rb rename to lib/facts/linux/memory/swap/available.rb index 35ef8a363..a6baf8243 100644 --- a/lib/facts/el/memory/swap/available.rb +++ b/lib/facts/linux/memory/swap/available.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Memory module Swap class Available diff --git a/lib/facts/debian/memory/swap/available_bytes.rb b/lib/facts/linux/memory/swap/available_bytes.rb similarity index 97% rename from lib/facts/debian/memory/swap/available_bytes.rb rename to lib/facts/linux/memory/swap/available_bytes.rb index 9867ac550..7049db22a 100644 --- a/lib/facts/debian/memory/swap/available_bytes.rb +++ b/lib/facts/linux/memory/swap/available_bytes.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux module Memory module Swap class AvailableBytes diff --git a/lib/facts/sles/memory/swap/capacity.rb b/lib/facts/linux/memory/swap/capacity.rb similarity index 96% rename from lib/facts/sles/memory/swap/capacity.rb rename to lib/facts/linux/memory/swap/capacity.rb index ee74fb059..8a986f1f7 100644 --- a/lib/facts/sles/memory/swap/capacity.rb +++ b/lib/facts/linux/memory/swap/capacity.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Memory module Swap class Capacity diff --git a/lib/facts/el/memory/swap/total.rb b/lib/facts/linux/memory/swap/total.rb similarity index 97% rename from lib/facts/el/memory/swap/total.rb rename to lib/facts/linux/memory/swap/total.rb index cf8f39918..9b671e4c1 100644 --- a/lib/facts/el/memory/swap/total.rb +++ b/lib/facts/linux/memory/swap/total.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Memory module Swap class Total diff --git a/lib/facts/el/memory/swap/total_bytes.rb b/lib/facts/linux/memory/swap/total_bytes.rb similarity index 97% rename from lib/facts/el/memory/swap/total_bytes.rb rename to lib/facts/linux/memory/swap/total_bytes.rb index 61badfe82..87c785d54 100644 --- a/lib/facts/el/memory/swap/total_bytes.rb +++ b/lib/facts/linux/memory/swap/total_bytes.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Memory module Swap class TotalBytes diff --git a/lib/facts/el/memory/swap/used.rb b/lib/facts/linux/memory/swap/used.rb similarity index 96% rename from lib/facts/el/memory/swap/used.rb rename to lib/facts/linux/memory/swap/used.rb index ee879d5d0..305cc80fa 100644 --- a/lib/facts/el/memory/swap/used.rb +++ b/lib/facts/linux/memory/swap/used.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Memory module Swap class Used diff --git a/lib/facts/el/memory/swap/used_bytes.rb b/lib/facts/linux/memory/swap/used_bytes.rb similarity index 96% rename from lib/facts/el/memory/swap/used_bytes.rb rename to lib/facts/linux/memory/swap/used_bytes.rb index 18c1e470f..dc63e77e6 100644 --- a/lib/facts/el/memory/swap/used_bytes.rb +++ b/lib/facts/linux/memory/swap/used_bytes.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Memory module Swap class UsedBytes diff --git a/lib/facts/debian/memory/system/available.rb b/lib/facts/linux/memory/system/available.rb similarity index 97% rename from lib/facts/debian/memory/system/available.rb rename to lib/facts/linux/memory/system/available.rb index 3785b7a26..867f81c8e 100644 --- a/lib/facts/debian/memory/system/available.rb +++ b/lib/facts/linux/memory/system/available.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux module Memory module System class Available diff --git a/lib/facts/debian/memory/system/available_bytes.rb b/lib/facts/linux/memory/system/available_bytes.rb similarity index 97% rename from lib/facts/debian/memory/system/available_bytes.rb rename to lib/facts/linux/memory/system/available_bytes.rb index 40e593532..c94645f2c 100644 --- a/lib/facts/debian/memory/system/available_bytes.rb +++ b/lib/facts/linux/memory/system/available_bytes.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux module Memory module System class AvailableBytes diff --git a/lib/facts/sles/memory/system/capacity.rb b/lib/facts/linux/memory/system/capacity.rb similarity index 96% rename from lib/facts/sles/memory/system/capacity.rb rename to lib/facts/linux/memory/system/capacity.rb index 508a365d0..003096e67 100644 --- a/lib/facts/sles/memory/system/capacity.rb +++ b/lib/facts/linux/memory/system/capacity.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Memory module System class Capacity diff --git a/lib/facts/sles/memory/system/total.rb b/lib/facts/linux/memory/system/total.rb similarity index 97% rename from lib/facts/sles/memory/system/total.rb rename to lib/facts/linux/memory/system/total.rb index 62f25650a..72710b3db 100644 --- a/lib/facts/sles/memory/system/total.rb +++ b/lib/facts/linux/memory/system/total.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Memory module System class Total diff --git a/lib/facts/sles/memory/system/total_bytes.rb b/lib/facts/linux/memory/system/total_bytes.rb similarity index 97% rename from lib/facts/sles/memory/system/total_bytes.rb rename to lib/facts/linux/memory/system/total_bytes.rb index de3b6546e..1fd966ed2 100644 --- a/lib/facts/sles/memory/system/total_bytes.rb +++ b/lib/facts/linux/memory/system/total_bytes.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Memory module System class TotalBytes diff --git a/lib/facts/sles/memory/system/used.rb b/lib/facts/linux/memory/system/used.rb similarity index 96% rename from lib/facts/sles/memory/system/used.rb rename to lib/facts/linux/memory/system/used.rb index bd2e8794e..6be7c59e4 100644 --- a/lib/facts/sles/memory/system/used.rb +++ b/lib/facts/linux/memory/system/used.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Memory module System class Used diff --git a/lib/facts/el/memory/system/used_bytes.rb b/lib/facts/linux/memory/system/used_bytes.rb similarity index 96% rename from lib/facts/el/memory/system/used_bytes.rb rename to lib/facts/linux/memory/system/used_bytes.rb index 1b4004820..9478cc39a 100644 --- a/lib/facts/el/memory/system/used_bytes.rb +++ b/lib/facts/linux/memory/system/used_bytes.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Memory module System class UsedBytes diff --git a/lib/facts/sles/mountpoints.rb b/lib/facts/linux/mountpoints.rb similarity index 97% rename from lib/facts/sles/mountpoints.rb rename to lib/facts/linux/mountpoints.rb index f74491880..0b5fb3386 100644 --- a/lib/facts/sles/mountpoints.rb +++ b/lib/facts/linux/mountpoints.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux class Mountpoints FACT_NAME = 'mountpoints' diff --git a/lib/facts/el/networking/domain.rb b/lib/facts/linux/networking/domain.rb similarity index 96% rename from lib/facts/el/networking/domain.rb rename to lib/facts/linux/networking/domain.rb index b85e3d0e2..ad22f602b 100644 --- a/lib/facts/el/networking/domain.rb +++ b/lib/facts/linux/networking/domain.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Networking class Domain FACT_NAME = 'networking.domain' diff --git a/lib/facts/el/networking/fqdn.rb b/lib/facts/linux/networking/fqdn.rb similarity index 96% rename from lib/facts/el/networking/fqdn.rb rename to lib/facts/linux/networking/fqdn.rb index 3f1e6dfc2..efeee3c68 100644 --- a/lib/facts/el/networking/fqdn.rb +++ b/lib/facts/linux/networking/fqdn.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Networking class Fqdn FACT_NAME = 'networking.fqdn' diff --git a/lib/facts/el/networking/hostname.rb b/lib/facts/linux/networking/hostname.rb similarity index 96% rename from lib/facts/el/networking/hostname.rb rename to lib/facts/linux/networking/hostname.rb index 9ca0ef1a0..90330a4fd 100644 --- a/lib/facts/el/networking/hostname.rb +++ b/lib/facts/linux/networking/hostname.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Networking class Hostname FACT_NAME = 'networking.hostname' diff --git a/lib/facts/sles/networking/interfaces.rb b/lib/facts/linux/networking/interfaces.rb similarity index 95% rename from lib/facts/sles/networking/interfaces.rb rename to lib/facts/linux/networking/interfaces.rb index dd47625d9..89942b017 100644 --- a/lib/facts/sles/networking/interfaces.rb +++ b/lib/facts/linux/networking/interfaces.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Networking class Interfaces FACT_NAME = 'networking.interfaces' diff --git a/lib/facts/sles/networking/ip.rb b/lib/facts/linux/networking/ip.rb similarity index 96% rename from lib/facts/sles/networking/ip.rb rename to lib/facts/linux/networking/ip.rb index 6d2dfd762..96d853855 100644 --- a/lib/facts/sles/networking/ip.rb +++ b/lib/facts/linux/networking/ip.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Networking class Ip FACT_NAME = 'networking.ip' diff --git a/lib/facts/sles/networking/mac.rb b/lib/facts/linux/networking/mac.rb similarity index 96% rename from lib/facts/sles/networking/mac.rb rename to lib/facts/linux/networking/mac.rb index 4dab8b5de..36a7b4f09 100644 --- a/lib/facts/sles/networking/mac.rb +++ b/lib/facts/linux/networking/mac.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Networking class Mac FACT_NAME = 'networking.mac' diff --git a/lib/facts/sles/networking/primary.rb b/lib/facts/linux/networking/primary.rb similarity index 95% rename from lib/facts/sles/networking/primary.rb rename to lib/facts/linux/networking/primary.rb index 97dfd2a62..efaf2b2de 100644 --- a/lib/facts/sles/networking/primary.rb +++ b/lib/facts/linux/networking/primary.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Networking class Primary FACT_NAME = 'networking.primary' diff --git a/lib/facts/sles/os/architecture.rb b/lib/facts/linux/os/architecture.rb similarity index 96% rename from lib/facts/sles/os/architecture.rb rename to lib/facts/linux/os/architecture.rb index 978a88e3e..f4fc81757 100644 --- a/lib/facts/sles/os/architecture.rb +++ b/lib/facts/linux/os/architecture.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Os class Architecture FACT_NAME = 'os.architecture' diff --git a/lib/facts/sles/os/distro/specification.rb b/lib/facts/linux/os/distro/codename.rb similarity index 72% rename from lib/facts/sles/os/distro/specification.rb rename to lib/facts/linux/os/distro/codename.rb index 1ff7bc7ba..3a542f220 100644 --- a/lib/facts/sles/os/distro/specification.rb +++ b/lib/facts/linux/os/distro/codename.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Os module Distro - class Specification - FACT_NAME = 'os.distro.specification' - ALIASES = 'lsbrelease' + class Codename + FACT_NAME = 'os.distro.codename' + ALIASES = 'lsbdistcodename' def call_the_resolver - fact_value = Facter::Resolvers::LsbRelease.resolve(:lsb_version) + fact_value = Facter::Resolvers::LsbRelease.resolve(:codename) [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] diff --git a/lib/facts/debian/os/distro/specification.rb b/lib/facts/linux/os/distro/description.rb similarity index 71% rename from lib/facts/debian/os/distro/specification.rb rename to lib/facts/linux/os/distro/description.rb index e86d225ae..1a2075ec6 100644 --- a/lib/facts/debian/os/distro/specification.rb +++ b/lib/facts/linux/os/distro/description.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true module Facts - module Debian + module Linux module Os module Distro - class Specification - FACT_NAME = 'os.distro.specification' - ALIASES = 'lsbrelease' + class Description + FACT_NAME = 'os.distro.description' + ALIASES = 'lsbdistdescription' def call_the_resolver - fact_value = Facter::Resolvers::LsbRelease.resolve(:lsb_version) + fact_value = Facter::Resolvers::LsbRelease.resolve(:description) [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] diff --git a/lib/facts/linux/os/distro/id.rb b/lib/facts/linux/os/distro/id.rb new file mode 100644 index 000000000..0a3cf60ba --- /dev/null +++ b/lib/facts/linux/os/distro/id.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +module Facts + module Linux + module Os + module Distro + class Id + FACT_NAME = 'os.distro.id' + ALIASES = 'lsbdistid' + + def call_the_resolver + fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id) + + [Facter::ResolvedFact.new(FACT_NAME, fact_value), + Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] + end + end + end + end + end +end diff --git a/lib/facts/linux/os/distro/release.rb b/lib/facts/linux/os/distro/release.rb new file mode 100644 index 000000000..63ec55177 --- /dev/null +++ b/lib/facts/linux/os/distro/release.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +module Facts + module Linux + module Os + module Distro + class Release + FACT_NAME = 'os.distro.release' + ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze + + def call_the_resolver + fact_value = Facter::Resolvers::LsbRelease.resolve(:release) + return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value + + versions = fact_value.split('.') + release = { + 'full' => fact_value, + 'major' => versions[0], + 'minor' => versions[1] + } + + [Facter::ResolvedFact.new(FACT_NAME, release), + Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy), + Facter::ResolvedFact.new(ALIASES[1], versions[0], :legacy), + Facter::ResolvedFact.new(ALIASES[2], versions[1], :legacy)] + end + end + end + end + end +end diff --git a/lib/facts/el/os/distro/specification.rb b/lib/facts/linux/os/distro/specification.rb similarity index 96% rename from lib/facts/el/os/distro/specification.rb rename to lib/facts/linux/os/distro/specification.rb index 72b293f81..327fde979 100644 --- a/lib/facts/el/os/distro/specification.rb +++ b/lib/facts/linux/os/distro/specification.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Os module Distro class Specification diff --git a/lib/facts/debian/os/family.rb b/lib/facts/linux/os/family.rb similarity index 96% rename from lib/facts/debian/os/family.rb rename to lib/facts/linux/os/family.rb index 4ad56af74..b0c99ec0f 100644 --- a/lib/facts/debian/os/family.rb +++ b/lib/facts/linux/os/family.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux module Os class Family FACT_NAME = 'os.family' diff --git a/lib/facts/el/os/hardware.rb b/lib/facts/linux/os/hardware.rb similarity index 96% rename from lib/facts/el/os/hardware.rb rename to lib/facts/linux/os/hardware.rb index 8eecf943a..df5dda273 100644 --- a/lib/facts/el/os/hardware.rb +++ b/lib/facts/linux/os/hardware.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Os class Hardware FACT_NAME = 'os.hardware' diff --git a/lib/facts/sles/os/name.rb b/lib/facts/linux/os/name.rb similarity index 96% rename from lib/facts/sles/os/name.rb rename to lib/facts/linux/os/name.rb index 4214e8181..b1115f6df 100644 --- a/lib/facts/sles/os/name.rb +++ b/lib/facts/linux/os/name.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Os class Name FACT_NAME = 'os.name' diff --git a/lib/facts/el/os/release.rb b/lib/facts/linux/os/release.rb similarity index 97% rename from lib/facts/el/os/release.rb rename to lib/facts/linux/os/release.rb index 0310241a1..2bcedd2c9 100644 --- a/lib/facts/el/os/release.rb +++ b/lib/facts/linux/os/release.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Os class Release FACT_NAME = 'os.release' diff --git a/lib/facts/el/os/selinux/config_mode.rb b/lib/facts/linux/os/selinux/config_mode.rb similarity index 97% rename from lib/facts/el/os/selinux/config_mode.rb rename to lib/facts/linux/os/selinux/config_mode.rb index 5a2ede292..d6689df1e 100644 --- a/lib/facts/el/os/selinux/config_mode.rb +++ b/lib/facts/linux/os/selinux/config_mode.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Os module Selinux class ConfigMode diff --git a/lib/facts/sles/os/selinux/config_policy.rb b/lib/facts/linux/os/selinux/config_policy.rb similarity index 97% rename from lib/facts/sles/os/selinux/config_policy.rb rename to lib/facts/linux/os/selinux/config_policy.rb index 3729f40ad..4cfb33d0b 100644 --- a/lib/facts/sles/os/selinux/config_policy.rb +++ b/lib/facts/linux/os/selinux/config_policy.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Os module Selinux class ConfigPolicy diff --git a/lib/facts/el/os/selinux/current_mode.rb b/lib/facts/linux/os/selinux/current_mode.rb similarity index 97% rename from lib/facts/el/os/selinux/current_mode.rb rename to lib/facts/linux/os/selinux/current_mode.rb index d5900911c..a211766b9 100644 --- a/lib/facts/el/os/selinux/current_mode.rb +++ b/lib/facts/linux/os/selinux/current_mode.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Os module Selinux class CurrentMode diff --git a/lib/facts/el/os/selinux/enabled.rb b/lib/facts/linux/os/selinux/enabled.rb similarity index 96% rename from lib/facts/el/os/selinux/enabled.rb rename to lib/facts/linux/os/selinux/enabled.rb index ae43927e9..c3c2005a4 100644 --- a/lib/facts/el/os/selinux/enabled.rb +++ b/lib/facts/linux/os/selinux/enabled.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Os module Selinux class Enabled diff --git a/lib/facts/el/os/selinux/enforced.rb b/lib/facts/linux/os/selinux/enforced.rb similarity index 96% rename from lib/facts/el/os/selinux/enforced.rb rename to lib/facts/linux/os/selinux/enforced.rb index 5fdc99862..8bc096849 100644 --- a/lib/facts/el/os/selinux/enforced.rb +++ b/lib/facts/linux/os/selinux/enforced.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Os module Selinux class Enforced diff --git a/lib/facts/el/os/selinux/policy_version.rb b/lib/facts/linux/os/selinux/policy_version.rb similarity index 97% rename from lib/facts/el/os/selinux/policy_version.rb rename to lib/facts/linux/os/selinux/policy_version.rb index 5f9be01bb..a28f6acf3 100644 --- a/lib/facts/el/os/selinux/policy_version.rb +++ b/lib/facts/linux/os/selinux/policy_version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Os module Selinux class PolicyVersion diff --git a/lib/facts/sles/partitions.rb b/lib/facts/linux/partitions.rb similarity index 97% rename from lib/facts/sles/partitions.rb rename to lib/facts/linux/partitions.rb index 0cfde22ea..1bb36f05e 100644 --- a/lib/facts/sles/partitions.rb +++ b/lib/facts/linux/partitions.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux class Partitions FACT_NAME = 'partitions' diff --git a/lib/facts/debian/path.rb b/lib/facts/linux/path.rb similarity index 94% rename from lib/facts/debian/path.rb rename to lib/facts/linux/path.rb index 2a6d770ef..07497ab0d 100644 --- a/lib/facts/debian/path.rb +++ b/lib/facts/linux/path.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux class Path FACT_NAME = 'path' diff --git a/lib/facts/el/processor.rb b/lib/facts/linux/processor.rb similarity index 96% rename from lib/facts/el/processor.rb rename to lib/facts/linux/processor.rb index 453d7f3aa..106133046 100644 --- a/lib/facts/el/processor.rb +++ b/lib/facts/linux/processor.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class Processor FACT_NAME = 'processor.*' TYPE = :legacy diff --git a/lib/facts/sles/processors/count.rb b/lib/facts/linux/processors/count.rb similarity index 96% rename from lib/facts/sles/processors/count.rb rename to lib/facts/linux/processors/count.rb index 7f76c8bd9..7015945b7 100644 --- a/lib/facts/sles/processors/count.rb +++ b/lib/facts/linux/processors/count.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Processors class Count FACT_NAME = 'processors.count' diff --git a/lib/facts/debian/processors/isa.rb b/lib/facts/linux/processors/isa.rb similarity index 97% rename from lib/facts/debian/processors/isa.rb rename to lib/facts/linux/processors/isa.rb index 9a85a0e5d..374a75e59 100644 --- a/lib/facts/debian/processors/isa.rb +++ b/lib/facts/linux/processors/isa.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Debian + module Linux module Processors class Isa FACT_NAME = 'processors.isa' diff --git a/lib/facts/el/processors/models.rb b/lib/facts/linux/processors/models.rb similarity index 95% rename from lib/facts/el/processors/models.rb rename to lib/facts/linux/processors/models.rb index f3132cc25..4e6bfaa2f 100644 --- a/lib/facts/el/processors/models.rb +++ b/lib/facts/linux/processors/models.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Processors class Models FACT_NAME = 'processors.models' diff --git a/lib/facts/sles/processors/physicalcount.rb b/lib/facts/linux/processors/physicalcount.rb similarity index 96% rename from lib/facts/sles/processors/physicalcount.rb rename to lib/facts/linux/processors/physicalcount.rb index 88c6f832a..41d1ae755 100644 --- a/lib/facts/sles/processors/physicalcount.rb +++ b/lib/facts/linux/processors/physicalcount.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Processors class Physicalcount FACT_NAME = 'processors.physicalcount' @@ -9,7 +9,6 @@ class Physicalcount def call_the_resolver fact_value = Facter::Resolvers::Linux::Processors.resolve(:physical_count) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] end end diff --git a/lib/facts/el/puppet_version.rb b/lib/facts/linux/puppet_version.rb similarity index 95% rename from lib/facts/el/puppet_version.rb rename to lib/facts/linux/puppet_version.rb index f69cccb58..215b186a3 100644 --- a/lib/facts/el/puppet_version.rb +++ b/lib/facts/linux/puppet_version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class PuppetVersion FACT_NAME = 'puppetversion' diff --git a/lib/facts/el/ruby/platform.rb b/lib/facts/linux/ruby/platform.rb similarity index 96% rename from lib/facts/el/ruby/platform.rb rename to lib/facts/linux/ruby/platform.rb index c6f65e3ab..4650547bf 100644 --- a/lib/facts/el/ruby/platform.rb +++ b/lib/facts/linux/ruby/platform.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Ruby class Platform FACT_NAME = 'ruby.platform' diff --git a/lib/facts/el/ruby/sitedir.rb b/lib/facts/linux/ruby/sitedir.rb similarity index 96% rename from lib/facts/el/ruby/sitedir.rb rename to lib/facts/linux/ruby/sitedir.rb index c34decd48..3a1fe8e6a 100644 --- a/lib/facts/el/ruby/sitedir.rb +++ b/lib/facts/linux/ruby/sitedir.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module Ruby class Sitedir FACT_NAME = 'ruby.sitedir' diff --git a/lib/facts/sles/ruby/version.rb b/lib/facts/linux/ruby/version.rb similarity index 96% rename from lib/facts/sles/ruby/version.rb rename to lib/facts/linux/ruby/version.rb index b8b20811c..73104a0e8 100644 --- a/lib/facts/sles/ruby/version.rb +++ b/lib/facts/linux/ruby/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module Ruby class Version FACT_NAME = 'ruby.version' diff --git a/lib/facts/el/ssh.rb b/lib/facts/linux/ssh.rb similarity index 97% rename from lib/facts/el/ssh.rb rename to lib/facts/linux/ssh.rb index 3a796c5dd..37a66b0d1 100644 --- a/lib/facts/el/ssh.rb +++ b/lib/facts/linux/ssh.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class Ssh FACT_NAME = 'ssh' diff --git a/lib/facts/sles/sshalgorithmkey.rb b/lib/facts/linux/sshalgorithmkey.rb similarity index 96% rename from lib/facts/sles/sshalgorithmkey.rb rename to lib/facts/linux/sshalgorithmkey.rb index 03d389f22..d152ab06d 100644 --- a/lib/facts/sles/sshalgorithmkey.rb +++ b/lib/facts/linux/sshalgorithmkey.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux class Sshalgorithmkey FACT_NAME = 'ssh.*key' TYPE = :legacy diff --git a/lib/facts/el/sshfp_algorithm.rb b/lib/facts/linux/sshfp_algorithm.rb similarity index 97% rename from lib/facts/el/sshfp_algorithm.rb rename to lib/facts/linux/sshfp_algorithm.rb index 16f67f547..3d03f6351 100644 --- a/lib/facts/el/sshfp_algorithm.rb +++ b/lib/facts/linux/sshfp_algorithm.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class SshfpAlgorithm FACT_NAME = 'sshfp_.*' TYPE = :legacy diff --git a/lib/facts/sles/system_uptime/days.rb b/lib/facts/linux/system_uptime/days.rb similarity index 96% rename from lib/facts/sles/system_uptime/days.rb rename to lib/facts/linux/system_uptime/days.rb index 7bd6c40ba..b0ccd2316 100644 --- a/lib/facts/sles/system_uptime/days.rb +++ b/lib/facts/linux/system_uptime/days.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module Sles + module Linux module SystemUptime class Days FACT_NAME = 'system_uptime.days' diff --git a/lib/facts/el/system_uptime/hours.rb b/lib/facts/linux/system_uptime/hours.rb similarity index 96% rename from lib/facts/el/system_uptime/hours.rb rename to lib/facts/linux/system_uptime/hours.rb index 4ea7d52ab..6b4ef9f4d 100644 --- a/lib/facts/el/system_uptime/hours.rb +++ b/lib/facts/linux/system_uptime/hours.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module SystemUptime class Hours FACT_NAME = 'system_uptime.hours' diff --git a/lib/facts/el/system_uptime/seconds.rb b/lib/facts/linux/system_uptime/seconds.rb similarity index 96% rename from lib/facts/el/system_uptime/seconds.rb rename to lib/facts/linux/system_uptime/seconds.rb index 07b7001ee..68f945f4f 100644 --- a/lib/facts/el/system_uptime/seconds.rb +++ b/lib/facts/linux/system_uptime/seconds.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module SystemUptime class Seconds FACT_NAME = 'system_uptime.seconds' diff --git a/lib/facts/el/system_uptime/uptime.rb b/lib/facts/linux/system_uptime/uptime.rb similarity index 96% rename from lib/facts/el/system_uptime/uptime.rb rename to lib/facts/linux/system_uptime/uptime.rb index 492c2b95a..c37678874 100644 --- a/lib/facts/el/system_uptime/uptime.rb +++ b/lib/facts/linux/system_uptime/uptime.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux module SystemUptime class Uptime FACT_NAME = 'system_uptime.uptime' diff --git a/lib/facts/el/timezone.rb b/lib/facts/linux/timezone.rb similarity index 94% rename from lib/facts/el/timezone.rb rename to lib/facts/linux/timezone.rb index 9172c6143..ff92a44fe 100644 --- a/lib/facts/el/timezone.rb +++ b/lib/facts/linux/timezone.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Linux class Timezone FACT_NAME = 'timezone' diff --git a/lib/facts/el/os/distro/codename.rb b/lib/facts/rhel/os/distro/codename.rb similarity index 97% rename from lib/facts/el/os/distro/codename.rb rename to lib/facts/rhel/os/distro/codename.rb index f44b29e66..0d462f807 100644 --- a/lib/facts/el/os/distro/codename.rb +++ b/lib/facts/rhel/os/distro/codename.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Rhel module Os module Distro class Codename diff --git a/lib/facts/el/os/distro/description.rb b/lib/facts/rhel/os/distro/description.rb similarity index 97% rename from lib/facts/el/os/distro/description.rb rename to lib/facts/rhel/os/distro/description.rb index 215b64d8b..15ead0358 100644 --- a/lib/facts/el/os/distro/description.rb +++ b/lib/facts/rhel/os/distro/description.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Rhel module Os module Distro class Description diff --git a/lib/facts/el/os/distro/id.rb b/lib/facts/rhel/os/distro/id.rb similarity index 97% rename from lib/facts/el/os/distro/id.rb rename to lib/facts/rhel/os/distro/id.rb index a8e632eb5..08ca64a0f 100644 --- a/lib/facts/el/os/distro/id.rb +++ b/lib/facts/rhel/os/distro/id.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Rhel module Os module Distro class Id diff --git a/lib/facts/el/os/distro/release.rb b/lib/facts/rhel/os/distro/release.rb similarity index 98% rename from lib/facts/el/os/distro/release.rb rename to lib/facts/rhel/os/distro/release.rb index 36c532b20..1f01ac8da 100644 --- a/lib/facts/el/os/distro/release.rb +++ b/lib/facts/rhel/os/distro/release.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Rhel module Os module Distro class Release diff --git a/lib/facts/el/os/family.rb b/lib/facts/rhel/os/family.rb similarity index 95% rename from lib/facts/el/os/family.rb rename to lib/facts/rhel/os/family.rb index be4db38b1..394307775 100644 --- a/lib/facts/el/os/family.rb +++ b/lib/facts/rhel/os/family.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Rhel module Os class Family FACT_NAME = 'os.family' diff --git a/lib/facts/el/os/name.rb b/lib/facts/rhel/os/name.rb similarity index 97% rename from lib/facts/el/os/name.rb rename to lib/facts/rhel/os/name.rb index 85a9a5029..f51eea578 100644 --- a/lib/facts/el/os/name.rb +++ b/lib/facts/rhel/os/name.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Facts - module El + module Rhel module Os class Name FACT_NAME = 'os.name' diff --git a/lib/facts/sles/disks.rb b/lib/facts/sles/disks.rb deleted file mode 100644 index 4ee871f9f..000000000 --- a/lib/facts/sles/disks.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Disks - FACT_NAME = 'disks' - - def call_the_resolver - disks = Facter::Resolvers::Linux::Disk.resolve(:disks) - - Facter::ResolvedFact.new(FACT_NAME, disks) - end - end - end -end diff --git a/lib/facts/sles/dmi/bios/release_date.rb b/lib/facts/sles/dmi/bios/release_date.rb deleted file mode 100644 index d4f636e64..000000000 --- a/lib/facts/sles/dmi/bios/release_date.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Dmi - module Bios - class ReleaseDate - FACT_NAME = 'dmi.bios.release_date' - ALIASES = 'bios_release_date' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:bios_date) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/dmi/bios/version.rb b/lib/facts/sles/dmi/bios/version.rb deleted file mode 100644 index e50e5a2b6..000000000 --- a/lib/facts/sles/dmi/bios/version.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Dmi - module Bios - class Version - FACT_NAME = 'dmi.bios.version' - ALIASES = 'bios_version' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:bios_version) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/dmi/board/serial_number.rb b/lib/facts/sles/dmi/board/serial_number.rb deleted file mode 100644 index ccca987f1..000000000 --- a/lib/facts/sles/dmi/board/serial_number.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Dmi - module Board - class SerialNumber - FACT_NAME = 'dmi.board.serial_number' - ALIASES = 'boardserialnumber' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:board_serial) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/dmi/manufacturer.rb b/lib/facts/sles/dmi/manufacturer.rb deleted file mode 100644 index e83383c11..000000000 --- a/lib/facts/sles/dmi/manufacturer.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Dmi - class Manufacturer - FACT_NAME = 'dmi.manufacturer' - ALIASES = 'manufacturer' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:sys_vendor) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/dmi/product/name.rb b/lib/facts/sles/dmi/product/name.rb deleted file mode 100644 index 015b9dce7..000000000 --- a/lib/facts/sles/dmi/product/name.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Dmi - module Product - class Name - FACT_NAME = 'dmi.product.name' - ALIASES = 'productname' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::DmiBios.resolve(:product_name) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/facterversion.rb b/lib/facts/sles/facterversion.rb deleted file mode 100644 index b60ecff7b..000000000 --- a/lib/facts/sles/facterversion.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Facterversion - FACT_NAME = 'facterversion' - - def call_the_resolver - fact_value = Facter::Resolvers::Facterversion.resolve(:facterversion) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/filesystems.rb b/lib/facts/sles/filesystems.rb deleted file mode 100644 index 1a1b4317b..000000000 --- a/lib/facts/sles/filesystems.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Filesystems - FACT_NAME = 'filesystems' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Filesystems.resolve(:systems) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/fips_enabled.rb b/lib/facts/sles/fips_enabled.rb deleted file mode 100644 index fec791c06..000000000 --- a/lib/facts/sles/fips_enabled.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class FipsEnabled - FACT_NAME = 'fips_enabled' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::FipsEnabled.resolve(:fips_enabled) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/identity/privileged.rb b/lib/facts/sles/identity/privileged.rb deleted file mode 100644 index b24d6cad7..000000000 --- a/lib/facts/sles/identity/privileged.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Identity - class Privileged - FACT_NAME = 'identity.privileged' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:privileged) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/sles/identity/uid.rb b/lib/facts/sles/identity/uid.rb deleted file mode 100644 index e2352a46f..000000000 --- a/lib/facts/sles/identity/uid.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Identity - class Uid - FACT_NAME = 'identity.uid' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:uid) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/sles/identity/user.rb b/lib/facts/sles/identity/user.rb deleted file mode 100644 index be155e32e..000000000 --- a/lib/facts/sles/identity/user.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Identity - class User - FACT_NAME = 'identity.user' - ALIASES = 'id' - - def call_the_resolver - fact_value = Facter::Resolvers::PosxIdentity.resolve(:user) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/interfaces.rb b/lib/facts/sles/interfaces.rb deleted file mode 100644 index 8fca9e8d2..000000000 --- a/lib/facts/sles/interfaces.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Interfaces - FACT_NAME = 'interfaces' - - def call_the_resolver - fact_value = Facter::Resolvers::NetworkingLinux.resolve(:interfaces) - - Facter::ResolvedFact.new(FACT_NAME, fact_value && !fact_value.empty? ? fact_value.keys.sort.join(',') : nil, - :legacy) - end - end - end -end diff --git a/lib/facts/sles/kernel.rb b/lib/facts/sles/kernel.rb deleted file mode 100644 index 68b4a7ebd..000000000 --- a/lib/facts/sles/kernel.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Kernel - FACT_NAME = 'kernel' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:kernelname) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/kernelmajversion.rb b/lib/facts/sles/kernelmajversion.rb deleted file mode 100644 index 3135e4918..000000000 --- a/lib/facts/sles/kernelmajversion.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Kernelmajversion - FACT_NAME = 'kernelmajversion' - - def call_the_resolver - version_numbers = Facter::Resolvers::Uname.resolve(:kernelrelease).split('-').first.split('.') - fact_value = version_numbers[0..1].join('.') - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/kernelrelease.rb b/lib/facts/sles/kernelrelease.rb deleted file mode 100644 index 69c641c96..000000000 --- a/lib/facts/sles/kernelrelease.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Kernelrelease - FACT_NAME = 'kernelrelease' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:kernelrelease) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/kernelversion.rb b/lib/facts/sles/kernelversion.rb deleted file mode 100644 index be5435550..000000000 --- a/lib/facts/sles/kernelversion.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Kernelversion - FACT_NAME = 'kernelversion' - - def call_the_resolver - version_numbers = Facter::Resolvers::Uname.resolve(:kernelrelease).split('-').first.split('.') - fact_value = version_numbers[0..2].join('.') - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/load_averages.rb b/lib/facts/sles/load_averages.rb deleted file mode 100644 index dd4ee89a7..000000000 --- a/lib/facts/sles/load_averages.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class LoadAverages - FACT_NAME = 'load_averages' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::LoadAverages.resolve(:load_averages) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/memory/swap/available.rb b/lib/facts/sles/memory/swap/available.rb deleted file mode 100644 index 3d3654c5c..000000000 --- a/lib/facts/sles/memory/swap/available.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module Swap - class Available - FACT_NAME = 'memory.swap.available' - ALIASES = 'swapfree' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/memory/swap/available_bytes.rb b/lib/facts/sles/memory/swap/available_bytes.rb deleted file mode 100644 index 6ca63b917..000000000 --- a/lib/facts/sles/memory/swap/available_bytes.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module Swap - class AvailableBytes - FACT_NAME = 'memory.swap.available_bytes' - ALIASES = 'swapfree_mb' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/memory/swap/total.rb b/lib/facts/sles/memory/swap/total.rb deleted file mode 100644 index a14bbcaa6..000000000 --- a/lib/facts/sles/memory/swap/total.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module Swap - class Total - FACT_NAME = 'memory.swap.total' - ALIASES = 'swapsize' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/memory/swap/total_bytes.rb b/lib/facts/sles/memory/swap/total_bytes.rb deleted file mode 100644 index 3971c0ffd..000000000 --- a/lib/facts/sles/memory/swap/total_bytes.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module Swap - class TotalBytes - FACT_NAME = 'memory.swap.total_bytes' - ALIASES = 'swapsize_mb' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/memory/swap/used.rb b/lib/facts/sles/memory/swap/used.rb deleted file mode 100644 index d9ed2753a..000000000 --- a/lib/facts/sles/memory/swap/used.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module Swap - class Used - FACT_NAME = 'memory.swap.used' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_used_bytes) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/sles/memory/swap/used_bytes.rb b/lib/facts/sles/memory/swap/used_bytes.rb deleted file mode 100644 index da0b784b6..000000000 --- a/lib/facts/sles/memory/swap/used_bytes.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module Swap - class UsedBytes - FACT_NAME = 'memory.swap.used_bytes' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_used_bytes) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/sles/memory/system/available.rb b/lib/facts/sles/memory/system/available.rb deleted file mode 100644 index 00539fbcd..000000000 --- a/lib/facts/sles/memory/system/available.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module System - class Available - FACT_NAME = 'memory.system.available' - ALIASES = 'memoryfree' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:memfree) - fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/memory/system/available_bytes.rb b/lib/facts/sles/memory/system/available_bytes.rb deleted file mode 100644 index a8cb08d9c..000000000 --- a/lib/facts/sles/memory/system/available_bytes.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module System - class AvailableBytes - FACT_NAME = 'memory.system.available_bytes' - ALIASES = 'memoryfree_mb' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:memfree) - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/memory/system/used_bytes.rb b/lib/facts/sles/memory/system/used_bytes.rb deleted file mode 100644 index 3d1e17f06..000000000 --- a/lib/facts/sles/memory/system/used_bytes.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Memory - module System - class UsedBytes - FACT_NAME = 'memory.system.used_bytes' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Memory.resolve(:used_bytes) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end - end -end diff --git a/lib/facts/sles/networking/domain.rb b/lib/facts/sles/networking/domain.rb deleted file mode 100644 index d91ce3955..000000000 --- a/lib/facts/sles/networking/domain.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Networking - class Domain - FACT_NAME = 'networking.domain' - ALIASES = '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 - end - end -end diff --git a/lib/facts/sles/networking/fqdn.rb b/lib/facts/sles/networking/fqdn.rb deleted file mode 100644 index 529a85e12..000000000 --- a/lib/facts/sles/networking/fqdn.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Networking - class Fqdn - FACT_NAME = 'networking.fqdn' - ALIASES = '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 - end - end -end diff --git a/lib/facts/sles/networking/hostname.rb b/lib/facts/sles/networking/hostname.rb deleted file mode 100644 index 5f008505e..000000000 --- a/lib/facts/sles/networking/hostname.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Networking - class Hostname - FACT_NAME = 'networking.hostname' - ALIASES = '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 - end - end -end diff --git a/lib/facts/sles/os/hardware.rb b/lib/facts/sles/os/hardware.rb deleted file mode 100644 index db67c0270..000000000 --- a/lib/facts/sles/os/hardware.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Os - class Hardware - FACT_NAME = 'os.hardware' - ALIASES = 'hardwaremodel' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:machine) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/os/selinux/config_mode.rb b/lib/facts/sles/os/selinux/config_mode.rb deleted file mode 100644 index 9f01db9df..000000000 --- a/lib/facts/sles/os/selinux/config_mode.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Os - module Selinux - class ConfigMode - FACT_NAME = 'os.selinux.config_mode' - ALIASES = 'selinux_config_mode' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:config_mode) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/os/selinux/current_mode.rb b/lib/facts/sles/os/selinux/current_mode.rb deleted file mode 100644 index a83da795b..000000000 --- a/lib/facts/sles/os/selinux/current_mode.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Os - module Selinux - class CurrentMode - FACT_NAME = 'os.selinux.current_mode' - ALIASES = 'selinux_current_mode' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:current_mode) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/os/selinux/enabled.rb b/lib/facts/sles/os/selinux/enabled.rb deleted file mode 100644 index 49792f141..000000000 --- a/lib/facts/sles/os/selinux/enabled.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Os - module Selinux - class Enabled - FACT_NAME = 'os.selinux.enabled' - ALIASES = 'selinux' - - def call_the_resolver - selinux = Facter::Resolvers::SELinux.resolve(:enabled) - - [Facter::ResolvedFact.new(FACT_NAME, selinux), - Facter::ResolvedFact.new(ALIASES, selinux, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/os/selinux/enforced.rb b/lib/facts/sles/os/selinux/enforced.rb deleted file mode 100644 index d7c01c4aa..000000000 --- a/lib/facts/sles/os/selinux/enforced.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Os - module Selinux - class Enforced - FACT_NAME = 'os.selinux.enforced' - ALIASES = 'selinux_enforced' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:enforced) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/os/selinux/policy_version.rb b/lib/facts/sles/os/selinux/policy_version.rb deleted file mode 100644 index e6a93482d..000000000 --- a/lib/facts/sles/os/selinux/policy_version.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Os - module Selinux - class PolicyVersion - FACT_NAME = 'os.selinux.policy_version' - ALIASES = 'selinux_policyversion' - - def call_the_resolver - fact_value = Facter::Resolvers::SELinux.resolve(:policy_version) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), - Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end - end -end diff --git a/lib/facts/sles/path.rb b/lib/facts/sles/path.rb deleted file mode 100644 index ed7329902..000000000 --- a/lib/facts/sles/path.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Path - FACT_NAME = 'path' - - def call_the_resolver - fact_value = Facter::Resolvers::Path.resolve(:path) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/processor.rb b/lib/facts/sles/processor.rb deleted file mode 100644 index 31f2329ee..000000000 --- a/lib/facts/sles/processor.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Processor - FACT_NAME = 'processor.*' - TYPE = :legacy - - def call_the_resolver - arr = [] - processors = Facter::Resolvers::Linux::Processors.resolve(:models) - - (0...processors.count).each do |iterator| - arr << Facter::ResolvedFact.new("processor#{iterator}", processors[iterator], :legacy) - end - arr - end - end - end -end diff --git a/lib/facts/sles/processors/isa.rb b/lib/facts/sles/processors/isa.rb deleted file mode 100644 index 6f3537a62..000000000 --- a/lib/facts/sles/processors/isa.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Processors - class Isa - FACT_NAME = 'processors.isa' - ALIASES = 'hardwareisa' - - def call_the_resolver - fact_value = Facter::Resolvers::Uname.resolve(:processor) - fact_value = get_isa(fact_value) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - - private - - def get_isa(fact_value) - value_split = fact_value.split('.') - - value_split.last - end - end - end - end -end diff --git a/lib/facts/sles/processors/models.rb b/lib/facts/sles/processors/models.rb deleted file mode 100644 index 547ab6fb0..000000000 --- a/lib/facts/sles/processors/models.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Processors - class Models - FACT_NAME = 'processors.models' - - def call_the_resolver - fact_value = Facter::Resolvers::Linux::Processors.resolve(:models) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end - end -end diff --git a/lib/facts/sles/puppet_version.rb b/lib/facts/sles/puppet_version.rb deleted file mode 100644 index f3c4bd354..000000000 --- a/lib/facts/sles/puppet_version.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class PuppetVersion - FACT_NAME = 'puppetversion' - - def call_the_resolver - fact_value = Facter::Resolvers::PuppetVersionResolver.resolve(:puppetversion) - - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/sles/ruby/platform.rb b/lib/facts/sles/ruby/platform.rb deleted file mode 100644 index 0eb9ef3bc..000000000 --- a/lib/facts/sles/ruby/platform.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Ruby - class Platform - FACT_NAME = 'ruby.platform' - ALIASES = 'rubyplatform' - - def call_the_resolver - fact_value = Facter::Resolvers::Ruby.resolve(:platform) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/ruby/sitedir.rb b/lib/facts/sles/ruby/sitedir.rb deleted file mode 100644 index 1d077da7b..000000000 --- a/lib/facts/sles/ruby/sitedir.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module Ruby - class Sitedir - FACT_NAME = 'ruby.sitedir' - ALIASES = 'rubysitedir' - - def call_the_resolver - fact_value = Facter::Resolvers::Ruby.resolve(:sitedir) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/ssh.rb b/lib/facts/sles/ssh.rb deleted file mode 100644 index e6073393b..000000000 --- a/lib/facts/sles/ssh.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Ssh - FACT_NAME = 'ssh' - - def call_the_resolver - result = Facter::Resolvers::SshResolver.resolve(:ssh) - ssh_facts = {} - result.each { |ssh| ssh_facts.merge!(create_ssh_fact(ssh)) } - Facter::ResolvedFact.new(FACT_NAME, ssh_facts) - end - - private - - def create_ssh_fact(ssh) - { ssh.name.to_sym => - { fingerprints: { sha1: ssh.fingerprint.sha1, - sha256: ssh.fingerprint.sha256 }, - key: ssh.key, - type: ssh.type } } - end - end - end -end diff --git a/lib/facts/sles/sshfp_algorithm.rb b/lib/facts/sles/sshfp_algorithm.rb deleted file mode 100644 index 1a7193d2d..000000000 --- a/lib/facts/sles/sshfp_algorithm.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class SshfpAlgorithm - FACT_NAME = 'sshfp_.*' - TYPE = :legacy - - def call_the_resolver - facts = [] - result = Facter::Resolvers::SshResolver.resolve(:ssh) - result.each do |ssh| - facts << Facter::ResolvedFact.new("sshfp_#{ssh.name.to_sym}", - "#{ssh.fingerprint.sha1} \n #{ssh.fingerprint.sha256}", :legacy) - end - facts - end - end - end -end diff --git a/lib/facts/sles/system_uptime/hours.rb b/lib/facts/sles/system_uptime/hours.rb deleted file mode 100644 index cb7cc5c50..000000000 --- a/lib/facts/sles/system_uptime/hours.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module SystemUptime - class Hours - FACT_NAME = 'system_uptime.hours' - ALIASES = 'uptime_hours' - - def call_the_resolver - fact_value = Facter::Resolvers::Uptime.resolve(:hours) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/system_uptime/seconds.rb b/lib/facts/sles/system_uptime/seconds.rb deleted file mode 100644 index 53cd9a46e..000000000 --- a/lib/facts/sles/system_uptime/seconds.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module SystemUptime - class Seconds - FACT_NAME = 'system_uptime.seconds' - ALIASES = 'uptime_seconds' - - def call_the_resolver - fact_value = Facter::Resolvers::Uptime.resolve(:seconds) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/system_uptime/uptime.rb b/lib/facts/sles/system_uptime/uptime.rb deleted file mode 100644 index 250dcb5ab..000000000 --- a/lib/facts/sles/system_uptime/uptime.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - module SystemUptime - class Uptime - FACT_NAME = 'system_uptime.uptime' - ALIASES = 'uptime' - - def call_the_resolver - fact_value = Facter::Resolvers::Uptime.resolve(:uptime) - - [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)] - end - end - end - end -end diff --git a/lib/facts/sles/timezone.rb b/lib/facts/sles/timezone.rb deleted file mode 100644 index 823450f99..000000000 --- a/lib/facts/sles/timezone.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Facts - module Sles - class Timezone - FACT_NAME = 'timezone' - - def call_the_resolver - fact_value = Facter::Resolvers::Timezone.resolve(:timezone) - Facter::ResolvedFact.new(FACT_NAME, fact_value) - end - end - end -end diff --git a/lib/facts/ubuntu/os/distro/release.rb b/lib/facts/ubuntu/os/distro/release.rb new file mode 100644 index 000000000..f6285811f --- /dev/null +++ b/lib/facts/ubuntu/os/distro/release.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +module Facts + module Ubuntu + module Os + module Distro + class Release + FACT_NAME = 'os.distro.release' + + def call_the_resolver + fact_value = determine_release_for_os + + Facter::ResolvedFact.new(FACT_NAME, fact_value) + end + + private + + def determine_release_for_os + release = Facter::Resolvers::OsRelease.resolve(:version_id) + return unless release + + { + 'full' => release, + 'major' => release + } + end + end + end + end + end +end diff --git a/lib/facts/ubuntu/os/release.rb b/lib/facts/ubuntu/os/release.rb new file mode 100644 index 000000000..1ed6a471d --- /dev/null +++ b/lib/facts/ubuntu/os/release.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +module Facts + module Ubuntu + module Os + class Release + FACT_NAME = 'os.release' + ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze + + def call_the_resolver + version = Facter::Resolvers::OsRelease.resolve(:version_id) + + [Facter::ResolvedFact.new(FACT_NAME, full: version, major: version), + Facter::ResolvedFact.new(ALIASES.first, version, :legacy), + Facter::ResolvedFact.new(ALIASES.last, version, :legacy)] + end + end + end + end +end diff --git a/os_hierarchy.json b/os_hierarchy.json index 5fa482fc2..c28010203 100644 --- a/os_hierarchy.json +++ b/os_hierarchy.json @@ -9,11 +9,10 @@ ] }, { - "El": [ + "Rhel": [ "Fedora", "Amzn", - "Centos", - "Rhel" + "Centos" ] }, { diff --git a/spec/facter/cache_manager_spec.rb b/spec/facter/cache_manager_spec.rb index df1d3386b..eb45cb4f4 100644 --- a/spec/facter/cache_manager_spec.rb +++ b/spec/facter/cache_manager_spec.rb @@ -5,7 +5,7 @@ let(:cache_dir) { '/etc/facter/cache' } let(:searched_core_fact) do - instance_spy(Facter::SearchedFact, name: 'os', fact_class: instance_spy(Facts::Debian::Os::Name), + instance_spy(Facter::SearchedFact, name: 'os', fact_class: instance_spy(Facts::Linux::Os::Name), filter_tokens: [], user_query: '', type: :core) end let(:searched_custom_fact) do diff --git a/spec/facter/facts/debian/augeas/version_spec.rb b/spec/facter/facts/debian/augeas/version_spec.rb deleted file mode 100644 index 70aa1f39f..000000000 --- a/spec/facter/facts/debian/augeas/version_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Augeas::Version do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Augeas::Version.new } - - let(:version) { '1.12.0' } - - before do - allow(Facter::Resolvers::Augeas).to \ - receive(:resolve).with(:augeas_version).and_return(version) - end - - it 'calls Facter::Resolvers::Augeas' do - fact.call_the_resolver - expect(Facter::Resolvers::Augeas).to have_received(:resolve).with(:augeas_version) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'augeas.version', value: version), - an_object_having_attributes(name: 'augeasversion', value: version, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/disks_spec.rb b/spec/facter/facts/debian/disks_spec.rb deleted file mode 100644 index 3ccd92788..000000000 --- a/spec/facter/facts/debian/disks_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Disks do - subject(:fact) { Facts::Debian::Disks.new } - - let(:disk) do - { - 'disks' => { - 'sda' => { - 'model' => 'Virtual disk', - 'size' => '20.00 GiB', - 'size_bytes' => 21_474_836_480, - 'vendor' => 'VMware' - } - } - } - end - - describe '#call_the_resolver' do - before do - allow(Facter::Resolvers::Linux::Disk).to receive(:resolve).with(:disks).and_return(disk) - end - - it 'calls Facter::Resolvers::Linux::Disk' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Disk).to have_received(:resolve).with(:disks) - end - - it 'returns resolved fact with name disk and value' do - expect(fact.call_the_resolver) - .to be_an_instance_of(Facter::ResolvedFact) - .and have_attributes(name: 'disks', value: disk) - end - end -end diff --git a/spec/facter/facts/debian/dmi/product/serial_number_spec.rb b/spec/facter/facts/debian/dmi/product/serial_number_spec.rb deleted file mode 100644 index acba78321..000000000 --- a/spec/facter/facts/debian/dmi/product/serial_number_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Dmi::Product::SerialNumber do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Product::SerialNumber.new } - - let(:serial_number) { 'VMware-42 1a a9 29 31 8f fa e9-7d 69 2e 23 21 b0 0c 45' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:product_serial).and_return(serial_number) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:product_serial) - end - - it 'returns product serial number fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'dmi.product.serial_number', value: serial_number) - end - end -end diff --git a/spec/facter/facts/debian/dmi/product/uuid_spec.rb b/spec/facter/facts/debian/dmi/product/uuid_spec.rb deleted file mode 100644 index 7fe761761..000000000 --- a/spec/facter/facts/debian/dmi/product/uuid_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Dmi::Product::Uuid do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Product::Uuid.new } - - let(:product_uuid) { '421aa929-318f-fae9-7d69-2e2321b00c45' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:product_uuid).and_return(product_uuid) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:product_uuid) - end - - it 'returns product uuid fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'dmi.product.uuid', value: product_uuid) - end - end -end diff --git a/spec/facter/facts/debian/facterversion_spec.rb b/spec/facter/facts/debian/facterversion_spec.rb deleted file mode 100644 index e31a1a7eb..000000000 --- a/spec/facter/facts/debian/facterversion_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Facterversion do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Facterversion.new } - - let(:value) { '4.0.3' } - - before do - allow(Facter::Resolvers::Facterversion).to receive(:resolve).with(:facterversion).and_return(value) - end - - it 'calls Facter::Resolvers::Facterversion' do - fact.call_the_resolver - expect(Facter::Resolvers::Facterversion).to have_received(:resolve).with(:facterversion) - end - - it 'returns facterversion fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'facterversion', value: value) - end - end -end diff --git a/spec/facter/facts/debian/identity/gid_spec.rb b/spec/facter/facts/debian/identity/gid_spec.rb deleted file mode 100644 index 45777e488..000000000 --- a/spec/facter/facts/debian/identity/gid_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Identity::Gid do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Identity::Gid.new } - - let(:value) { '20' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:gid).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:gid) - end - - it 'returns identity gid fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'identity.gid', value: value) - end - end -end diff --git a/spec/facter/facts/debian/identity/group_spec.rb b/spec/facter/facts/debian/identity/group_spec.rb deleted file mode 100644 index 94bfa2fae..000000000 --- a/spec/facter/facts/debian/identity/group_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Identity::Group do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Identity::Group.new } - - let(:value) { 'staff' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:group).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:group) - end - - it 'returns identity group fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'identity.group', value: value), - an_object_having_attributes(name: 'gid', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/identity/privileged_spec.rb b/spec/facter/facts/debian/identity/privileged_spec.rb deleted file mode 100644 index 5b378ba55..000000000 --- a/spec/facter/facts/debian/identity/privileged_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Identity::Privileged do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Identity::Privileged.new } - - let(:value) { 'false' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:privileged).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:privileged) - end - - it 'returns identity privileged fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'identity.privileged', value: value) - end - end -end diff --git a/spec/facter/facts/debian/identity/uid_spec.rb b/spec/facter/facts/debian/identity/uid_spec.rb deleted file mode 100644 index 75085ceb1..000000000 --- a/spec/facter/facts/debian/identity/uid_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Identity::Uid do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Identity::Uid.new } - - let(:value) { '501' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:uid).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:uid) - end - - it 'returns identity uid fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'identity.uid', value: value) - end - end -end diff --git a/spec/facter/facts/debian/identity/user_spec.rb b/spec/facter/facts/debian/identity/user_spec.rb deleted file mode 100644 index e9b64ea77..000000000 --- a/spec/facter/facts/debian/identity/user_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Identity::User do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Identity::User.new } - - let(:value) { 'testUser' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:user).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:user) - end - - it 'returns id and identity user fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'identity.user', value: value), - an_object_having_attributes(name: 'id', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/interfaces_spec.rb b/spec/facter/facts/debian/interfaces_spec.rb deleted file mode 100644 index 7c58515de..000000000 --- a/spec/facter/facts/debian/interfaces_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Interfaces do - subject(:fact) { Facts::Debian::Interfaces.new } - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:interfaces).and_return(interfaces) - end - - describe '#call_the_resolver' do - let(:interfaces) { { 'eth0' => { ip6: 'fe80::99bf:da20:ad3:9bfe' }, 'en1' => { ip6: 'fe80::99bf:da20:ad3:9bfe' } } } - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:interfaces) - end - - it 'returns interfaces names' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'interfaces', value: interfaces.keys.sort.join(','), type: :legacy) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:interfaces) { nil } - - it 'returns nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'interfaces', value: interfaces, type: :legacy) - end - end -end diff --git a/spec/facter/facts/debian/kernel_spec.rb b/spec/facter/facts/debian/kernel_spec.rb deleted file mode 100644 index 45532687e..000000000 --- a/spec/facter/facts/debian/kernel_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Kernel do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Kernel.new } - - let(:value) { 'Linux' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelname).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:kernelname) - end - - it 'returns kernel fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'kernel', value: value) - end - end -end diff --git a/spec/facter/facts/debian/kernelmajversion_spec.rb b/spec/facter/facts/debian/kernelmajversion_spec.rb deleted file mode 100644 index 51f04f9f5..000000000 --- a/spec/facter/facts/debian/kernelmajversion_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Kernelmajversion do - subject(:fact) { Facts::Debian::Kernelmajversion.new } - - let(:value) { '4.15' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelrelease).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:kernelrelease) - end - - shared_examples 'kernelmajversion fact expectation' do - it 'returns the correct kernelmajversion fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'kernelmajversion', value: value) - end - end - - describe '#call_the_resolver' do - context 'when full version is separated by . delimeter' do - let(:value) { '4.15' } - - include_examples 'kernelmajversion fact expectation' - end - - context 'when full version does not have a . delimeter' do - let(:value) { '4test' } - - include_examples 'kernelmajversion fact expectation' - end - end -end diff --git a/spec/facter/facts/debian/load_averages_spec.rb b/spec/facter/facts/debian/load_averages_spec.rb deleted file mode 100644 index 63673a666..000000000 --- a/spec/facter/facts/debian/load_averages_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::LoadAverages do - subject(:fact) { Facts::Debian::LoadAverages.new } - - let(:averages) do - { - '15m' => 0.0, - '10m' => 0.0, - '5m' => 0.0 - } - end - - describe '#call_the_resolver' do - before do - allow(Facter::Resolvers::Linux::LoadAverages).to receive(:resolve).with(:load_averages).and_return(averages) - end - - it 'calls Facter::Resolvers::Linux::LoadAverages' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::LoadAverages).to have_received(:resolve).with(:load_averages) - end - - it 'returns resolved fact with name disk and value' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact) - .and have_attributes(name: 'load_averages', value: averages) - end - end -end diff --git a/spec/facter/facts/debian/mountpoints_spec.rb b/spec/facter/facts/debian/mountpoints_spec.rb deleted file mode 100644 index 53d543baf..000000000 --- a/spec/facter/facts/debian/mountpoints_spec.rb +++ /dev/null @@ -1,60 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Mountpoints do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Mountpoints.new } - - context 'when resolver returns hash' do - let(:resolver_output) do - [{ available: '63.31 GiB', - available_bytes: 67_979_685_888, - capacity: '84.64%', - device: '/dev/nvme0n1p2', - filesystem: 'ext4', - options: %w[rw noatime], - path: '/', - size: '434.42 GiB', - size_bytes: 466_449_743_872, - used: '348.97 GiB', - used_bytes: 374_704_357_376 }] - end - let(:parsed_fact) do - { '/' => { 'available' => '63.31 GiB', - 'available_bytes' => 67_979_685_888, - 'capacity' => '84.64%', - 'device' => '/dev/nvme0n1p2', - 'filesystem' => 'ext4', - 'options' => %w[rw noatime], - 'size' => '434.42 GiB', - 'size_bytes' => 466_449_743_872, - 'used' => '348.97 GiB', - 'used_bytes' => 374_704_357_376 } } - end - - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints).and_return(resolver_output) - end - - it 'calls Facter::Resolvers::Linux::Mountpoints' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Mountpoints).to have_received(:resolve).with(:mountpoints) - end - - it 'returns mountpoints information' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'mountpoints', value: parsed_fact) - end - end - - context 'when resolver returns nil' do - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints).and_return(nil) - end - - it 'returns mountpoints information' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'mountpoints', value: nil) - end - end - end -end diff --git a/spec/facter/facts/debian/networking/domain_spec.rb b/spec/facter/facts/debian/networking/domain_spec.rb deleted file mode 100644 index 40904b56f..000000000 --- a/spec/facter/facts/debian/networking/domain_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Networking::Domain do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Networking::Domain.new } - - let(:value) { 'domain' } - - before do - allow(Facter::Resolvers::Hostname).to receive(:resolve).with(:domain).and_return(value) - end - - it 'calls Facter::Resolvers::Hostname' do - fact.call_the_resolver - expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:domain) - end - - it 'returns domain fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'networking.domain', value: value), - an_object_having_attributes(name: 'domain', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/networking/fqdn_spec.rb b/spec/facter/facts/debian/networking/fqdn_spec.rb deleted file mode 100644 index b8d96b868..000000000 --- a/spec/facter/facts/debian/networking/fqdn_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Networking::Fqdn do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Networking::Fqdn.new } - - let(:value) { 'host.domain' } - - before do - allow(Facter::Resolvers::Hostname).to receive(:resolve).with(:fqdn).and_return(value) - end - - it 'calls Facter::Resolvers::Hostname' do - fact.call_the_resolver - expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:fqdn) - end - - it 'returns fqdn fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'networking.fqdn', value: value), - an_object_having_attributes(name: 'fqdn', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/networking/hostname_spec.rb b/spec/facter/facts/debian/networking/hostname_spec.rb deleted file mode 100644 index 4b174c1f9..000000000 --- a/spec/facter/facts/debian/networking/hostname_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Networking::Hostname do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Networking::Hostname.new } - - let(:value) { 'host' } - - before do - allow(Facter::Resolvers::Hostname).to receive(:resolve).with(:hostname).and_return(value) - end - - it 'calls Facter::Resolvers::Hostname' do - fact.call_the_resolver - expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:hostname) - end - - it 'returns hostname fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'networking.hostname', value: value), - an_object_having_attributes(name: 'hostname', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/networking/interfaces_spec.rb b/spec/facter/facts/debian/networking/interfaces_spec.rb deleted file mode 100644 index 86d31a300..000000000 --- a/spec/facter/facts/debian/networking/interfaces_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Networking::Interfaces do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Networking::Interfaces.new } - - let(:value) do - { - 'ens160' => { - 'bindings' => [ - { - 'address' => '10.16.116.8', - 'netmask' => '255.255.240.0', - 'network' => '10.16.112.0' - } - ] - } - } - end - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:interfaces).and_return(value) - end - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:interfaces) - end - - it 'returns networking.interfaces fact' do - expect(fact.call_the_resolver) - .to be_an_instance_of(Facter::ResolvedFact) - .and have_attributes(name: 'networking.interfaces', value: value) - end - end -end diff --git a/spec/facter/facts/debian/networking/ip_spec.rb b/spec/facter/facts/debian/networking/ip_spec.rb deleted file mode 100644 index 2f843781c..000000000 --- a/spec/facter/facts/debian/networking/ip_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Networking::Ip do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Networking::Ip.new } - - let(:value) { '10.16.122.163' } - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:ip).and_return(value) - end - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:ip) - end - - it 'returns ipaddress fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array) - .and contain_exactly(an_object_having_attributes(name: 'networking.ip', value: value), - an_object_having_attributes(name: 'ipaddress', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/networking/mac_spec.rb b/spec/facter/facts/debian/networking/mac_spec.rb deleted file mode 100644 index 3588dc7c6..000000000 --- a/spec/facter/facts/debian/networking/mac_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Networking::Mac do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Networking::Mac.new } - - let(:value) { '64:5a:ed:ea:c3:25' } - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:macaddress).and_return(value) - end - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:macaddress) - end - - it 'return macaddress fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'networking.mac', value: value), - an_object_having_attributes(name: 'macaddress', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/networking/primary_spec.rb b/spec/facter/facts/debian/networking/primary_spec.rb deleted file mode 100644 index fd9ef2eef..000000000 --- a/spec/facter/facts/debian/networking/primary_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Networking::Primary do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Networking::Primary.new } - - let(:value) { 'ens160' } - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:primary_interface).and_return(value) - end - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:primary_interface) - end - - it 'returns networking.primary fact' do - expect(fact.call_the_resolver) - .to be_an_instance_of(Facter::ResolvedFact) - .and have_attributes(name: 'networking.primary', value: value) - end - end -end diff --git a/spec/facter/facts/debian/os/distro/release_spec.rb b/spec/facter/facts/debian/os/distro/release_spec.rb index 25dab0e3f..aacd51d42 100644 --- a/spec/facter/facts/debian/os/distro/release_spec.rb +++ b/spec/facter/facts/debian/os/distro/release_spec.rb @@ -4,13 +4,6 @@ describe '#call_the_resolver' do subject(:fact) { Facts::Debian::Os::Distro::Release.new } - shared_examples 'calls Facter::Resolvers::OsRelease with :name' do - it 'calls Facter::Resolvers::OsRelease with :name' do - fact.call_the_resolver - expect(Facter::Resolvers::OsRelease).to have_received(:resolve).with(:name) - end - end - shared_examples 'returns distro release fact' do it 'returns release fact' do expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ @@ -18,78 +11,34 @@ end end - context 'when os is Ubuntu' do - before do - allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:name).and_return(os_name) - allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release_value) - end - - let(:os_name) { 'Ubuntu' } - - context 'when version_id is retrieved successful' do - let(:os_release_value) { '18.04' } - let(:fact_value) { { 'full' => '18.04', 'major' => '18.04' } } - - it_behaves_like 'calls Facter::Resolvers::OsRelease with :name' - - it 'calls Facter::Resolvers::OsRelease with :version_id' do - fact.call_the_resolver - expect(Facter::Resolvers::OsRelease).to have_received(:resolve).with(:version_id) - end - - it_behaves_like 'returns distro release fact' - end - - context 'when version_id could not be retrieved' do - let(:os_release_value) { nil } - let(:fact_value) { nil } - - it_behaves_like 'returns distro release fact' - end - - context 'when version has no minor' do - let(:os_release_value) { 'experimental_release' } - let(:fact_value) { { 'full' => 'experimental_release', 'major' => 'experimental_release' } } - - it_behaves_like 'returns distro release fact' - end + before do + allow(Facter::Resolvers::DebianVersion).to receive(:resolve).with(:version).and_return(os_release_value) end - context 'when os is Debian' do - let(:os_name) { 'Debian' } + context 'when version_id is retrieved successfully' do + let(:os_release_value) { '10.02' } + let(:fact_value) { { 'full' => '10.02', 'major' => '10', 'minor' => '2' } } - before do - allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:name).and_return(os_name) - allow(Facter::Resolvers::DebianVersion).to receive(:resolve).with(:version).and_return(os_release_value) + it 'calls Facter::Resolvers::DebianVersion' do + fact.call_the_resolver + expect(Facter::Resolvers::DebianVersion).to have_received(:resolve).with(:version) end - context 'when version_id is retrieved successfully' do - let(:os_release_value) { '10.02' } - let(:fact_value) { { 'full' => '10.02', 'major' => '10', 'minor' => '2' } } - - it_behaves_like 'calls Facter::Resolvers::OsRelease with :name' - - it 'calls Facter::Resolvers::DebianVersion' do - fact.call_the_resolver - expect(Facter::Resolvers::DebianVersion).to have_received(:resolve).with(:version) - end - - it_behaves_like 'returns distro release fact' - end + it_behaves_like 'returns distro release fact' + end - context 'when version_id could not be retrieve' do - let(:os_release_value) { nil } - let(:fact_value) { nil } + context 'when version_id could not be retrieve' do + let(:os_release_value) { nil } + let(:fact_value) { nil } - it_behaves_like 'returns distro release fact' - end + it_behaves_like 'returns distro release fact' + end - context 'when version has no minor' do - let(:os_release_value) { 'bullseye/sid' } - let(:fact_value) { { 'full' => 'bullseye/sid', 'major' => 'bullseye/sid' } } + context 'when version has no minor' do + let(:os_release_value) { 'bullseye/sid' } + let(:fact_value) { { 'full' => 'bullseye/sid', 'major' => 'bullseye/sid' } } - it_behaves_like 'returns distro release fact' - end + it_behaves_like 'returns distro release fact' end end end diff --git a/spec/facter/facts/debian/os/distro/specification_spec.rb b/spec/facter/facts/debian/os/distro/specification_spec.rb deleted file mode 100644 index 437ebefbb..000000000 --- a/spec/facter/facts/debian/os/distro/specification_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Os::Distro::Specification do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Distro::Specification.new } - - let(:value) { ':core-4.1-amd64:core-4.1-noarch:cxx-4.1-amd64' } - - before do - allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:lsb_version).and_return(value) - end - - it 'calls Facter::Resolvers::LsbRelease' do - fact.call_the_resolver - expect(Facter::Resolvers::LsbRelease).to have_received(:resolve).with(:lsb_version) - end - - it 'returns release fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.distro.specification', value: value), - an_object_having_attributes(name: 'lsbrelease', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/os/release_spec.rb b/spec/facter/facts/debian/os/release_spec.rb index a1f17e546..b8f4cc1fe 100644 --- a/spec/facter/facts/debian/os/release_spec.rb +++ b/spec/facter/facts/debian/os/release_spec.rb @@ -4,13 +4,6 @@ describe '#call_the_resolver' do subject(:fact) { Facts::Debian::Os::Release.new } - shared_examples 'calls Facter::Resolvers::OsRelease with :name' do - it 'calls Facter::Resolvers::OsRelease with :name' do - fact.call_the_resolver - expect(Facter::Resolvers::OsRelease).to have_received(:resolve).with(:name) - end - end - shared_examples 'returns os release fact' do it 'returns os release fact' do expect(fact.call_the_resolver).to match_array \ @@ -31,78 +24,34 @@ end end - context 'when os is Ubuntu' do - before do - allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:name).and_return(os_name) - allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release_value) - end - - let(:os_name) { 'Ubuntu' } - - context 'when version_id is retrieved successful' do - let(:os_release_value) { '18.04' } - let(:fact_value) { { 'full' => '18.04', 'major' => '18.04' } } - - it_behaves_like 'calls Facter::Resolvers::OsRelease with :name' - - it 'calls Facter::Resolvers::OsRelease with :version_id' do - fact.call_the_resolver - expect(Facter::Resolvers::OsRelease).to have_received(:resolve).with(:version_id) - end - - it_behaves_like 'returns os release fact' - end - - context 'when version has no minor' do - let(:os_release_value) { 'bullseye/sid' } - let(:fact_value) { { 'full' => 'bullseye/sid', 'major' => 'bullseye/sid' } } - - it_behaves_like 'returns os release fact' - end - - context 'when version_id could not be retrieve' do - let(:os_release_value) { nil } - let(:fact_value) { nil } - - it_behaves_like 'returns os release fact as nil' - end + before do + allow(Facter::Resolvers::DebianVersion).to receive(:resolve).with(:version).and_return(os_release_value) end - context 'when os is Debian' do - let(:os_name) { 'Debian' } + context 'when version_id is retrieved successful' do + let(:os_release_value) { '10.02' } + let(:fact_value) { { 'full' => '10.02', 'major' => '10', 'minor' => '2' } } - before do - allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:name).and_return(os_name) - allow(Facter::Resolvers::DebianVersion).to receive(:resolve).with(:version).and_return(os_release_value) + it 'calls Facter::Resolvers::DebianVersion' do + fact.call_the_resolver + expect(Facter::Resolvers::DebianVersion).to have_received(:resolve).with(:version) end - context 'when version_id is retrieved successful' do - let(:os_release_value) { '10.02' } - let(:fact_value) { { 'full' => '10.02', 'major' => '10', 'minor' => '2' } } - - it_behaves_like 'calls Facter::Resolvers::OsRelease with :name' - - it 'calls Facter::Resolvers::DebianVersion' do - fact.call_the_resolver - expect(Facter::Resolvers::DebianVersion).to have_received(:resolve).with(:version) - end - - it_behaves_like 'returns os release fact' - end + it_behaves_like 'returns os release fact' + end - context 'when version has no minor' do - let(:os_release_value) { 'testing/release' } - let(:fact_value) { { 'full' => 'testing/release', 'major' => 'testing/release' } } + context 'when version has no minor' do + let(:os_release_value) { 'testing/release' } + let(:fact_value) { { 'full' => 'testing/release', 'major' => 'testing/release' } } - it_behaves_like 'returns os release fact' - end + it_behaves_like 'returns os release fact' + end - context 'when version_id could not §be retrieve' do - let(:os_release_value) { nil } - let(:fact_value) { nil } + context 'when version_id could not §be retrieve' do + let(:os_release_value) { nil } + let(:fact_value) { nil } - it_behaves_like 'returns os release fact as nil' - end + it_behaves_like 'returns os release fact as nil' end end end diff --git a/spec/facter/facts/debian/os/selinux/config_mode_spec.rb b/spec/facter/facts/debian/os/selinux/config_mode_spec.rb deleted file mode 100644 index d0790d43d..000000000 --- a/spec/facter/facts/debian/os/selinux/config_mode_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Os::Selinux::ConfigMode do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Selinux::ConfigMode.new } - - let(:config_mode) { 'enabled' } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:config_mode).and_return(config_mode) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:config_mode) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.config_mode', value: config_mode), - an_object_having_attributes(name: 'selinux_config_mode', value: config_mode, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/os/selinux/config_policy_spec.rb b/spec/facter/facts/debian/os/selinux/config_policy_spec.rb deleted file mode 100644 index ce3ebb411..000000000 --- a/spec/facter/facts/debian/os/selinux/config_policy_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Os::Selinux::ConfigPolicy do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Selinux::ConfigPolicy.new } - - let(:config_policy) { 'targeted' } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:config_policy).and_return(config_policy) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:config_policy) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.config_policy', value: config_policy), - an_object_having_attributes(name: 'selinux_config_policy', value: config_policy, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/os/selinux/current_mode_spec.rb b/spec/facter/facts/debian/os/selinux/current_mode_spec.rb deleted file mode 100644 index 9959e2072..000000000 --- a/spec/facter/facts/debian/os/selinux/current_mode_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Os::Selinux::CurrentMode do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Selinux::CurrentMode.new } - - let(:current_mode) { 'permissive' } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:current_mode).and_return(current_mode) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:current_mode) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.current_mode', value: current_mode), - an_object_having_attributes(name: 'selinux_current_mode', value: current_mode, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/os/selinux/enabled_spec.rb b/spec/facter/facts/debian/os/selinux/enabled_spec.rb deleted file mode 100644 index 5ff08964c..000000000 --- a/spec/facter/facts/debian/os/selinux/enabled_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Os::Selinux::Enabled do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Selinux::Enabled.new } - - let(:enabled) { true } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:enabled).and_return(enabled) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:enabled) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.enabled', value: enabled), - an_object_having_attributes(name: 'selinux', value: enabled, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/os/selinux/enforced_spec.rb b/spec/facter/facts/debian/os/selinux/enforced_spec.rb deleted file mode 100644 index 5ba444184..000000000 --- a/spec/facter/facts/debian/os/selinux/enforced_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Os::Selinux::Enforced do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Selinux::Enforced.new } - - let(:enforced) { false } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:enforced).and_return(enforced) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:enforced) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.enforced', value: enforced), - an_object_having_attributes(name: 'selinux_enforced', value: enforced, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/os/selinux/policy_version_spec.rb b/spec/facter/facts/debian/os/selinux/policy_version_spec.rb deleted file mode 100644 index 5b47288ac..000000000 --- a/spec/facter/facts/debian/os/selinux/policy_version_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Os::Selinux::PolicyVersion do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Selinux::PolicyVersion.new } - - let(:policy_version) { '31' } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:policy_version).and_return(policy_version) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:policy_version) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.policy_version', value: policy_version), - an_object_having_attributes(name: 'selinux_policyversion', - value: policy_version, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/partitions_spec.rb b/spec/facter/facts/debian/partitions_spec.rb deleted file mode 100644 index 1e38777a8..000000000 --- a/spec/facter/facts/debian/partitions_spec.rb +++ /dev/null @@ -1,80 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Partitions do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Partitions.new } - - let(:mountpoints_resolver_output) do - [{ available: '63.31 GiB', - available_bytes: 67_979_685_888, - capacity: '84.64%', - device: '/dev/sda1', - filesystem: 'ext4', - options: %w[rw noatime], - path: '/', - size: '434.42 GiB', - size_bytes: 466_449_743_872, - used: '348.97 GiB', - used_bytes: 374_704_357_376 }] - end - let(:partitions_resolver_output) do - { '/dev/sda1' => { 'filesystem' => 'ext3', 'label' => '/boot', 'size' => '203.89 KiB', 'size_bytes' => 208_782, - 'uuid' => '88077904-4fd4-476f-9af2-0f7a806ca25e' } } - end - - let(:final_result) do - { '/dev/sda1' => { 'filesystem' => 'ext3', 'label' => '/boot', 'size' => '203.89 KiB', 'size_bytes' => 208_782, - 'uuid' => '88077904-4fd4-476f-9af2-0f7a806ca25e', 'mount' => '/' } } - end - - context 'when resolver returns hash' do - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints) - .and_return(mountpoints_resolver_output) - allow(Facter::Resolvers::Partitions).to receive(:resolve).with(:partitions) - .and_return(partitions_resolver_output) - end - - it 'calls Facter::Resolvers::Linux::Mountpoints' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Mountpoints).to have_received(:resolve).with(:mountpoints) - end - - it 'calls Facter::Resolvers::Partitions' do - fact.call_the_resolver - expect(Facter::Resolvers::Partitions).to have_received(:resolve).with(:partitions) - end - - it 'returns partitions information' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'partitions', value: final_result) - end - end - - context 'when mountpoints resolver returns nil' do - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints).and_return(nil) - allow(Facter::Resolvers::Partitions).to receive(:resolve).with(:partitions) - .and_return(partitions_resolver_output) - end - - it 'returns partition information without mount info' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'partitions', value: partitions_resolver_output) - end - end - - context 'when partitions resolver returns empty hash' do - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints) - .and_return(mountpoints_resolver_output) - allow(Facter::Resolvers::Partitions).to receive(:resolve).with(:partitions).and_return({}) - end - - it 'returns nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'partitions', value: nil) - end - end - end -end diff --git a/spec/facter/facts/debian/path_spec.rb b/spec/facter/facts/debian/path_spec.rb deleted file mode 100644 index 1251b0aa1..000000000 --- a/spec/facter/facts/debian/path_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Path do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Path.new } - - let(:value) { '/usr/bin:/etc:/usr/sbin:/usr/ucb:/usr/bin/X11:/sbin:/usr/java6/jre/bin:/usr/java6/bin' } - - before do - allow(Facter::Resolvers::Path).to \ - receive(:resolve).with(:path).and_return(value) - end - - it 'calls Facter::Resolvers::Path' do - fact.call_the_resolver - expect(Facter::Resolvers::Path).to have_received(:resolve).with(:path) - end - - it 'returns path fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'path', value: value) - end - end -end diff --git a/spec/facter/facts/debian/puppet_version_spec.rb b/spec/facter/facts/debian/puppet_version_spec.rb deleted file mode 100644 index 47b59087e..000000000 --- a/spec/facter/facts/debian/puppet_version_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::PuppetVersion do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::PuppetVersion.new } - - let(:puppet_version) { '6.11.0' } - - before do - allow(Facter::Resolvers::PuppetVersionResolver).to \ - receive(:resolve).with(:puppetversion).and_return(puppet_version) - end - - it 'calls Facter::Resolvers::Puppetversion' do - fact.call_the_resolver - expect(Facter::Resolvers::PuppetVersionResolver).to have_received(:resolve).with(:puppetversion) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'puppetversion', value: puppet_version) - end - end -end diff --git a/spec/facter/facts/debian/ruby/platform_spec.rb b/spec/facter/facts/debian/ruby/platform_spec.rb deleted file mode 100644 index 2fc9bba4c..000000000 --- a/spec/facter/facts/debian/ruby/platform_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::Ruby::Platform do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Ruby::Platform.new } - - let(:value) { 'x86_64-linux' } - - before do - allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:platform).and_return(value) - end - - it 'calls Facter::Resolvers::Ruby' do - fact.call_the_resolver - expect(Facter::Resolvers::Ruby).to have_received(:resolve).with(:platform) - end - - it 'returns ruby platform fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'ruby.platform', value: value), - an_object_having_attributes(name: 'rubyplatform', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/debian/system_uptime/days_spec.rb b/spec/facter/facts/debian/system_uptime/days_spec.rb deleted file mode 100644 index 516fb8eca..000000000 --- a/spec/facter/facts/debian/system_uptime/days_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Debian::SystemUptime::Days do - describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::SystemUptime::Days.new } - - let(:value) { '2' } - - before do - allow(Facter::Resolvers::Uptime).to receive(:resolve).with(:days).and_return(value) - end - - it 'calls Facter::Resolvers::Uptime' do - fact.call_the_resolver - expect(Facter::Resolvers::Uptime).to have_received(:resolve).with(:days) - end - - it 'returns days since last boot' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'system_uptime.days', value: value), - an_object_having_attributes(name: 'uptime_days', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/augeas/version_spec.rb b/spec/facter/facts/el/augeas/version_spec.rb deleted file mode 100644 index bc70c257d..000000000 --- a/spec/facter/facts/el/augeas/version_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Augeas::Version do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Augeas::Version.new } - - let(:version) { '1.12.0' } - - before do - allow(Facter::Resolvers::Augeas).to \ - receive(:resolve).with(:augeas_version).and_return(version) - end - - it 'calls Facter::Resolvers::Augeas' do - fact.call_the_resolver - expect(Facter::Resolvers::Augeas).to have_received(:resolve).with(:augeas_version) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'augeas.version', value: version), - an_object_having_attributes(name: 'augeasversion', value: version, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/bios/release_date_spec.rb b/spec/facter/facts/el/dmi/bios/release_date_spec.rb deleted file mode 100644 index ccf2b4946..000000000 --- a/spec/facter/facts/el/dmi/bios/release_date_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Bios::ReleaseDate do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Bios::ReleaseDate.new } - - let(:date) { '07/03/2018' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:bios_date).and_return(date) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:bios_date) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.bios.release_date', value: date), - an_object_having_attributes(name: 'bios_release_date', value: date, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/bios/vendor_spec.rb b/spec/facter/facts/el/dmi/bios/vendor_spec.rb deleted file mode 100644 index e4f450d51..000000000 --- a/spec/facter/facts/el/dmi/bios/vendor_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Bios::Vendor do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Bios::Vendor.new } - - let(:vendor) { 'Phoenix Technologies LTD' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:bios_vendor).and_return(vendor) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:bios_vendor) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.bios.vendor', value: vendor), - an_object_having_attributes(name: 'bios_vendor', value: vendor, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/bios/version_spec.rb b/spec/facter/facts/el/dmi/bios/version_spec.rb deleted file mode 100644 index c67d8b5fd..000000000 --- a/spec/facter/facts/el/dmi/bios/version_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Bios::Version do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Bios::Version.new } - - let(:version) { '6.00' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:bios_version).and_return(version) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:bios_version) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.bios.version', value: version), - an_object_having_attributes(name: 'bios_version', value: version, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/board/manufacturer_spec.rb b/spec/facter/facts/el/dmi/board/manufacturer_spec.rb deleted file mode 100644 index d373b2920..000000000 --- a/spec/facter/facts/el/dmi/board/manufacturer_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Board::Manufacturer do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Board::Manufacturer.new } - - let(:manufacturer) { 'Intel Corporation' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:board_vendor).and_return(manufacturer) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:board_vendor) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.board.manufacturer', value: manufacturer), - an_object_having_attributes(name: 'boardmanufacturer', value: manufacturer, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/board/product_spec.rb b/spec/facter/facts/el/dmi/board/product_spec.rb deleted file mode 100644 index 142bcb297..000000000 --- a/spec/facter/facts/el/dmi/board/product_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Board::Product do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Board::Product.new } - - let(:product) { '440BX Desktop Reference Platform' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:board_name).and_return(product) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:board_name) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.board.product', value: product), - an_object_having_attributes(name: 'boardproductname', value: product, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/board/serial_number_spec.rb b/spec/facter/facts/el/dmi/board/serial_number_spec.rb deleted file mode 100644 index 271c294a3..000000000 --- a/spec/facter/facts/el/dmi/board/serial_number_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Board::SerialNumber do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Board::SerialNumber.new } - - let(:serial_number) { 'None' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:board_serial).and_return(serial_number) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:board_serial) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.board.serial_number', value: serial_number), - an_object_having_attributes(name: 'boardserialnumber', value: serial_number, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/chassis/asset_tag_spec.rb b/spec/facter/facts/el/dmi/chassis/asset_tag_spec.rb deleted file mode 100644 index c0740a7a2..000000000 --- a/spec/facter/facts/el/dmi/chassis/asset_tag_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Chassis::AssetTag do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Chassis::AssetTag.new } - - let(:tag) { 'No Asset Tag' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:chassis_asset_tag).and_return(tag) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:chassis_asset_tag) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.chassis.asset_tag', value: tag), - an_object_having_attributes(name: 'chassisassettag', value: tag, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/chassis/type_spec.rb b/spec/facter/facts/el/dmi/chassis/type_spec.rb deleted file mode 100644 index 9b263e44e..000000000 --- a/spec/facter/facts/el/dmi/chassis/type_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Chassis::Type do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Chassis::Type.new } - - let(:type) { 'Low Profile Desktop' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:chassis_type).and_return(type) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:chassis_type) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.chassis.type', value: type), - an_object_having_attributes(name: 'chassistype', value: type, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/manufacturer_spec.rb b/spec/facter/facts/el/dmi/manufacturer_spec.rb deleted file mode 100644 index 6146f93d3..000000000 --- a/spec/facter/facts/el/dmi/manufacturer_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Manufacturer do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Manufacturer.new } - - let(:sys_vendor) { 'VMware, Inc.' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:sys_vendor).and_return(sys_vendor) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:sys_vendor) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.manufacturer', value: sys_vendor), - an_object_having_attributes(name: 'manufacturer', value: sys_vendor, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/product/name_spec.rb b/spec/facter/facts/el/dmi/product/name_spec.rb deleted file mode 100644 index 38aa527e2..000000000 --- a/spec/facter/facts/el/dmi/product/name_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Product::Name do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Product::Name.new } - - let(:product_name) { 'VMware Virtual Platform' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:product_name).and_return(product_name) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:product_name) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.product.name', value: product_name), - an_object_having_attributes(name: 'productname', value: product_name, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/product/serial_number_spec.rb b/spec/facter/facts/el/dmi/product/serial_number_spec.rb deleted file mode 100644 index ef2da7311..000000000 --- a/spec/facter/facts/el/dmi/product/serial_number_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Product::SerialNumber do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Product::SerialNumber.new } - - let(:serial_number) { 'VMware-42 1a a9 29 31 8f fa e9-7d 69 2e 23 21 b0 0c 45' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:product_serial).and_return(serial_number) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:product_serial) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.product.serial_number', value: serial_number), - an_object_having_attributes(name: 'serialnumber', value: serial_number, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/dmi/product/uuid_spec.rb b/spec/facter/facts/el/dmi/product/uuid_spec.rb deleted file mode 100644 index 55b37820e..000000000 --- a/spec/facter/facts/el/dmi/product/uuid_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Dmi::Product::Uuid do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Dmi::Product::Uuid.new } - - let(:product_uuid) { '421aa929-318f-fae9-7d69-2e2321b00c45' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:product_uuid).and_return(product_uuid) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:product_uuid) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.product.uuid', value: product_uuid), - an_object_having_attributes(name: 'uuid', value: product_uuid, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/filesystems_spec.rb b/spec/facter/facts/el/filesystems_spec.rb deleted file mode 100644 index 1e760ef69..000000000 --- a/spec/facter/facts/el/filesystems_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Filesystems do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Filesystems.new } - - let(:value) { 'ext2,ext3,ext4,xfs' } - - before do - allow(Facter::Resolvers::Linux::Filesystems).to \ - receive(:resolve).with(:systems).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::Filesystems' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Filesystems).to have_received(:resolve).with(:systems) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'filesystems', value: value) - end - end -end diff --git a/spec/facter/facts/el/fips_enabled_spec.rb b/spec/facter/facts/el/fips_enabled_spec.rb deleted file mode 100644 index 0688319a5..000000000 --- a/spec/facter/facts/el/fips_enabled_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::FipsEnabled do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::FipsEnabled.new } - - let(:value) { true } - - before do - allow(Facter::Resolvers::Linux::FipsEnabled).to \ - receive(:resolve).with(:fips_enabled).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::FipsEnabled' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::FipsEnabled).to have_received(:resolve).with(:fips_enabled) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'fips_enabled', value: value) - end - end -end diff --git a/spec/facter/facts/el/identity/group_spec.rb b/spec/facter/facts/el/identity/group_spec.rb deleted file mode 100644 index d4a94636c..000000000 --- a/spec/facter/facts/el/identity/group_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Identity::Group do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Identity::Group.new } - - let(:value) { 'staff' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:group).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:group) - end - - it 'returns identity group fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'identity.group', value: value), - an_object_having_attributes(name: 'gid', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/identity/uid_spec.rb b/spec/facter/facts/el/identity/uid_spec.rb deleted file mode 100644 index 2ef15d98b..000000000 --- a/spec/facter/facts/el/identity/uid_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Identity::Uid do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Identity::Uid.new } - - let(:value) { '501' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:uid).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:uid) - end - - it 'returns identity uid fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'identity.uid', value: value) - end - end -end diff --git a/spec/facter/facts/el/kernel_spec.rb b/spec/facter/facts/el/kernel_spec.rb deleted file mode 100644 index ff661d6ad..000000000 --- a/spec/facter/facts/el/kernel_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Kernel do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Kernel.new } - - let(:value) { 'Linux' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelname).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:kernelname) - end - - it 'returns kernel fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'kernel', value: value) - end - end -end diff --git a/spec/facter/facts/el/kernelrelease_spec.rb b/spec/facter/facts/el/kernelrelease_spec.rb deleted file mode 100644 index 45b49bc04..000000000 --- a/spec/facter/facts/el/kernelrelease_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Kernelrelease do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Kernelrelease.new } - - let(:value) { '4.19.2-300.fc29.x86_64' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelrelease).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:kernelrelease) - end - - it 'returns kernelrelease fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'kernelrelease', value: value) - end - end -end diff --git a/spec/facter/facts/el/kernelversion_spec.rb b/spec/facter/facts/el/kernelversion_spec.rb deleted file mode 100644 index 0aec55501..000000000 --- a/spec/facter/facts/el/kernelversion_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Kernelversion do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Kernelversion.new } - - let(:value) { '4.19.2' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelrelease).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:kernelrelease) - end - - it 'returns kernel fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'kernelversion', value: value) - end - end -end diff --git a/spec/facter/facts/el/memory/swap/available_bytes_spec.rb b/spec/facter/facts/el/memory/swap/available_bytes_spec.rb deleted file mode 100644 index 18c9d0330..000000000 --- a/spec/facter/facts/el/memory/swap/available_bytes_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::Swap::AvailableBytes do - subject(:fact) { Facts::El::Memory::Swap::AvailableBytes.new } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_free).and_return(value) - end - - describe '#call_the_resolver' do - let(:value) { 3_331_551_232 } - let(:value_mb) { 3177.21 } - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_free) - end - - it 'returns available memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.available_bytes', value: value), - an_object_having_attributes(name: 'swapfree_mb', value: value_mb, type: :legacy)) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:value) { nil } - - it 'returns available memory fact as nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.available_bytes', value: value), - an_object_having_attributes(name: 'swapfree_mb', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/memory/swap/available_spec.rb b/spec/facter/facts/el/memory/swap/available_spec.rb deleted file mode 100644 index 7a7e7304d..000000000 --- a/spec/facter/facts/el/memory/swap/available_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::Swap::Available do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::Swap::Available.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_free).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_free) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.available', value: value), - an_object_having_attributes(name: 'swapfree', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/memory/swap/capacity_spec.rb b/spec/facter/facts/el/memory/swap/capacity_spec.rb deleted file mode 100644 index 7e338d6bf..000000000 --- a/spec/facter/facts/el/memory/swap/capacity_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::Swap::Capacity do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::Swap::Capacity.new } - - let(:value) { '7.4%' } - - before do - allow(Facter::Resolvers::Linux::Memory).to \ - receive(:resolve).with(:swap_capacity).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_capacity) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.swap.capacity', value: value) - end - end -end diff --git a/spec/facter/facts/el/memory/swap/total_bytes_spec.rb b/spec/facter/facts/el/memory/swap/total_bytes_spec.rb deleted file mode 100644 index f21a054a0..000000000 --- a/spec/facter/facts/el/memory/swap/total_bytes_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::Swap::TotalBytes do - subject(:fact) { Facts::El::Memory::Swap::TotalBytes.new } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_total).and_return(value) - end - - describe '#call_the_resolver' do - let(:value) { 3_331_551_232 } - let(:value_mb) { 3177.21 } - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_total) - end - - it 'returns available memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.total_bytes', value: value), - an_object_having_attributes(name: 'swapsize_mb', value: value_mb, type: :legacy)) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:value) { nil } - - it 'returns available memory fact as nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.total_bytes', value: value), - an_object_having_attributes(name: 'swapsize_mb', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/memory/swap/total_spec.rb b/spec/facter/facts/el/memory/swap/total_spec.rb deleted file mode 100644 index 00accbff7..000000000 --- a/spec/facter/facts/el/memory/swap/total_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::Swap::Total do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::Swap::Total.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_total).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_total) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.total', value: value), - an_object_having_attributes(name: 'swapsize', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/memory/swap/used_bytes_spec.rb b/spec/facter/facts/el/memory/swap/used_bytes_spec.rb deleted file mode 100644 index c9b08301c..000000000 --- a/spec/facter/facts/el/memory/swap/used_bytes_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::Swap::UsedBytes do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::Swap::UsedBytes.new } - - let(:value) { 1024 } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_used_bytes).and_return(value) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_used_bytes) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.swap.used_bytes', value: value) - end - end -end diff --git a/spec/facter/facts/el/memory/swap/used_spec.rb b/spec/facter/facts/el/memory/swap/used_spec.rb deleted file mode 100644 index 695754990..000000000 --- a/spec/facter/facts/el/memory/swap/used_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::Swap::Used do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::Swap::Used.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_used_bytes).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_used_bytes) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.swap.used', value: value) - end - end -end diff --git a/spec/facter/facts/el/memory/system/available_bytes_spec.rb b/spec/facter/facts/el/memory/system/available_bytes_spec.rb deleted file mode 100644 index 22bb1fad2..000000000 --- a/spec/facter/facts/el/memory/system/available_bytes_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::System::AvailableBytes do - subject(:fact) { Facts::El::Memory::System::AvailableBytes.new } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:memfree).and_return(value) - end - - describe '#call_the_resolver' do - let(:value) { 3_331_551_232 } - let(:value_mb) { 3177.21 } - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:memfree) - end - - it 'returns available memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.available_bytes', value: value), - an_object_having_attributes(name: 'memoryfree_mb', value: value_mb, type: :legacy)) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:value) { nil } - - it 'returns available memory fact as nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.available_bytes', value: value), - an_object_having_attributes(name: 'memoryfree_mb', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/memory/system/available_spec.rb b/spec/facter/facts/el/memory/system/available_spec.rb deleted file mode 100644 index 1d92c797c..000000000 --- a/spec/facter/facts/el/memory/system/available_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::System::Available do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::System::Available.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:memfree).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:memfree) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.available', value: value), - an_object_having_attributes(name: 'memoryfree', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/memory/system/capacity_spec.rb b/spec/facter/facts/el/memory/system/capacity_spec.rb deleted file mode 100644 index de35fe67c..000000000 --- a/spec/facter/facts/el/memory/system/capacity_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::System::Capacity do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::System::Capacity.new } - - let(:value) { '5.3%' } - - before do - allow(Facter::Resolvers::Linux::Memory).to \ - receive(:resolve).with(:capacity).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:capacity) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.system.capacity', value: value) - end - end -end diff --git a/spec/facter/facts/el/memory/system/total_bytes_spec.rb b/spec/facter/facts/el/memory/system/total_bytes_spec.rb deleted file mode 100644 index b07009061..000000000 --- a/spec/facter/facts/el/memory/system/total_bytes_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::System::TotalBytes do - subject(:fact) { Facts::El::Memory::System::TotalBytes.new } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:total).and_return(value) - end - - describe '#call_the_resolver' do - let(:value) { 3_331_551_232 } - let(:value_mb) { 3177.21 } - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:total) - end - - it 'returns available memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.total_bytes', value: value), - an_object_having_attributes(name: 'memorysize_mb', value: value_mb, type: :legacy)) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:value) { nil } - - it 'returns available memory fact as nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.total_bytes', value: value), - an_object_having_attributes(name: 'memorysize_mb', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/memory/system/total_spec.rb b/spec/facter/facts/el/memory/system/total_spec.rb deleted file mode 100644 index ecb7eabce..000000000 --- a/spec/facter/facts/el/memory/system/total_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::System::Total do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::System::Total.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:total).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:total) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.total', value: value), - an_object_having_attributes(name: 'memorysize', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/memory/system/used_bytes_spec.rb b/spec/facter/facts/el/memory/system/used_bytes_spec.rb deleted file mode 100644 index 6edf22deb..000000000 --- a/spec/facter/facts/el/memory/system/used_bytes_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::System::UsedBytes do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::System::UsedBytes.new } - - let(:value) { 1024 } - - before do - allow(Facter::Resolvers::Linux::Memory).to \ - receive(:resolve).with(:used_bytes).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:used_bytes) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.system.used_bytes', value: value) - end - end -end diff --git a/spec/facter/facts/el/memory/system/used_spec.rb b/spec/facter/facts/el/memory/system/used_spec.rb deleted file mode 100644 index 58129c389..000000000 --- a/spec/facter/facts/el/memory/system/used_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Memory::System::Used do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Memory::System::Used.new } - - let(:resolver_value) { 1024 } - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to \ - receive(:resolve).with(:used_bytes).and_return(resolver_value) - end - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:used_bytes) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.system.used', value: value) - end - end -end diff --git a/spec/facter/facts/el/mountpoints_spec.rb b/spec/facter/facts/el/mountpoints_spec.rb deleted file mode 100644 index a8f16cbdb..000000000 --- a/spec/facter/facts/el/mountpoints_spec.rb +++ /dev/null @@ -1,60 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Mountpoints do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Mountpoints.new } - - context 'when resolver returns hash' do - let(:resolver_output) do - [{ available: '63.31 GiB', - available_bytes: 67_979_685_888, - capacity: '84.64%', - device: '/dev/nvme0n1p2', - filesystem: 'ext4', - options: %w[rw noatime], - path: '/', - size: '434.42 GiB', - size_bytes: 466_449_743_872, - used: '348.97 GiB', - used_bytes: 374_704_357_376 }] - end - let(:parsed_fact) do - { '/' => { 'available' => '63.31 GiB', - 'available_bytes' => 67_979_685_888, - 'capacity' => '84.64%', - 'device' => '/dev/nvme0n1p2', - 'filesystem' => 'ext4', - 'options' => %w[rw noatime], - 'size' => '434.42 GiB', - 'size_bytes' => 466_449_743_872, - 'used' => '348.97 GiB', - 'used_bytes' => 374_704_357_376 } } - end - - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints).and_return(resolver_output) - end - - it 'calls Facter::Resolvers::Linux::Mountpoints' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Mountpoints).to have_received(:resolve).with(:mountpoints) - end - - it 'returns mountpoints information' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'mountpoints', value: parsed_fact) - end - end - - context 'when resolver returns nil' do - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints).and_return(nil) - end - - it 'returns mountpoints information' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'mountpoints', value: nil) - end - end - end -end diff --git a/spec/facter/facts/el/networking/domain_spec.rb b/spec/facter/facts/el/networking/domain_spec.rb deleted file mode 100644 index 5d3169cd8..000000000 --- a/spec/facter/facts/el/networking/domain_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Networking::Domain do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Networking::Domain.new } - - let(:value) { 'domain' } - - before do - allow(Facter::Resolvers::Hostname).to receive(:resolve).with(:domain).and_return(value) - end - - it 'calls Facter::Resolvers::Hostname' do - fact.call_the_resolver - expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:domain) - end - - it 'returns domain fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'networking.domain', value: value), - an_object_having_attributes(name: 'domain', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/networking/fqdn_spec.rb b/spec/facter/facts/el/networking/fqdn_spec.rb deleted file mode 100644 index 2678f29df..000000000 --- a/spec/facter/facts/el/networking/fqdn_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Networking::Fqdn do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Networking::Fqdn.new } - - let(:value) { 'host.domain' } - - before do - allow(Facter::Resolvers::Hostname).to receive(:resolve).with(:fqdn).and_return(value) - end - - it 'calls Facter::Resolvers::Hostname' do - fact.call_the_resolver - expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:fqdn) - end - - it 'returns fqdn fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'networking.fqdn', value: value), - an_object_having_attributes(name: 'fqdn', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/os/hardware_spec.rb b/spec/facter/facts/el/os/hardware_spec.rb deleted file mode 100644 index 54bdec1aa..000000000 --- a/spec/facter/facts/el/os/hardware_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Os::Hardware do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Hardware.new } - - let(:value) { 'x86_64' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:machine).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:machine) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.hardware', value: value), - an_object_having_attributes(name: 'hardwaremodel', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/os/selinux/config_mode_spec.rb b/spec/facter/facts/el/os/selinux/config_mode_spec.rb deleted file mode 100644 index da5d64986..000000000 --- a/spec/facter/facts/el/os/selinux/config_mode_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Os::Selinux::ConfigMode do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Selinux::ConfigMode.new } - - let(:config_mode) { 'enabled' } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:config_mode).and_return(config_mode) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:config_mode) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.config_mode', value: config_mode), - an_object_having_attributes(name: 'selinux_config_mode', value: config_mode, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/os/selinux/enforced_spec.rb b/spec/facter/facts/el/os/selinux/enforced_spec.rb deleted file mode 100644 index 81c9d268c..000000000 --- a/spec/facter/facts/el/os/selinux/enforced_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Os::Selinux::Enforced do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Selinux::Enforced.new } - - let(:enforced) { false } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:enforced).and_return(enforced) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:enforced) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.enforced', value: enforced), - an_object_having_attributes(name: 'selinux_enforced', value: enforced, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/partitions_spec.rb b/spec/facter/facts/el/partitions_spec.rb deleted file mode 100644 index 777b83dd5..000000000 --- a/spec/facter/facts/el/partitions_spec.rb +++ /dev/null @@ -1,80 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Partitions do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Partitions.new } - - let(:mountpoints_resolver_output) do - [{ available: '63.31 GiB', - available_bytes: 67_979_685_888, - capacity: '84.64%', - device: '/dev/sda1', - filesystem: 'ext4', - options: %w[rw noatime], - path: '/', - size: '434.42 GiB', - size_bytes: 466_449_743_872, - used: '348.97 GiB', - used_bytes: 374_704_357_376 }] - end - let(:partitions_resolver_output) do - { '/dev/sda1' => { 'filesystem' => 'ext3', 'label' => '/boot', 'size' => '203.89 KiB', 'size_bytes' => 208_782, - 'uuid' => '88077904-4fd4-476f-9af2-0f7a806ca25e' } } - end - - let(:final_result) do - { '/dev/sda1' => { 'filesystem' => 'ext3', 'label' => '/boot', 'size' => '203.89 KiB', 'size_bytes' => 208_782, - 'uuid' => '88077904-4fd4-476f-9af2-0f7a806ca25e', 'mount' => '/' } } - end - - context 'when resolver returns hash' do - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints) - .and_return(mountpoints_resolver_output) - allow(Facter::Resolvers::Partitions).to receive(:resolve).with(:partitions) - .and_return(partitions_resolver_output) - end - - it 'calls Facter::Resolvers::Linux::Mountpoints' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Mountpoints).to have_received(:resolve).with(:mountpoints) - end - - it 'calls Facter::Resolvers::Partitions' do - fact.call_the_resolver - expect(Facter::Resolvers::Partitions).to have_received(:resolve).with(:partitions) - end - - it 'returns partitions information' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'partitions', value: final_result) - end - end - - context 'when mountpoints resolver returns nil' do - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints).and_return(nil) - allow(Facter::Resolvers::Partitions).to receive(:resolve).with(:partitions) - .and_return(partitions_resolver_output) - end - - it 'returns partition information without mount info' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'partitions', value: partitions_resolver_output) - end - end - - context 'when partitions resolver returns empty hash' do - before do - allow(Facter::Resolvers::Linux::Mountpoints).to receive(:resolve).with(:mountpoints) - .and_return(mountpoints_resolver_output) - allow(Facter::Resolvers::Partitions).to receive(:resolve).with(:partitions).and_return({}) - end - - it 'returns nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'partitions', value: nil) - end - end - end -end diff --git a/spec/facter/facts/el/processor_spec.rb b/spec/facter/facts/el/processor_spec.rb deleted file mode 100644 index 72ece7b67..000000000 --- a/spec/facter/facts/el/processor_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Processor do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Processor.new } - - let(:processor) { ['Intel(R) Xeon(R) Gold 6138 CPU @ 2.00GHz', 'Intel(R) Xeon(R) Gold 6138 CPU @ 2.00GHz'] } - - before do - allow(Facter::Resolvers::Linux::Processors).to receive(:resolve).with(:models).and_return(processor) - end - - it 'calls Facter::Resolvers::Linux::Processors' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Processors).to have_received(:resolve).with(:models) - end - - it 'returns legacy facts about each processor' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'processor0', value: processor[0], type: :legacy), - an_object_having_attributes(name: 'processor1', value: processor[1], type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/processors/count_spec.rb b/spec/facter/facts/el/processors/count_spec.rb deleted file mode 100644 index b53a82b49..000000000 --- a/spec/facter/facts/el/processors/count_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Processors::Count do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Processors::Count.new } - - let(:processors_count) { '4' } - - before do - allow(Facter::Resolvers::Linux::Processors).to \ - receive(:resolve).with(:processors).and_return(processors_count) - end - - it 'calls Facter::Resolvers::Linux::Processors' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Processors).to have_received(:resolve).with(:processors) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'processors.count', value: processors_count), - an_object_having_attributes(name: 'processorcount', value: processors_count, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/processors/isa_spec.rb b/spec/facter/facts/el/processors/isa_spec.rb deleted file mode 100644 index 7b1387d0e..000000000 --- a/spec/facter/facts/el/processors/isa_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Processors::Isa do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Processors::Isa.new } - - let(:processors_arch) { 'x86_64' } - - before do - allow(Facter::Resolvers::Uname).to \ - receive(:resolve).with(:processor).and_return(processors_arch) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:processor) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'processors.isa', value: processors_arch), - an_object_having_attributes(name: 'hardwareisa', value: processors_arch, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/processors/models_spec.rb b/spec/facter/facts/el/processors/models_spec.rb deleted file mode 100644 index 74dda3a79..000000000 --- a/spec/facter/facts/el/processors/models_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Processors::Models do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Processors::Models.new } - - let(:models) { ['Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz', 'Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz'] } - - before do - allow(Facter::Resolvers::Linux::Processors).to \ - receive(:resolve).with(:models).and_return(models) - end - - it 'calls Facter::Resolvers::Linux::Processors' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Processors).to have_received(:resolve).with(:models) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'processors.models', value: models) - end - end -end diff --git a/spec/facter/facts/el/processors/physicalcount_spec.rb b/spec/facter/facts/el/processors/physicalcount_spec.rb deleted file mode 100644 index cf0fe2b16..000000000 --- a/spec/facter/facts/el/processors/physicalcount_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Processors::Physicalcount do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Processors::Physicalcount.new } - - let(:physical_count) { '2' } - - before do - allow(Facter::Resolvers::Linux::Processors).to \ - receive(:resolve).with(:physical_count).and_return(physical_count) - end - - it 'calls Facter::Resolvers::Linux::Processors' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Processors).to have_received(:resolve).with(:physical_count) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'processors.physicalcount', - value: physical_count), - an_object_having_attributes(name: 'physicalprocessorcount', - value: physical_count, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/ruby/platform_spec.rb b/spec/facter/facts/el/ruby/platform_spec.rb deleted file mode 100644 index 8e021fc7b..000000000 --- a/spec/facter/facts/el/ruby/platform_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Ruby::Platform do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Ruby::Platform.new } - - let(:value) { 'x86_64-linux' } - - before do - allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:platform).and_return(value) - end - - it 'calls Facter::Resolvers::Ruby' do - fact.call_the_resolver - expect(Facter::Resolvers::Ruby).to have_received(:resolve).with(:platform) - end - - it 'returns ruby platform fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'ruby.platform', value: value), - an_object_having_attributes(name: 'rubyplatform', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/ruby/sitedir_spec.rb b/spec/facter/facts/el/ruby/sitedir_spec.rb deleted file mode 100644 index 2d401090d..000000000 --- a/spec/facter/facts/el/ruby/sitedir_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Ruby::Sitedir do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Ruby::Sitedir.new } - - let(:value) { '/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0' } - - before do - allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:sitedir).and_return(value) - end - - it 'calls Facter::Resolvers::Ruby' do - fact.call_the_resolver - expect(Facter::Resolvers::Ruby).to have_received(:resolve).with(:sitedir) - end - - it 'returns ruby sitedir fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'ruby.sitedir', value: value), - an_object_having_attributes(name: 'rubysitedir', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/ruby/version_spec.rb b/spec/facter/facts/el/ruby/version_spec.rb deleted file mode 100644 index 990a7a746..000000000 --- a/spec/facter/facts/el/ruby/version_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Ruby::Version do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Ruby::Version.new } - - let(:value) { '2.5.7' } - - before do - allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:version).and_return(value) - end - - it 'calls Facter::Resolvers::Ruby' do - fact.call_the_resolver - expect(Facter::Resolvers::Ruby).to have_received(:resolve).with(:version) - end - - it 'returns ruby version fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'ruby.version', value: value), - an_object_having_attributes(name: 'rubyversion', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/ssh_spec.rb b/spec/facter/facts/el/ssh_spec.rb deleted file mode 100644 index de02ba23d..000000000 --- a/spec/facter/facts/el/ssh_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Ssh do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Ssh.new } - - let(:ssh) do - [Facter::Ssh.new(Facter::FingerPrint.new('test', 'test'), 'ecdsa', 'test', 'ecdsa')] - end - let(:value) do - { 'ecdsa' => { 'fingerprints' => - { 'sha1' => 'test', 'sha256' => 'test' }, - 'key' => 'test', - 'type' => 'ecdsa' } } - end - - before do - allow(Facter::Resolvers::SshResolver).to \ - receive(:resolve).with(:ssh).and_return(ssh) - end - - it 'calls Facter::Resolvers::SshResolver' do - fact.call_the_resolver - expect(Facter::Resolvers::SshResolver).to have_received(:resolve).with(:ssh) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'ssh', value: value) - end - end -end diff --git a/spec/facter/facts/el/sshfp_algorithm_spec.rb b/spec/facter/facts/el/sshfp_algorithm_spec.rb deleted file mode 100644 index d4bfef061..000000000 --- a/spec/facter/facts/el/sshfp_algorithm_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::SshfpAlgorithm do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::SshfpAlgorithm.new } - - let(:ssh) do - [Facter::Ssh.new(Facter::FingerPrint.new('sha11', 'sha2561'), 'ecdsa', 'test', 'ecdsa'), - Facter::Ssh.new(Facter::FingerPrint.new('sha12', 'sha2562'), 'rsa', 'test', 'rsa')] - end - let(:legacy_fact1) { { name: 'ecdsa', value: "sha11 \n sha2561" } } - let(:legacy_fact2) { { name: 'rsa', value: "sha12 \n sha2562" } } - - before do - allow(Facter::Resolvers::SshResolver).to \ - receive(:resolve).with(:ssh).and_return(ssh) - end - - it 'calls Facter::Resolvers::SshResolver' do - fact.call_the_resolver - expect(Facter::Resolvers::SshResolver).to have_received(:resolve).with(:ssh) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: "sshfp_#{legacy_fact1[:name]}", value: legacy_fact1[:value]), - an_object_having_attributes(name: "sshfp_#{legacy_fact2[:name]}", value: legacy_fact2[:value])) - end - end -end diff --git a/spec/facter/facts/el/system_uptime/hours_spec.rb b/spec/facter/facts/el/system_uptime/hours_spec.rb deleted file mode 100644 index 8ba677c68..000000000 --- a/spec/facter/facts/el/system_uptime/hours_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::SystemUptime::Hours do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::SystemUptime::Hours.new } - - let(:value) { '9' } - - before do - allow(Facter::Resolvers::Uptime).to receive(:resolve).with(:hours).and_return(value) - end - - it 'calls Facter::Resolvers::Uptime' do - fact.call_the_resolver - expect(Facter::Resolvers::Uptime).to have_received(:resolve).with(:hours) - end - - it 'returns hours since last boot' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'system_uptime.hours', value: value), - an_object_having_attributes(name: 'uptime_hours', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/system_uptime/seconds_spec.rb b/spec/facter/facts/el/system_uptime/seconds_spec.rb deleted file mode 100644 index 393628455..000000000 --- a/spec/facter/facts/el/system_uptime/seconds_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::SystemUptime::Seconds do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::SystemUptime::Seconds.new } - - let(:value) { '34974' } - - before do - allow(Facter::Resolvers::Uptime).to receive(:resolve).with(:seconds).and_return(value) - end - - it 'calls Facter::Resolvers::Uptime' do - fact.call_the_resolver - expect(Facter::Resolvers::Uptime).to have_received(:resolve).with(:seconds) - end - - it 'returns seconds since last boot' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'system_uptime.seconds', value: value), - an_object_having_attributes(name: 'uptime_seconds', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/system_uptime/uptime_spec.rb b/spec/facter/facts/el/system_uptime/uptime_spec.rb deleted file mode 100644 index 361c20b4a..000000000 --- a/spec/facter/facts/el/system_uptime/uptime_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::SystemUptime::Uptime do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::SystemUptime::Uptime.new } - - let(:value) { '9:42 hours' } - - before do - allow(Facter::Resolvers::Uptime).to receive(:resolve).with(:uptime).and_return(value) - end - - it 'calls Facter::Resolvers::Uptime' do - fact.call_the_resolver - expect(Facter::Resolvers::Uptime).to have_received(:resolve).with(:uptime) - end - - it 'returns time since last boot' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'system_uptime.uptime', value: value), - an_object_having_attributes(name: 'uptime', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/el/timezone_spec.rb b/spec/facter/facts/el/timezone_spec.rb deleted file mode 100644 index b46539980..000000000 --- a/spec/facter/facts/el/timezone_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::El::Timezone do - describe '#call_the_resolver' do - subject(:fact) { Facts::El::Timezone.new } - - let(:timezone) { 'UTC' } - - before do - allow(Facter::Resolvers::Timezone).to \ - receive(:resolve).with(:timezone).and_return(timezone) - end - - it 'calls Facter::Resolvers::Timezone' do - fact.call_the_resolver - expect(Facter::Resolvers::Timezone).to have_received(:resolve).with(:timezone) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'timezone', value: timezone) - end - end -end diff --git a/spec/facter/facts/sles/augeas/version_spec.rb b/spec/facter/facts/linux/augeas/version_spec.rb similarity index 88% rename from spec/facter/facts/sles/augeas/version_spec.rb rename to spec/facter/facts/linux/augeas/version_spec.rb index 28d750640..61cc701c6 100644 --- a/spec/facter/facts/sles/augeas/version_spec.rb +++ b/spec/facter/facts/linux/augeas/version_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Augeas::Version do +describe Facts::Linux::Augeas::Version do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Augeas::Version.new } + subject(:fact) { Facts::Linux::Augeas::Version.new } let(:version) { '1.12.0' } diff --git a/spec/facter/facts/el/disks_spec.rb b/spec/facter/facts/linux/disks_spec.rb similarity index 91% rename from spec/facter/facts/el/disks_spec.rb rename to spec/facter/facts/linux/disks_spec.rb index cdd0d3611..5a4f4b9f3 100644 --- a/spec/facter/facts/el/disks_spec.rb +++ b/spec/facter/facts/linux/disks_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -describe Facts::El::Disks do - subject(:fact) { Facts::El::Disks.new } +describe Facts::Linux::Disks do + subject(:fact) { Facts::Linux::Disks.new } let(:disk) do { diff --git a/spec/facter/facts/debian/dmi/bios/release_date_spec.rb b/spec/facter/facts/linux/dmi/bios/release_date_spec.rb similarity index 86% rename from spec/facter/facts/debian/dmi/bios/release_date_spec.rb rename to spec/facter/facts/linux/dmi/bios/release_date_spec.rb index 1c0874864..5fd23fe91 100644 --- a/spec/facter/facts/debian/dmi/bios/release_date_spec.rb +++ b/spec/facter/facts/linux/dmi/bios/release_date_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Bios::ReleaseDate do +describe Facts::Linux::Dmi::Bios::ReleaseDate do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Bios::ReleaseDate.new } + subject(:fact) { Facts::Linux::Dmi::Bios::ReleaseDate.new } let(:date) { '07/03/2018' } diff --git a/spec/facter/facts/debian/dmi/bios/vendor_spec.rb b/spec/facter/facts/linux/dmi/bios/vendor_spec.rb similarity index 87% rename from spec/facter/facts/debian/dmi/bios/vendor_spec.rb rename to spec/facter/facts/linux/dmi/bios/vendor_spec.rb index dbf7113ff..0c96260a1 100644 --- a/spec/facter/facts/debian/dmi/bios/vendor_spec.rb +++ b/spec/facter/facts/linux/dmi/bios/vendor_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Bios::Vendor do +describe Facts::Linux::Dmi::Bios::Vendor do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Bios::Vendor.new } + subject(:fact) { Facts::Linux::Dmi::Bios::Vendor.new } let(:vendor) { 'Phoenix Technologies LTD' } diff --git a/spec/facter/facts/debian/dmi/bios/version_spec.rb b/spec/facter/facts/linux/dmi/bios/version_spec.rb similarity index 87% rename from spec/facter/facts/debian/dmi/bios/version_spec.rb rename to spec/facter/facts/linux/dmi/bios/version_spec.rb index 7129e2406..657243acc 100644 --- a/spec/facter/facts/debian/dmi/bios/version_spec.rb +++ b/spec/facter/facts/linux/dmi/bios/version_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Bios::Version do +describe Facts::Linux::Dmi::Bios::Version do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Bios::Version.new } + subject(:fact) { Facts::Linux::Dmi::Bios::Version.new } let(:version) { '6.00' } diff --git a/spec/facter/facts/debian/dmi/board/manufacturer_spec.rb b/spec/facter/facts/linux/dmi/board/manufacturer_spec.rb similarity index 87% rename from spec/facter/facts/debian/dmi/board/manufacturer_spec.rb rename to spec/facter/facts/linux/dmi/board/manufacturer_spec.rb index 3ed1358e4..e6c869148 100644 --- a/spec/facter/facts/debian/dmi/board/manufacturer_spec.rb +++ b/spec/facter/facts/linux/dmi/board/manufacturer_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Board::Manufacturer do +describe Facts::Linux::Dmi::Board::Manufacturer do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Board::Manufacturer.new } + subject(:fact) { Facts::Linux::Dmi::Board::Manufacturer.new } let(:manufacturer) { 'Intel Corporation' } diff --git a/spec/facter/facts/debian/dmi/board/product_spec.rb b/spec/facter/facts/linux/dmi/board/product_spec.rb similarity index 87% rename from spec/facter/facts/debian/dmi/board/product_spec.rb rename to spec/facter/facts/linux/dmi/board/product_spec.rb index 39c059598..c79ccb4c0 100644 --- a/spec/facter/facts/debian/dmi/board/product_spec.rb +++ b/spec/facter/facts/linux/dmi/board/product_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Board::Product do +describe Facts::Linux::Dmi::Board::Product do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Board::Product.new } + subject(:fact) { Facts::Linux::Dmi::Board::Product.new } let(:product) { '440BX Desktop Reference Platform' } diff --git a/spec/facter/facts/debian/dmi/board/serial_number_spec.rb b/spec/facter/facts/linux/dmi/board/serial_number_spec.rb similarity index 86% rename from spec/facter/facts/debian/dmi/board/serial_number_spec.rb rename to spec/facter/facts/linux/dmi/board/serial_number_spec.rb index 2b463d007..f115ee716 100644 --- a/spec/facter/facts/debian/dmi/board/serial_number_spec.rb +++ b/spec/facter/facts/linux/dmi/board/serial_number_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Board::SerialNumber do +describe Facts::Linux::Dmi::Board::SerialNumber do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Board::SerialNumber.new } + subject(:fact) { Facts::Linux::Dmi::Board::SerialNumber.new } let(:serial_number) { 'None' } diff --git a/spec/facter/facts/debian/dmi/chassis/asset_tag_spec.rb b/spec/facter/facts/linux/dmi/chassis/asset_tag_spec.rb similarity index 86% rename from spec/facter/facts/debian/dmi/chassis/asset_tag_spec.rb rename to spec/facter/facts/linux/dmi/chassis/asset_tag_spec.rb index 75c900b4c..0a111a240 100644 --- a/spec/facter/facts/debian/dmi/chassis/asset_tag_spec.rb +++ b/spec/facter/facts/linux/dmi/chassis/asset_tag_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Chassis::AssetTag do +describe Facts::Linux::Dmi::Chassis::AssetTag do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Chassis::AssetTag.new } + subject(:fact) { Facts::Linux::Dmi::Chassis::AssetTag.new } let(:tag) { 'No Asset Tag' } diff --git a/spec/facter/facts/debian/dmi/chassis/type_spec.rb b/spec/facter/facts/linux/dmi/chassis/type_spec.rb similarity index 87% rename from spec/facter/facts/debian/dmi/chassis/type_spec.rb rename to spec/facter/facts/linux/dmi/chassis/type_spec.rb index a6a04e337..b098d501f 100644 --- a/spec/facter/facts/debian/dmi/chassis/type_spec.rb +++ b/spec/facter/facts/linux/dmi/chassis/type_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Chassis::Type do +describe Facts::Linux::Dmi::Chassis::Type do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Chassis::Type.new } + subject(:fact) { Facts::Linux::Dmi::Chassis::Type.new } let(:type) { 'Low Profile Desktop' } diff --git a/spec/facter/facts/debian/dmi/manufacturer_spec.rb b/spec/facter/facts/linux/dmi/manufacturer_spec.rb similarity index 87% rename from spec/facter/facts/debian/dmi/manufacturer_spec.rb rename to spec/facter/facts/linux/dmi/manufacturer_spec.rb index 7ae4c12cf..72e18ffd9 100644 --- a/spec/facter/facts/debian/dmi/manufacturer_spec.rb +++ b/spec/facter/facts/linux/dmi/manufacturer_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Manufacturer do +describe Facts::Linux::Dmi::Manufacturer do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Manufacturer.new } + subject(:fact) { Facts::Linux::Dmi::Manufacturer.new } let(:sys_vendor) { 'VMware, Inc.' } diff --git a/spec/facter/facts/debian/dmi/product/name_spec.rb b/spec/facter/facts/linux/dmi/product/name_spec.rb similarity index 88% rename from spec/facter/facts/debian/dmi/product/name_spec.rb rename to spec/facter/facts/linux/dmi/product/name_spec.rb index 8c6318d28..bd3cbbbc9 100644 --- a/spec/facter/facts/debian/dmi/product/name_spec.rb +++ b/spec/facter/facts/linux/dmi/product/name_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Dmi::Product::Name do +describe Facts::Linux::Dmi::Product::Name do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Dmi::Product::Name.new } + subject(:fact) { Facts::Linux::Dmi::Product::Name.new } let(:product_name) { 'VMware Virtual Platform' } diff --git a/spec/facter/facts/sles/dmi/product/serial_number_spec.rb b/spec/facter/facts/linux/dmi/product/serial_number_spec.rb similarity index 83% rename from spec/facter/facts/sles/dmi/product/serial_number_spec.rb rename to spec/facter/facts/linux/dmi/product/serial_number_spec.rb index a22d6d18e..0a4e3e5e5 100644 --- a/spec/facter/facts/sles/dmi/product/serial_number_spec.rb +++ b/spec/facter/facts/linux/dmi/product/serial_number_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Dmi::Product::SerialNumber do +describe Facts::Linux::Dmi::Product::SerialNumber do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Product::SerialNumber.new } + subject(:fact) { Facts::Linux::Dmi::Product::SerialNumber.new } let(:serial_number) { 'VMware-42 1a a9 29 31 8f fa e9-7d 69 2e 23 21 b0 0c 45' } @@ -16,7 +16,7 @@ expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:product_serial) end - it 'returns a resolved fact' do + it 'returns resolved facts' do expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ contain_exactly(an_object_having_attributes(name: 'dmi.product.serial_number', value: serial_number), an_object_having_attributes(name: 'serialnumber', value: serial_number, type: :legacy)) diff --git a/spec/facter/facts/sles/dmi/product/uuid_spec.rb b/spec/facter/facts/linux/dmi/product/uuid_spec.rb similarity index 84% rename from spec/facter/facts/sles/dmi/product/uuid_spec.rb rename to spec/facter/facts/linux/dmi/product/uuid_spec.rb index 22f6248a7..1bb20371c 100644 --- a/spec/facter/facts/sles/dmi/product/uuid_spec.rb +++ b/spec/facter/facts/linux/dmi/product/uuid_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Dmi::Product::Uuid do +describe Facts::Linux::Dmi::Product::Uuid do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Product::Uuid.new } + subject(:fact) { Facts::Linux::Dmi::Product::Uuid.new } let(:product_uuid) { '421aa929-318f-fae9-7d69-2e2321b00c45' } @@ -16,7 +16,7 @@ expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:product_uuid) end - it 'returns a resolved fact' do + it 'returns resolved facts' do expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ contain_exactly(an_object_having_attributes(name: 'dmi.product.uuid', value: product_uuid), an_object_having_attributes(name: 'uuid', value: product_uuid, type: :legacy)) diff --git a/spec/facter/facts/el/facterversion_spec.rb b/spec/facter/facts/linux/facterversion_spec.rb similarity index 86% rename from spec/facter/facts/el/facterversion_spec.rb rename to spec/facter/facts/linux/facterversion_spec.rb index 256eb4e6f..9f905509a 100644 --- a/spec/facter/facts/el/facterversion_spec.rb +++ b/spec/facter/facts/linux/facterversion_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Facterversion do +describe Facts::Linux::Facterversion do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Facterversion.new } + subject(:fact) { Facts::Linux::Facterversion.new } let(:value) { '4.0.3' } diff --git a/spec/facter/facts/debian/filesystems_spec.rb b/spec/facter/facts/linux/filesystems_spec.rb similarity index 87% rename from spec/facter/facts/debian/filesystems_spec.rb rename to spec/facter/facts/linux/filesystems_spec.rb index 5aabc6b56..b01801d38 100644 --- a/spec/facter/facts/debian/filesystems_spec.rb +++ b/spec/facter/facts/linux/filesystems_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Filesystems do +describe Facts::Linux::Filesystems do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Filesystems.new } + subject(:fact) { Facts::Linux::Filesystems.new } let(:value) { 'ext2,ext3,ext4,xfs' } diff --git a/spec/facter/facts/debian/fips_enabled_spec.rb b/spec/facter/facts/linux/fips_enabled_spec.rb similarity index 87% rename from spec/facter/facts/debian/fips_enabled_spec.rb rename to spec/facter/facts/linux/fips_enabled_spec.rb index a7530d053..08bf2240d 100644 --- a/spec/facter/facts/debian/fips_enabled_spec.rb +++ b/spec/facter/facts/linux/fips_enabled_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::FipsEnabled do +describe Facts::Linux::FipsEnabled do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::FipsEnabled.new } + subject(:fact) { Facts::Linux::FipsEnabled.new } let(:value) { true } diff --git a/spec/facter/facts/el/identity/gid_spec.rb b/spec/facter/facts/linux/identity/gid_spec.rb similarity index 86% rename from spec/facter/facts/el/identity/gid_spec.rb rename to spec/facter/facts/linux/identity/gid_spec.rb index 5fa610b65..975a25762 100644 --- a/spec/facter/facts/el/identity/gid_spec.rb +++ b/spec/facter/facts/linux/identity/gid_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Identity::Gid do +describe Facts::Linux::Identity::Gid do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Identity::Gid.new } + subject(:fact) { Facts::Linux::Identity::Gid.new } let(:value) { '20' } diff --git a/spec/facter/facts/sles/identity/group_spec.rb b/spec/facter/facts/linux/identity/group_spec.rb similarity index 87% rename from spec/facter/facts/sles/identity/group_spec.rb rename to spec/facter/facts/linux/identity/group_spec.rb index 780ce53cb..7962f7433 100644 --- a/spec/facter/facts/sles/identity/group_spec.rb +++ b/spec/facter/facts/linux/identity/group_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Identity::Group do +describe Facts::Linux::Identity::Group do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Identity::Group.new } + subject(:fact) { Facts::Linux::Identity::Group.new } let(:value) { 'staff' } diff --git a/spec/facter/facts/el/identity/privileged_spec.rb b/spec/facter/facts/linux/identity/privileged_spec.rb similarity index 84% rename from spec/facter/facts/el/identity/privileged_spec.rb rename to spec/facter/facts/linux/identity/privileged_spec.rb index bbf67a473..2f9d6851f 100644 --- a/spec/facter/facts/el/identity/privileged_spec.rb +++ b/spec/facter/facts/linux/identity/privileged_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Identity::Privileged do +describe Facts::Linux::Identity::Privileged do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Identity::Privileged.new } + subject(:fact) { Facts::Linux::Identity::Privileged.new } let(:value) { 'false' } diff --git a/spec/facter/facts/sles/identity/uid_spec.rb b/spec/facter/facts/linux/identity/uid_spec.rb similarity index 86% rename from spec/facter/facts/sles/identity/uid_spec.rb rename to spec/facter/facts/linux/identity/uid_spec.rb index 07eb9598e..0d55047ec 100644 --- a/spec/facter/facts/sles/identity/uid_spec.rb +++ b/spec/facter/facts/linux/identity/uid_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Identity::Uid do +describe Facts::Linux::Identity::Uid do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Identity::Uid.new } + subject(:fact) { Facts::Linux::Identity::Uid.new } let(:value) { '501' } diff --git a/spec/facter/facts/el/identity/user_spec.rb b/spec/facter/facts/linux/identity/user_spec.rb similarity index 87% rename from spec/facter/facts/el/identity/user_spec.rb rename to spec/facter/facts/linux/identity/user_spec.rb index 8df3d7001..ea42f48f7 100644 --- a/spec/facter/facts/el/identity/user_spec.rb +++ b/spec/facter/facts/linux/identity/user_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Identity::User do +describe Facts::Linux::Identity::User do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Identity::User.new } + subject(:fact) { Facts::Linux::Identity::User.new } let(:value) { 'testUser' } diff --git a/spec/facter/facts/el/interfaces_spec.rb b/spec/facter/facts/linux/interfaces_spec.rb similarity index 92% rename from spec/facter/facts/el/interfaces_spec.rb rename to spec/facter/facts/linux/interfaces_spec.rb index c516c71e4..46fa96c9a 100644 --- a/spec/facter/facts/el/interfaces_spec.rb +++ b/spec/facter/facts/linux/interfaces_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -describe Facts::El::Interfaces do - subject(:fact) { Facts::El::Interfaces.new } +describe Facts::Linux::Interfaces do + subject(:fact) { Facts::Linux::Interfaces.new } before do allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:interfaces).and_return(interfaces) diff --git a/spec/facter/facts/sles/kernel_spec.rb b/spec/facter/facts/linux/kernel_spec.rb similarity index 87% rename from spec/facter/facts/sles/kernel_spec.rb rename to spec/facter/facts/linux/kernel_spec.rb index 3d0bc66c8..60bbda53f 100644 --- a/spec/facter/facts/sles/kernel_spec.rb +++ b/spec/facter/facts/linux/kernel_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Kernel do +describe Facts::Linux::Kernel do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Kernel.new } + subject(:fact) { Facts::Linux::Kernel.new } let(:value) { 'Linux' } diff --git a/spec/facter/facts/el/kernelmajversion_spec.rb b/spec/facter/facts/linux/kernelmajversion_spec.rb similarity index 90% rename from spec/facter/facts/el/kernelmajversion_spec.rb rename to spec/facter/facts/linux/kernelmajversion_spec.rb index 3cd8ae0c4..fefac90f4 100644 --- a/spec/facter/facts/el/kernelmajversion_spec.rb +++ b/spec/facter/facts/linux/kernelmajversion_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -describe Facts::El::Kernelmajversion do - subject(:fact) { Facts::El::Kernelmajversion.new } +describe Facts::Linux::Kernelmajversion do + subject(:fact) { Facts::Linux::Kernelmajversion.new } let(:value) { '4.15' } diff --git a/spec/facter/facts/debian/kernelrelease_spec.rb b/spec/facter/facts/linux/kernelrelease_spec.rb similarity index 86% rename from spec/facter/facts/debian/kernelrelease_spec.rb rename to spec/facter/facts/linux/kernelrelease_spec.rb index 1183b0be4..3bfa6759d 100644 --- a/spec/facter/facts/debian/kernelrelease_spec.rb +++ b/spec/facter/facts/linux/kernelrelease_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Kernelrelease do +describe Facts::Linux::Kernelrelease do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Kernelrelease.new } + subject(:fact) { Facts::Linux::Kernelrelease.new } let(:value) { '6100-09-00-0000' } diff --git a/spec/facter/facts/debian/kernelversion_spec.rb b/spec/facter/facts/linux/kernelversion_spec.rb similarity index 91% rename from spec/facter/facts/debian/kernelversion_spec.rb rename to spec/facter/facts/linux/kernelversion_spec.rb index ba2f0d573..7a63631d4 100644 --- a/spec/facter/facts/debian/kernelversion_spec.rb +++ b/spec/facter/facts/linux/kernelversion_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -describe Facts::Debian::Kernelversion do - subject(:fact) { Facts::Debian::Kernelversion.new } +describe Facts::Linux::Kernelversion do + subject(:fact) { Facts::Linux::Kernelversion.new } let(:resolver_value) { '4.11' } diff --git a/spec/facter/facts/el/load_averages_spec.rb b/spec/facter/facts/linux/load_averages_spec.rb similarity index 88% rename from spec/facter/facts/el/load_averages_spec.rb rename to spec/facter/facts/linux/load_averages_spec.rb index 2f2f25391..b565dc4bd 100644 --- a/spec/facter/facts/el/load_averages_spec.rb +++ b/spec/facter/facts/linux/load_averages_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -describe Facts::El::LoadAverages do - subject(:fact) { Facts::El::LoadAverages.new } +describe Facts::Linux::LoadAverages do + subject(:fact) { Facts::Linux::LoadAverages.new } let(:averages) do { diff --git a/spec/facter/facts/debian/lsbdistrelease_spec.rb b/spec/facter/facts/linux/lsbdistrelease_spec.rb similarity index 96% rename from spec/facter/facts/debian/lsbdistrelease_spec.rb rename to spec/facter/facts/linux/lsbdistrelease_spec.rb index c7a0a0f72..26a2b56d1 100644 --- a/spec/facter/facts/debian/lsbdistrelease_spec.rb +++ b/spec/facter/facts/linux/lsbdistrelease_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Lsbdistrelease do +describe Facts::Linux::Lsbdistrelease do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Lsbdistrelease.new } + subject(:fact) { Facts::Linux::Lsbdistrelease.new } context 'when lsb-release is installed' do before do diff --git a/spec/facter/facts/debian/memory/swap/available_bytes_spec.rb b/spec/facter/facts/linux/memory/swap/available_bytes_spec.rb similarity index 90% rename from spec/facter/facts/debian/memory/swap/available_bytes_spec.rb rename to spec/facter/facts/linux/memory/swap/available_bytes_spec.rb index 1592aa8c5..f0725fb3b 100644 --- a/spec/facter/facts/debian/memory/swap/available_bytes_spec.rb +++ b/spec/facter/facts/linux/memory/swap/available_bytes_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::Swap::AvailableBytes do +describe Facts::Linux::Memory::Swap::AvailableBytes do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::Swap::AvailableBytes.new } + subject(:fact) { Facts::Linux::Memory::Swap::AvailableBytes.new } let(:value) { 2_332_425 } let(:value_mb) { 2.22 } diff --git a/spec/facter/facts/debian/memory/swap/available_spec.rb b/spec/facter/facts/linux/memory/swap/available_spec.rb similarity index 87% rename from spec/facter/facts/debian/memory/swap/available_spec.rb rename to spec/facter/facts/linux/memory/swap/available_spec.rb index 95acfedfa..11a54f57f 100644 --- a/spec/facter/facts/debian/memory/swap/available_spec.rb +++ b/spec/facter/facts/linux/memory/swap/available_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::Swap::Available do +describe Facts::Linux::Memory::Swap::Available do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::Swap::Available.new } + subject(:fact) { Facts::Linux::Memory::Swap::Available.new } let(:resolver_value) { 1024 } let(:value) { '1.00 KiB' } diff --git a/spec/facter/facts/debian/memory/swap/capacity_spec.rb b/spec/facter/facts/linux/memory/swap/capacity_spec.rb similarity index 84% rename from spec/facter/facts/debian/memory/swap/capacity_spec.rb rename to spec/facter/facts/linux/memory/swap/capacity_spec.rb index cdb04d037..acff4ae8b 100644 --- a/spec/facter/facts/debian/memory/swap/capacity_spec.rb +++ b/spec/facter/facts/linux/memory/swap/capacity_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::Swap::Capacity do +describe Facts::Linux::Memory::Swap::Capacity do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::Swap::Capacity.new } + subject(:fact) { Facts::Linux::Memory::Swap::Capacity.new } let(:value) { '7.4%' } diff --git a/spec/facter/facts/debian/memory/swap/total_bytes_spec.rb b/spec/facter/facts/linux/memory/swap/total_bytes_spec.rb similarity index 91% rename from spec/facter/facts/debian/memory/swap/total_bytes_spec.rb rename to spec/facter/facts/linux/memory/swap/total_bytes_spec.rb index 0dabf34b5..dbda1a0e6 100644 --- a/spec/facter/facts/debian/memory/swap/total_bytes_spec.rb +++ b/spec/facter/facts/linux/memory/swap/total_bytes_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::Swap::TotalBytes do +describe Facts::Linux::Memory::Swap::TotalBytes do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::Swap::TotalBytes.new } + subject(:fact) { Facts::Linux::Memory::Swap::TotalBytes.new } let(:value) { 2_332_425 } let(:value_mb) { 2.22 } diff --git a/spec/facter/facts/debian/memory/swap/total_spec.rb b/spec/facter/facts/linux/memory/swap/total_spec.rb similarity index 87% rename from spec/facter/facts/debian/memory/swap/total_spec.rb rename to spec/facter/facts/linux/memory/swap/total_spec.rb index 301900a5f..f5211b573 100644 --- a/spec/facter/facts/debian/memory/swap/total_spec.rb +++ b/spec/facter/facts/linux/memory/swap/total_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::Swap::Total do +describe Facts::Linux::Memory::Swap::Total do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::Swap::Total.new } + subject(:fact) { Facts::Linux::Memory::Swap::Total.new } let(:resolver_value) { 1024 } let(:value) { '1.00 KiB' } diff --git a/spec/facter/facts/debian/memory/swap/used_bytes_spec.rb b/spec/facter/facts/linux/memory/swap/used_bytes_spec.rb similarity index 84% rename from spec/facter/facts/debian/memory/swap/used_bytes_spec.rb rename to spec/facter/facts/linux/memory/swap/used_bytes_spec.rb index 22df97de7..0c813d94e 100644 --- a/spec/facter/facts/debian/memory/swap/used_bytes_spec.rb +++ b/spec/facter/facts/linux/memory/swap/used_bytes_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::Swap::UsedBytes do +describe Facts::Linux::Memory::Swap::UsedBytes do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::Swap::UsedBytes.new } + subject(:fact) { Facts::Linux::Memory::Swap::UsedBytes.new } let(:value) { 1024 } diff --git a/spec/facter/facts/debian/memory/swap/used_spec.rb b/spec/facter/facts/linux/memory/swap/used_spec.rb similarity index 86% rename from spec/facter/facts/debian/memory/swap/used_spec.rb rename to spec/facter/facts/linux/memory/swap/used_spec.rb index 7ae33427a..33d9d2c8a 100644 --- a/spec/facter/facts/debian/memory/swap/used_spec.rb +++ b/spec/facter/facts/linux/memory/swap/used_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::Swap::Used do +describe Facts::Linux::Memory::Swap::Used do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::Swap::Used.new } + subject(:fact) { Facts::Linux::Memory::Swap::Used.new } let(:resolver_value) { 1024 } let(:value) { '1.00 KiB' } diff --git a/spec/facter/facts/debian/memory/system/available_bytes_spec.rb b/spec/facter/facts/linux/memory/system/available_bytes_spec.rb similarity index 90% rename from spec/facter/facts/debian/memory/system/available_bytes_spec.rb rename to spec/facter/facts/linux/memory/system/available_bytes_spec.rb index 5fc34e152..f6b5408fe 100644 --- a/spec/facter/facts/debian/memory/system/available_bytes_spec.rb +++ b/spec/facter/facts/linux/memory/system/available_bytes_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::System::AvailableBytes do +describe Facts::Linux::Memory::System::AvailableBytes do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::System::AvailableBytes.new } + subject(:fact) { Facts::Linux::Memory::System::AvailableBytes.new } let(:value) { 2_332_425 } let(:value_mb) { 2.22 } diff --git a/spec/facter/facts/debian/memory/system/available_spec.rb b/spec/facter/facts/linux/memory/system/available_spec.rb similarity index 86% rename from spec/facter/facts/debian/memory/system/available_spec.rb rename to spec/facter/facts/linux/memory/system/available_spec.rb index 85a5f6dd1..0cebbeb07 100644 --- a/spec/facter/facts/debian/memory/system/available_spec.rb +++ b/spec/facter/facts/linux/memory/system/available_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::System::Available do +describe Facts::Linux::Memory::System::Available do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::System::Available.new } + subject(:fact) { Facts::Linux::Memory::System::Available.new } let(:resolver_value) { 1024 } let(:value) { '1.00 KiB' } diff --git a/spec/facter/facts/debian/memory/system/capacity_spec.rb b/spec/facter/facts/linux/memory/system/capacity_spec.rb similarity index 84% rename from spec/facter/facts/debian/memory/system/capacity_spec.rb rename to spec/facter/facts/linux/memory/system/capacity_spec.rb index 4f87d4b27..28df426ea 100644 --- a/spec/facter/facts/debian/memory/system/capacity_spec.rb +++ b/spec/facter/facts/linux/memory/system/capacity_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::System::Capacity do +describe Facts::Linux::Memory::System::Capacity do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::System::Capacity.new } + subject(:fact) { Facts::Linux::Memory::System::Capacity.new } let(:value) { '5.3%' } diff --git a/spec/facter/facts/debian/memory/system/total_bytes_spec.rb b/spec/facter/facts/linux/memory/system/total_bytes_spec.rb similarity index 90% rename from spec/facter/facts/debian/memory/system/total_bytes_spec.rb rename to spec/facter/facts/linux/memory/system/total_bytes_spec.rb index d36a4c211..1d9a932a1 100644 --- a/spec/facter/facts/debian/memory/system/total_bytes_spec.rb +++ b/spec/facter/facts/linux/memory/system/total_bytes_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::System::TotalBytes do +describe Facts::Linux::Memory::System::TotalBytes do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::System::TotalBytes.new } + subject(:fact) { Facts::Linux::Memory::System::TotalBytes.new } let(:value) { 2_332_425 } let(:value_mb) { 2.22 } diff --git a/spec/facter/facts/debian/memory/system/total_spec.rb b/spec/facter/facts/linux/memory/system/total_spec.rb similarity index 87% rename from spec/facter/facts/debian/memory/system/total_spec.rb rename to spec/facter/facts/linux/memory/system/total_spec.rb index 7a8808e41..6f4c6f1f6 100644 --- a/spec/facter/facts/debian/memory/system/total_spec.rb +++ b/spec/facter/facts/linux/memory/system/total_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::System::Total do +describe Facts::Linux::Memory::System::Total do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::System::Total.new } + subject(:fact) { Facts::Linux::Memory::System::Total.new } let(:resolver_value) { 1024 } let(:value) { '1.00 KiB' } diff --git a/spec/facter/facts/debian/memory/system/used_bytes_spec.rb b/spec/facter/facts/linux/memory/system/used_bytes_spec.rb similarity index 84% rename from spec/facter/facts/debian/memory/system/used_bytes_spec.rb rename to spec/facter/facts/linux/memory/system/used_bytes_spec.rb index a367667f4..c80ee00b6 100644 --- a/spec/facter/facts/debian/memory/system/used_bytes_spec.rb +++ b/spec/facter/facts/linux/memory/system/used_bytes_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::System::UsedBytes do +describe Facts::Linux::Memory::System::UsedBytes do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::System::UsedBytes.new } + subject(:fact) { Facts::Linux::Memory::System::UsedBytes.new } let(:value) { 1024 } diff --git a/spec/facter/facts/debian/memory/system/used_spec.rb b/spec/facter/facts/linux/memory/system/used_spec.rb similarity index 85% rename from spec/facter/facts/debian/memory/system/used_spec.rb rename to spec/facter/facts/linux/memory/system/used_spec.rb index 081812e1e..4bc68bbb0 100644 --- a/spec/facter/facts/debian/memory/system/used_spec.rb +++ b/spec/facter/facts/linux/memory/system/used_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Memory::System::Used do +describe Facts::Linux::Memory::System::Used do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Memory::System::Used.new } + subject(:fact) { Facts::Linux::Memory::System::Used.new } let(:resolver_value) { 1024 } let(:value) { '1.00 KiB' } diff --git a/spec/facter/facts/sles/mountpoints_spec.rb b/spec/facter/facts/linux/mountpoints_spec.rb similarity index 95% rename from spec/facter/facts/sles/mountpoints_spec.rb rename to spec/facter/facts/linux/mountpoints_spec.rb index c27588497..b2a9fc4c5 100644 --- a/spec/facter/facts/sles/mountpoints_spec.rb +++ b/spec/facter/facts/linux/mountpoints_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Mountpoints do +describe Facts::Linux::Mountpoints do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Mountpoints.new } + subject(:fact) { Facts::Linux::Mountpoints.new } context 'when resolver returns hash' do let(:resolver_output) do diff --git a/spec/facter/facts/sles/networking/domain_spec.rb b/spec/facter/facts/linux/networking/domain_spec.rb similarity index 86% rename from spec/facter/facts/sles/networking/domain_spec.rb rename to spec/facter/facts/linux/networking/domain_spec.rb index 581787d2b..0202f6b15 100644 --- a/spec/facter/facts/sles/networking/domain_spec.rb +++ b/spec/facter/facts/linux/networking/domain_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Networking::Domain do +describe Facts::Linux::Networking::Domain do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Networking::Domain.new } + subject(:fact) { Facts::Linux::Networking::Domain.new } let(:value) { 'domain' } diff --git a/spec/facter/facts/sles/networking/fqdn_spec.rb b/spec/facter/facts/linux/networking/fqdn_spec.rb similarity index 87% rename from spec/facter/facts/sles/networking/fqdn_spec.rb rename to spec/facter/facts/linux/networking/fqdn_spec.rb index c697657f2..8f56cb41b 100644 --- a/spec/facter/facts/sles/networking/fqdn_spec.rb +++ b/spec/facter/facts/linux/networking/fqdn_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Networking::Fqdn do +describe Facts::Linux::Networking::Fqdn do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Networking::Fqdn.new } + subject(:fact) { Facts::Linux::Networking::Fqdn.new } let(:value) { 'host.domain' } diff --git a/spec/facter/facts/el/networking/hostname_spec.rb b/spec/facter/facts/linux/networking/hostname_spec.rb similarity index 86% rename from spec/facter/facts/el/networking/hostname_spec.rb rename to spec/facter/facts/linux/networking/hostname_spec.rb index 215c043c5..06e2f927a 100644 --- a/spec/facter/facts/el/networking/hostname_spec.rb +++ b/spec/facter/facts/linux/networking/hostname_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Networking::Hostname do +describe Facts::Linux::Networking::Hostname do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Networking::Hostname.new } + subject(:fact) { Facts::Linux::Networking::Hostname.new } let(:value) { 'host' } diff --git a/spec/facter/facts/el/networking/interfaces_spec.rb b/spec/facter/facts/linux/networking/interfaces_spec.rb similarity index 88% rename from spec/facter/facts/el/networking/interfaces_spec.rb rename to spec/facter/facts/linux/networking/interfaces_spec.rb index 757139da8..dad6e02ee 100644 --- a/spec/facter/facts/el/networking/interfaces_spec.rb +++ b/spec/facter/facts/linux/networking/interfaces_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Networking::Interfaces do +describe Facts::Linux::Networking::Interfaces do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Networking::Interfaces.new } + subject(:fact) { Facts::Linux::Networking::Interfaces.new } let(:value) do { diff --git a/spec/facter/facts/el/networking/ip_spec.rb b/spec/facter/facts/linux/networking/ip_spec.rb similarity index 88% rename from spec/facter/facts/el/networking/ip_spec.rb rename to spec/facter/facts/linux/networking/ip_spec.rb index 9a746de14..76b28a1f6 100644 --- a/spec/facter/facts/el/networking/ip_spec.rb +++ b/spec/facter/facts/linux/networking/ip_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Networking::Ip do +describe Facts::Linux::Networking::Ip do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Networking::Ip.new } + subject(:fact) { Facts::Linux::Networking::Ip.new } let(:value) { '10.16.122.163' } diff --git a/spec/facter/facts/el/networking/mac_spec.rb b/spec/facter/facts/linux/networking/mac_spec.rb similarity index 88% rename from spec/facter/facts/el/networking/mac_spec.rb rename to spec/facter/facts/linux/networking/mac_spec.rb index 5afa41127..c16667e07 100644 --- a/spec/facter/facts/el/networking/mac_spec.rb +++ b/spec/facter/facts/linux/networking/mac_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Networking::Mac do +describe Facts::Linux::Networking::Mac do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Networking::Mac.new } + subject(:fact) { Facts::Linux::Networking::Mac.new } let(:value) { '64:5a:ed:ea:c3:25' } diff --git a/spec/facter/facts/el/networking/primary_spec.rb b/spec/facter/facts/linux/networking/primary_spec.rb similarity index 85% rename from spec/facter/facts/el/networking/primary_spec.rb rename to spec/facter/facts/linux/networking/primary_spec.rb index af64fe90e..03e775369 100644 --- a/spec/facter/facts/el/networking/primary_spec.rb +++ b/spec/facter/facts/linux/networking/primary_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Networking::Primary do +describe Facts::Linux::Networking::Primary do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Networking::Primary.new } + subject(:fact) { Facts::Linux::Networking::Primary.new } let(:value) { 'ens160' } diff --git a/spec/facter/facts/el/os/architecture_spec.rb b/spec/facter/facts/linux/os/architecture_spec.rb similarity index 87% rename from spec/facter/facts/el/os/architecture_spec.rb rename to spec/facter/facts/linux/os/architecture_spec.rb index 545800c3f..ac708100d 100644 --- a/spec/facter/facts/el/os/architecture_spec.rb +++ b/spec/facter/facts/linux/os/architecture_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Architecture do +describe Facts::Linux::Os::Architecture do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Architecture.new } + subject(:fact) { Facts::Linux::Os::Architecture.new } let(:value) { 'x86_64' } diff --git a/spec/facter/facts/linux/os/distro/codename_spec.rb b/spec/facter/facts/linux/os/distro/codename_spec.rb new file mode 100644 index 000000000..48b2eb31c --- /dev/null +++ b/spec/facter/facts/linux/os/distro/codename_spec.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +describe Facts::Linux::Os::Distro::Codename do + describe '#call_the_resolver' do + subject(:fact) { Facts::Linux::Os::Distro::Codename.new } + + let(:value) { 'Core' } + + before do + allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:codename).and_return(value) + end + + it 'calls Facter::Resolvers::LsbRelease' do + fact.call_the_resolver + expect(Facter::Resolvers::LsbRelease).to have_received(:resolve).with(:codename) + end + + it 'returns release fact' do + expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ + contain_exactly(an_object_having_attributes(name: 'os.distro.codename', value: value), + an_object_having_attributes(name: 'lsbdistcodename', value: value, type: :legacy)) + end + end +end diff --git a/spec/facter/facts/linux/os/distro/description_spec.rb b/spec/facter/facts/linux/os/distro/description_spec.rb new file mode 100644 index 000000000..db3262c0f --- /dev/null +++ b/spec/facter/facts/linux/os/distro/description_spec.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +describe Facts::Linux::Os::Distro::Description do + describe '#call_the_resolver' do + subject(:fact) { Facts::Linux::Os::Distro::Description.new } + + let(:value) { 'CentOS Linux release 7.2.1511 (Core)' } + + before do + allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:description).and_return(value) + end + + it 'calls Facter::Resolvers::LsbRelease' do + fact.call_the_resolver + expect(Facter::Resolvers::LsbRelease).to have_received(:resolve).with(:description) + end + + it 'returns release fact' do + expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ + contain_exactly(an_object_having_attributes(name: 'os.distro.description', value: value), + an_object_having_attributes(name: 'lsbdistdescription', value: value, type: :legacy)) + end + end +end diff --git a/spec/facter/facts/linux/os/distro/id_spec.rb b/spec/facter/facts/linux/os/distro/id_spec.rb new file mode 100644 index 000000000..774ff6c03 --- /dev/null +++ b/spec/facter/facts/linux/os/distro/id_spec.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +describe Facts::Linux::Os::Distro::Id do + describe '#call_the_resolver' do + subject(:fact) { Facts::Linux::Os::Distro::Id.new } + + let(:value) { 'CentOS' } + + before do + allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:distributor_id).and_return(value) + end + + it 'calls Facter::Resolvers::LsbRelease' do + fact.call_the_resolver + expect(Facter::Resolvers::LsbRelease).to have_received(:resolve).with(:distributor_id) + end + + it 'returns release fact' do + expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ + contain_exactly(an_object_having_attributes(name: 'os.distro.id', value: value), + an_object_having_attributes(name: 'lsbdistid', value: value, type: :legacy)) + end + end +end diff --git a/spec/facter/facts/linux/os/distro/release_spec.rb b/spec/facter/facts/linux/os/distro/release_spec.rb new file mode 100644 index 000000000..8cf091825 --- /dev/null +++ b/spec/facter/facts/linux/os/distro/release_spec.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +describe Facts::Linux::Os::Distro::Release do + describe '#call_the_resolver' do + subject(:fact) { Facts::Linux::Os::Distro::Release.new } + + let(:value) { '7.2.1511' } + let(:release) { { 'full' => '7.2.1511', 'major' => '7', 'minor' => '2' } } + + before do + allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:release).and_return(value) + end + + it 'calls Facter::Resolvers::LsbRelease' do + fact.call_the_resolver + expect(Facter::Resolvers::LsbRelease).to have_received(:resolve).with(:release) + end + + it 'returns release fact' do + expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ + contain_exactly(an_object_having_attributes(name: 'os.distro.release', value: release), + an_object_having_attributes(name: 'lsbdistrelease', value: value, type: :legacy), + an_object_having_attributes(name: 'lsbmajdistrelease', + value: release['major'], type: :legacy), + an_object_having_attributes(name: 'lsbminordistrelease', + value: release['minor'], type: :legacy)) + end + + context 'when lsb_release is not installed' do + let(:value) { nil } + + before do + allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:release).and_return(value) + end + + it 'returns release fact' do + expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact) + .and have_attributes(name: 'os.distro.release', value: value) + end + end + end +end diff --git a/spec/facter/facts/el/os/distro/specification_spec.rb b/spec/facter/facts/linux/os/distro/specification_spec.rb similarity index 86% rename from spec/facter/facts/el/os/distro/specification_spec.rb rename to spec/facter/facts/linux/os/distro/specification_spec.rb index 76fe7f1c0..1771e178e 100644 --- a/spec/facter/facts/el/os/distro/specification_spec.rb +++ b/spec/facter/facts/linux/os/distro/specification_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Distro::Specification do +describe Facts::Linux::Os::Distro::Specification do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Distro::Specification.new } + subject(:fact) { Facts::Linux::Os::Distro::Specification.new } let(:value) { ':core-4.1-amd64:core-4.1-noarch:cxx-4.1-amd64' } diff --git a/spec/facter/facts/debian/os/family_spec.rb b/spec/facter/facts/linux/os/family_spec.rb similarity index 95% rename from spec/facter/facts/debian/os/family_spec.rb rename to spec/facter/facts/linux/os/family_spec.rb index 49cc40f48..3e4f26077 100644 --- a/spec/facter/facts/debian/os/family_spec.rb +++ b/spec/facter/facts/linux/os/family_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Os::Family do +describe Facts::Linux::Os::Family do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Family.new } + subject(:fact) { Facts::Linux::Os::Family.new } let(:value) { 'Debian' } diff --git a/spec/facter/facts/debian/os/hardware_spec.rb b/spec/facter/facts/linux/os/hardware_spec.rb similarity index 87% rename from spec/facter/facts/debian/os/hardware_spec.rb rename to spec/facter/facts/linux/os/hardware_spec.rb index 767cbfb57..90b3317f3 100644 --- a/spec/facter/facts/debian/os/hardware_spec.rb +++ b/spec/facter/facts/linux/os/hardware_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Os::Hardware do +describe Facts::Linux::Os::Hardware do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Hardware.new } + subject(:fact) { Facts::Linux::Os::Hardware.new } let(:value) { 'x86_64' } diff --git a/spec/facter/facts/debian/os/name_spec.rb b/spec/facter/facts/linux/os/name_spec.rb similarity index 89% rename from spec/facter/facts/debian/os/name_spec.rb rename to spec/facter/facts/linux/os/name_spec.rb index 3b04652d7..0657ab55e 100644 --- a/spec/facter/facts/debian/os/name_spec.rb +++ b/spec/facter/facts/linux/os/name_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Os::Name do +describe Facts::Linux::Os::Name do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Os::Name.new } + subject(:fact) { Facts::Linux::Os::Name.new } let(:value) { 'Debian' } diff --git a/spec/facter/facts/el/os/release_spec.rb b/spec/facter/facts/linux/os/release_spec.rb similarity index 90% rename from spec/facter/facts/el/os/release_spec.rb rename to spec/facter/facts/linux/os/release_spec.rb index b29cc97f1..adb6d572e 100644 --- a/spec/facter/facts/el/os/release_spec.rb +++ b/spec/facter/facts/linux/os/release_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Release do +describe Facts::Linux::Os::Release do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Release.new } + subject(:fact) { Facts::Linux::Os::Release.new } let(:value) { '10.9' } diff --git a/spec/facter/facts/sles/os/selinux/config_mode_spec.rb b/spec/facter/facts/linux/os/selinux/config_mode_spec.rb similarity index 86% rename from spec/facter/facts/sles/os/selinux/config_mode_spec.rb rename to spec/facter/facts/linux/os/selinux/config_mode_spec.rb index 26a8a8b37..701b9745b 100644 --- a/spec/facter/facts/sles/os/selinux/config_mode_spec.rb +++ b/spec/facter/facts/linux/os/selinux/config_mode_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Os::Selinux::ConfigMode do +describe Facts::Linux::Os::Selinux::ConfigMode do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Selinux::ConfigMode.new } + subject(:fact) { Facts::Linux::Os::Selinux::ConfigMode.new } let(:config_mode) { 'enabled' } diff --git a/spec/facter/facts/el/os/selinux/config_policy_spec.rb b/spec/facter/facts/linux/os/selinux/config_policy_spec.rb similarity index 86% rename from spec/facter/facts/el/os/selinux/config_policy_spec.rb rename to spec/facter/facts/linux/os/selinux/config_policy_spec.rb index 1181a9e1a..0cba8a3f8 100644 --- a/spec/facter/facts/el/os/selinux/config_policy_spec.rb +++ b/spec/facter/facts/linux/os/selinux/config_policy_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Selinux::ConfigPolicy do +describe Facts::Linux::Os::Selinux::ConfigPolicy do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Selinux::ConfigPolicy.new } + subject(:fact) { Facts::Linux::Os::Selinux::ConfigPolicy.new } let(:config_policy) { 'targeted' } diff --git a/spec/facter/facts/el/os/selinux/current_mode_spec.rb b/spec/facter/facts/linux/os/selinux/current_mode_spec.rb similarity index 86% rename from spec/facter/facts/el/os/selinux/current_mode_spec.rb rename to spec/facter/facts/linux/os/selinux/current_mode_spec.rb index cced41372..5c7d187e9 100644 --- a/spec/facter/facts/el/os/selinux/current_mode_spec.rb +++ b/spec/facter/facts/linux/os/selinux/current_mode_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Selinux::CurrentMode do +describe Facts::Linux::Os::Selinux::CurrentMode do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Selinux::CurrentMode.new } + subject(:fact) { Facts::Linux::Os::Selinux::CurrentMode.new } let(:current_mode) { 'permissive' } diff --git a/spec/facter/facts/el/os/selinux/enabled_spec.rb b/spec/facter/facts/linux/os/selinux/enabled_spec.rb similarity index 86% rename from spec/facter/facts/el/os/selinux/enabled_spec.rb rename to spec/facter/facts/linux/os/selinux/enabled_spec.rb index 769ab23ad..a71e7d276 100644 --- a/spec/facter/facts/el/os/selinux/enabled_spec.rb +++ b/spec/facter/facts/linux/os/selinux/enabled_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Selinux::Enabled do +describe Facts::Linux::Os::Selinux::Enabled do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Selinux::Enabled.new } + subject(:fact) { Facts::Linux::Os::Selinux::Enabled.new } let(:enabled) { true } diff --git a/spec/facter/facts/sles/os/selinux/enforced_spec.rb b/spec/facter/facts/linux/os/selinux/enforced_spec.rb similarity index 86% rename from spec/facter/facts/sles/os/selinux/enforced_spec.rb rename to spec/facter/facts/linux/os/selinux/enforced_spec.rb index b8745f6cb..1ad3bec4a 100644 --- a/spec/facter/facts/sles/os/selinux/enforced_spec.rb +++ b/spec/facter/facts/linux/os/selinux/enforced_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Os::Selinux::Enforced do +describe Facts::Linux::Os::Selinux::Enforced do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Selinux::Enforced.new } + subject(:fact) { Facts::Linux::Os::Selinux::Enforced.new } let(:enforced) { false } diff --git a/spec/facter/facts/el/os/selinux/policy_version_spec.rb b/spec/facter/facts/linux/os/selinux/policy_version_spec.rb similarity index 87% rename from spec/facter/facts/el/os/selinux/policy_version_spec.rb rename to spec/facter/facts/linux/os/selinux/policy_version_spec.rb index 93b1c34cd..b902f846d 100644 --- a/spec/facter/facts/el/os/selinux/policy_version_spec.rb +++ b/spec/facter/facts/linux/os/selinux/policy_version_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Selinux::PolicyVersion do +describe Facts::Linux::Os::Selinux::PolicyVersion do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Selinux::PolicyVersion.new } + subject(:fact) { Facts::Linux::Os::Selinux::PolicyVersion.new } let(:policy_version) { '31' } diff --git a/spec/facter/facts/sles/partitions_spec.rb b/spec/facter/facts/linux/partitions_spec.rb similarity index 97% rename from spec/facter/facts/sles/partitions_spec.rb rename to spec/facter/facts/linux/partitions_spec.rb index cbeddd619..c9b77df4e 100644 --- a/spec/facter/facts/sles/partitions_spec.rb +++ b/spec/facter/facts/linux/partitions_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Partitions do +describe Facts::Linux::Partitions do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Partitions.new } + subject(:fact) { Facts::Linux::Partitions.new } let(:mountpoints_resolver_output) do [{ available: '63.31 GiB', diff --git a/spec/facter/facts/el/path_spec.rb b/spec/facter/facts/linux/path_spec.rb similarity index 89% rename from spec/facter/facts/el/path_spec.rb rename to spec/facter/facts/linux/path_spec.rb index 842a32634..d0e28052e 100644 --- a/spec/facter/facts/el/path_spec.rb +++ b/spec/facter/facts/linux/path_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Path do +describe Facts::Linux::Path do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Path.new } + subject(:fact) { Facts::Linux::Path.new } let(:value) { '/usr/bin:/etc:/usr/sbin:/usr/ucb:/usr/bin/X11:/sbin:/usr/java6/jre/bin:/usr/java6/bin' } diff --git a/spec/facter/facts/sles/processor_spec.rb b/spec/facter/facts/linux/processor_spec.rb similarity index 90% rename from spec/facter/facts/sles/processor_spec.rb rename to spec/facter/facts/linux/processor_spec.rb index f93c6bda9..aec0cd3bd 100644 --- a/spec/facter/facts/sles/processor_spec.rb +++ b/spec/facter/facts/linux/processor_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Processor do +describe Facts::Linux::Processor do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Processor.new } + subject(:fact) { Facts::Linux::Processor.new } let(:processor) { ['Intel(R) Xeon(R) Gold 6138 CPU @ 2.00GHz', 'Intel(R) Xeon(R) Gold 6138 CPU @ 2.00GHz'] } diff --git a/spec/facter/facts/debian/processors/count_spec.rb b/spec/facter/facts/linux/processors/count_spec.rb similarity index 88% rename from spec/facter/facts/debian/processors/count_spec.rb rename to spec/facter/facts/linux/processors/count_spec.rb index 490fdd899..88dcf6efb 100644 --- a/spec/facter/facts/debian/processors/count_spec.rb +++ b/spec/facter/facts/linux/processors/count_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Processors::Count do +describe Facts::Linux::Processors::Count do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Processors::Count.new } + subject(:fact) { Facts::Linux::Processors::Count.new } let(:processors_count) { '4' } diff --git a/spec/facter/facts/debian/processors/isa_spec.rb b/spec/facter/facts/linux/processors/isa_spec.rb similarity index 88% rename from spec/facter/facts/debian/processors/isa_spec.rb rename to spec/facter/facts/linux/processors/isa_spec.rb index 387efe07a..0ff5fa8e6 100644 --- a/spec/facter/facts/debian/processors/isa_spec.rb +++ b/spec/facter/facts/linux/processors/isa_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Processors::Isa do +describe Facts::Linux::Processors::Isa do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Processors::Isa.new } + subject(:fact) { Facts::Linux::Processors::Isa.new } let(:processors_arch) { 'x86_64' } diff --git a/spec/facter/facts/debian/processors/models_spec.rb b/spec/facter/facts/linux/processors/models_spec.rb similarity index 86% rename from spec/facter/facts/debian/processors/models_spec.rb rename to spec/facter/facts/linux/processors/models_spec.rb index 8276c7f0c..4bf2dadf6 100644 --- a/spec/facter/facts/debian/processors/models_spec.rb +++ b/spec/facter/facts/linux/processors/models_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Processors::Models do +describe Facts::Linux::Processors::Models do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Processors::Models.new } + subject(:fact) { Facts::Linux::Processors::Models.new } let(:models) { ['Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz', 'Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz'] } diff --git a/spec/facter/facts/debian/processors/physicalcount_spec.rb b/spec/facter/facts/linux/processors/physicalcount_spec.rb similarity index 88% rename from spec/facter/facts/debian/processors/physicalcount_spec.rb rename to spec/facter/facts/linux/processors/physicalcount_spec.rb index 8d9af13ff..29331ea63 100644 --- a/spec/facter/facts/debian/processors/physicalcount_spec.rb +++ b/spec/facter/facts/linux/processors/physicalcount_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Processors::Physicalcount do +describe Facts::Linux::Processors::Physicalcount do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Processors::Physicalcount.new } + subject(:fact) { Facts::Linux::Processors::Physicalcount.new } let(:physical_count) { '2' } diff --git a/spec/facter/facts/el/puppet_version_spec.rb b/spec/facter/facts/linux/puppet_version_spec.rb similarity index 87% rename from spec/facter/facts/el/puppet_version_spec.rb rename to spec/facter/facts/linux/puppet_version_spec.rb index e7151ae54..c90f8c690 100644 --- a/spec/facter/facts/el/puppet_version_spec.rb +++ b/spec/facter/facts/linux/puppet_version_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::PuppetVersion do +describe Facts::Linux::PuppetVersion do describe '#call_the_resolver' do - subject(:fact) { Facts::El::PuppetVersion.new } + subject(:fact) { Facts::Linux::PuppetVersion.new } let(:puppet_version) { '6.11.0' } diff --git a/spec/facter/facts/sles/ruby/platform_spec.rb b/spec/facter/facts/linux/ruby/platform_spec.rb similarity index 87% rename from spec/facter/facts/sles/ruby/platform_spec.rb rename to spec/facter/facts/linux/ruby/platform_spec.rb index 0cc115203..ef39d4d66 100644 --- a/spec/facter/facts/sles/ruby/platform_spec.rb +++ b/spec/facter/facts/linux/ruby/platform_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::Ruby::Platform do +describe Facts::Linux::Ruby::Platform do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Ruby::Platform.new } + subject(:fact) { Facts::Linux::Ruby::Platform.new } let(:value) { 'x86_64-linux' } diff --git a/spec/facter/facts/debian/ruby/sitedir_spec.rb b/spec/facter/facts/linux/ruby/sitedir_spec.rb similarity index 88% rename from spec/facter/facts/debian/ruby/sitedir_spec.rb rename to spec/facter/facts/linux/ruby/sitedir_spec.rb index 797dd01a8..636eb93b8 100644 --- a/spec/facter/facts/debian/ruby/sitedir_spec.rb +++ b/spec/facter/facts/linux/ruby/sitedir_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Ruby::Sitedir do +describe Facts::Linux::Ruby::Sitedir do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Ruby::Sitedir.new } + subject(:fact) { Facts::Linux::Ruby::Sitedir.new } let(:value) { '/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.6.3' } diff --git a/spec/facter/facts/debian/ruby/version_spec.rb b/spec/facter/facts/linux/ruby/version_spec.rb similarity index 87% rename from spec/facter/facts/debian/ruby/version_spec.rb rename to spec/facter/facts/linux/ruby/version_spec.rb index e5bb79148..868b6c50f 100644 --- a/spec/facter/facts/debian/ruby/version_spec.rb +++ b/spec/facter/facts/linux/ruby/version_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Ruby::Version do +describe Facts::Linux::Ruby::Version do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Ruby::Version.new } + subject(:fact) { Facts::Linux::Ruby::Version.new } let(:value) { '2.4.5' } diff --git a/spec/facter/facts/debian/ssh_spec.rb b/spec/facter/facts/linux/ssh_spec.rb similarity index 91% rename from spec/facter/facts/debian/ssh_spec.rb rename to spec/facter/facts/linux/ssh_spec.rb index 0f620eba7..a3dee267d 100644 --- a/spec/facter/facts/debian/ssh_spec.rb +++ b/spec/facter/facts/linux/ssh_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Ssh do +describe Facts::Linux::Ssh do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Ssh.new } + subject(:fact) { Facts::Linux::Ssh.new } let(:ssh) do [Facter::Ssh.new(Facter::FingerPrint.new('test', 'test'), 'ecdsa', 'test', 'ecdsa')] diff --git a/spec/facter/facts/el/sshalgorithmkey_spec.rb b/spec/facter/facts/linux/sshalgorithmkey_spec.rb similarity index 91% rename from spec/facter/facts/el/sshalgorithmkey_spec.rb rename to spec/facter/facts/linux/sshalgorithmkey_spec.rb index 77a30a315..500a35c5b 100644 --- a/spec/facter/facts/el/sshalgorithmkey_spec.rb +++ b/spec/facter/facts/linux/sshalgorithmkey_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Sshalgorithmkey do +describe Facts::Linux::Sshalgorithmkey do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Sshalgorithmkey.new } + subject(:fact) { Facts::Linux::Sshalgorithmkey.new } let(:ssh) do [Facter::Ssh.new(Facter::FingerPrint.new('test', 'test'), 'ecdsa', 'test', 'ecdsa'), diff --git a/spec/facter/facts/sles/sshfp_algorithm_spec.rb b/spec/facter/facts/linux/sshfp_algorithm_spec.rb similarity index 91% rename from spec/facter/facts/sles/sshfp_algorithm_spec.rb rename to spec/facter/facts/linux/sshfp_algorithm_spec.rb index c0480984c..ed35e6b7b 100644 --- a/spec/facter/facts/sles/sshfp_algorithm_spec.rb +++ b/spec/facter/facts/linux/sshfp_algorithm_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Sles::SshfpAlgorithm do +describe Facts::Linux::SshfpAlgorithm do describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::SshfpAlgorithm.new } + subject(:fact) { Facts::Linux::SshfpAlgorithm.new } let(:ssh) do [Facter::Ssh.new(Facter::FingerPrint.new('sha11', 'sha2561'), 'ecdsa', 'test', 'ecdsa'), diff --git a/spec/facter/facts/el/system_uptime/days_spec.rb b/spec/facter/facts/linux/system_uptime/days_spec.rb similarity index 86% rename from spec/facter/facts/el/system_uptime/days_spec.rb rename to spec/facter/facts/linux/system_uptime/days_spec.rb index 9c94394b0..42d40e2ff 100644 --- a/spec/facter/facts/el/system_uptime/days_spec.rb +++ b/spec/facter/facts/linux/system_uptime/days_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::SystemUptime::Days do +describe Facts::Linux::SystemUptime::Days do describe '#call_the_resolver' do - subject(:fact) { Facts::El::SystemUptime::Days.new } + subject(:fact) { Facts::Linux::SystemUptime::Days.new } let(:value) { '2' } diff --git a/spec/facter/facts/debian/system_uptime/hours_spec.rb b/spec/facter/facts/linux/system_uptime/hours_spec.rb similarity index 86% rename from spec/facter/facts/debian/system_uptime/hours_spec.rb rename to spec/facter/facts/linux/system_uptime/hours_spec.rb index 41c648c9c..9137aaf35 100644 --- a/spec/facter/facts/debian/system_uptime/hours_spec.rb +++ b/spec/facter/facts/linux/system_uptime/hours_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::SystemUptime::Hours do +describe Facts::Linux::SystemUptime::Hours do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::SystemUptime::Hours.new } + subject(:fact) { Facts::Linux::SystemUptime::Hours.new } let(:value) { '2' } diff --git a/spec/facter/facts/debian/system_uptime/seconds_spec.rb b/spec/facter/facts/linux/system_uptime/seconds_spec.rb similarity index 86% rename from spec/facter/facts/debian/system_uptime/seconds_spec.rb rename to spec/facter/facts/linux/system_uptime/seconds_spec.rb index 678eb7f85..5a2644c03 100644 --- a/spec/facter/facts/debian/system_uptime/seconds_spec.rb +++ b/spec/facter/facts/linux/system_uptime/seconds_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::SystemUptime::Seconds do +describe Facts::Linux::SystemUptime::Seconds do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::SystemUptime::Seconds.new } + subject(:fact) { Facts::Linux::SystemUptime::Seconds.new } let(:value) { 3600 } diff --git a/spec/facter/facts/debian/system_uptime/uptime_spec.rb b/spec/facter/facts/linux/system_uptime/uptime_spec.rb similarity index 86% rename from spec/facter/facts/debian/system_uptime/uptime_spec.rb rename to spec/facter/facts/linux/system_uptime/uptime_spec.rb index f60aa7496..c44c46c09 100644 --- a/spec/facter/facts/debian/system_uptime/uptime_spec.rb +++ b/spec/facter/facts/linux/system_uptime/uptime_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::SystemUptime::Uptime do +describe Facts::Linux::SystemUptime::Uptime do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::SystemUptime::Uptime.new } + subject(:fact) { Facts::Linux::SystemUptime::Uptime.new } let(:value) { '6 days' } diff --git a/spec/facter/facts/debian/timezone_spec.rb b/spec/facter/facts/linux/timezone_spec.rb similarity index 87% rename from spec/facter/facts/debian/timezone_spec.rb rename to spec/facter/facts/linux/timezone_spec.rb index b9aec02d7..a47273984 100644 --- a/spec/facter/facts/debian/timezone_spec.rb +++ b/spec/facter/facts/linux/timezone_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::Debian::Timezone do +describe Facts::Linux::Timezone do describe '#call_the_resolver' do - subject(:fact) { Facts::Debian::Timezone.new } + subject(:fact) { Facts::Linux::Timezone.new } let(:timezone) { 'UTC' } diff --git a/spec/facter/facts/el/os/distro/codename_spec.rb b/spec/facter/facts/rhel/os/distro/codename_spec.rb similarity index 86% rename from spec/facter/facts/el/os/distro/codename_spec.rb rename to spec/facter/facts/rhel/os/distro/codename_spec.rb index 296c3b441..308b8ddbb 100644 --- a/spec/facter/facts/el/os/distro/codename_spec.rb +++ b/spec/facter/facts/rhel/os/distro/codename_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Distro::Codename do +describe Facts::Rhel::Os::Distro::Codename do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Distro::Codename.new } + subject(:fact) { Facts::Rhel::Os::Distro::Codename.new } let(:value) { 'Core' } diff --git a/spec/facter/facts/el/os/distro/description_spec.rb b/spec/facter/facts/rhel/os/distro/description_spec.rb similarity index 87% rename from spec/facter/facts/el/os/distro/description_spec.rb rename to spec/facter/facts/rhel/os/distro/description_spec.rb index ae416bc4b..f9c257188 100644 --- a/spec/facter/facts/el/os/distro/description_spec.rb +++ b/spec/facter/facts/rhel/os/distro/description_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Distro::Description do +describe Facts::Rhel::Os::Distro::Description do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Distro::Description.new } + subject(:fact) { Facts::Rhel::Os::Distro::Description.new } let(:value) { 'CentOS Linux release 7.2.1511 (Core)' } diff --git a/spec/facter/facts/el/os/distro/id_spec.rb b/spec/facter/facts/rhel/os/distro/id_spec.rb similarity index 88% rename from spec/facter/facts/el/os/distro/id_spec.rb rename to spec/facter/facts/rhel/os/distro/id_spec.rb index e8c277cb7..ee706ed4e 100644 --- a/spec/facter/facts/el/os/distro/id_spec.rb +++ b/spec/facter/facts/rhel/os/distro/id_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Distro::Id do +describe Facts::Rhel::Os::Distro::Id do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Distro::Id.new } + subject(:fact) { Facts::Rhel::Os::Distro::Id.new } let(:value) { 'CentOS' } diff --git a/spec/facter/facts/el/os/distro/release_spec.rb b/spec/facter/facts/rhel/os/distro/release_spec.rb similarity index 93% rename from spec/facter/facts/el/os/distro/release_spec.rb rename to spec/facter/facts/rhel/os/distro/release_spec.rb index 470f8e075..857c0e49b 100644 --- a/spec/facter/facts/el/os/distro/release_spec.rb +++ b/spec/facter/facts/rhel/os/distro/release_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Distro::Release do +describe Facts::Rhel::Os::Distro::Release do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Distro::Release.new } + subject(:fact) { Facts::Rhel::Os::Distro::Release.new } let(:value) { '7.2.1511' } let(:release) { { 'full' => '7.2.1511', 'major' => '7', 'minor' => '2' } } diff --git a/spec/facter/facts/el/os/family_spec.rb b/spec/facter/facts/rhel/os/family_spec.rb similarity index 82% rename from spec/facter/facts/el/os/family_spec.rb rename to spec/facter/facts/rhel/os/family_spec.rb index dab127238..48bdc67a7 100644 --- a/spec/facter/facts/el/os/family_spec.rb +++ b/spec/facter/facts/rhel/os/family_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Family do +describe Facts::Rhel::Os::Family do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Family.new } + subject(:fact) { Facts::Rhel::Os::Family.new } let(:value) { 'RedHat' } diff --git a/spec/facter/facts/el/os/name_spec.rb b/spec/facter/facts/rhel/os/name_spec.rb similarity index 89% rename from spec/facter/facts/el/os/name_spec.rb rename to spec/facter/facts/rhel/os/name_spec.rb index 177d1390c..9752f1285 100644 --- a/spec/facter/facts/el/os/name_spec.rb +++ b/spec/facter/facts/rhel/os/name_spec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -describe Facts::El::Os::Name do +describe Facts::Rhel::Os::Name do describe '#call_the_resolver' do - subject(:fact) { Facts::El::Os::Name.new } + subject(:fact) { Facts::Rhel::Os::Name.new } let(:value) { 'RedHat' } diff --git a/spec/facter/facts/sles/disks_spec.rb b/spec/facter/facts/sles/disks_spec.rb deleted file mode 100644 index f4f6be339..000000000 --- a/spec/facter/facts/sles/disks_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Disks do - subject(:fact) { Facts::Sles::Disks.new } - - let(:disk) do - { - 'disks' => { - 'sda' => { - 'model' => 'Virtual disk', - 'size' => '20.00 GiB', - 'size_bytes' => 21_474_836_480, - 'vendor' => 'VMware' - } - } - } - end - - describe '#call_the_resolver' do - before do - allow(Facter::Resolvers::Linux::Disk).to receive(:resolve).with(:disks).and_return(disk) - end - - it 'calls Facter::Resolvers::Linux::Disk' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Disk).to have_received(:resolve).with(:disks) - end - - it 'returns resolved fact with name disk and value' do - expect(fact.call_the_resolver) - .to be_an_instance_of(Facter::ResolvedFact) - .and have_attributes(name: 'disks', value: disk) - end - end -end diff --git a/spec/facter/facts/sles/dmi/bios/release_date_spec.rb b/spec/facter/facts/sles/dmi/bios/release_date_spec.rb deleted file mode 100644 index 85e8993ac..000000000 --- a/spec/facter/facts/sles/dmi/bios/release_date_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Bios::ReleaseDate do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Bios::ReleaseDate.new } - - let(:date) { '07/03/2018' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:bios_date).and_return(date) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:bios_date) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.bios.release_date', value: date), - an_object_having_attributes(name: 'bios_release_date', value: date, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/bios/vendor_spec.rb b/spec/facter/facts/sles/dmi/bios/vendor_spec.rb deleted file mode 100644 index b4d676f57..000000000 --- a/spec/facter/facts/sles/dmi/bios/vendor_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Bios::Vendor do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Bios::Vendor.new } - - let(:vendor) { 'Phoenix Technologies LTD' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:bios_vendor).and_return(vendor) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:bios_vendor) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.bios.vendor', value: vendor), - an_object_having_attributes(name: 'bios_vendor', value: vendor, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/bios/version_spec.rb b/spec/facter/facts/sles/dmi/bios/version_spec.rb deleted file mode 100644 index a2cd268af..000000000 --- a/spec/facter/facts/sles/dmi/bios/version_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Bios::Version do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Bios::Version.new } - - let(:version) { '6.00' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:bios_version).and_return(version) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:bios_version) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.bios.version', value: version), - an_object_having_attributes(name: 'bios_version', value: version, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/board/manufacturer_spec.rb b/spec/facter/facts/sles/dmi/board/manufacturer_spec.rb deleted file mode 100644 index 483fa2fba..000000000 --- a/spec/facter/facts/sles/dmi/board/manufacturer_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Board::Manufacturer do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Board::Manufacturer.new } - - let(:manufacturer) { 'Intel Corporation' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:board_vendor).and_return(manufacturer) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:board_vendor) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.board.manufacturer', value: manufacturer), - an_object_having_attributes(name: 'boardmanufacturer', value: manufacturer, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/board/product_spec.rb b/spec/facter/facts/sles/dmi/board/product_spec.rb deleted file mode 100644 index 1b3811998..000000000 --- a/spec/facter/facts/sles/dmi/board/product_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Board::Product do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Board::Product.new } - - let(:product) { '440BX Desktop Reference Platform' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:board_name).and_return(product) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:board_name) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.board.product', value: product), - an_object_having_attributes(name: 'boardproductname', value: product, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/board/serial_number_spec.rb b/spec/facter/facts/sles/dmi/board/serial_number_spec.rb deleted file mode 100644 index d2fa7d7d8..000000000 --- a/spec/facter/facts/sles/dmi/board/serial_number_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Board::SerialNumber do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Board::SerialNumber.new } - - let(:serial_number) { 'None' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:board_serial).and_return(serial_number) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:board_serial) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.board.serial_number', value: serial_number), - an_object_having_attributes(name: 'boardserialnumber', value: serial_number, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/chassis/asset_tag_spec.rb b/spec/facter/facts/sles/dmi/chassis/asset_tag_spec.rb deleted file mode 100644 index ff4a57fc7..000000000 --- a/spec/facter/facts/sles/dmi/chassis/asset_tag_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Chassis::AssetTag do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Chassis::AssetTag.new } - - let(:tag) { 'No Asset Tag' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:chassis_asset_tag).and_return(tag) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:chassis_asset_tag) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.chassis.asset_tag', value: tag), - an_object_having_attributes(name: 'chassisassettag', value: tag, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/chassis/type_spec.rb b/spec/facter/facts/sles/dmi/chassis/type_spec.rb deleted file mode 100644 index fc27abeef..000000000 --- a/spec/facter/facts/sles/dmi/chassis/type_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Chassis::Type do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Chassis::Type.new } - - let(:type) { 'Low Profile Desktop' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:chassis_type).and_return(type) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:chassis_type) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.chassis.type', value: type), - an_object_having_attributes(name: 'chassistype', value: type, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/manufacturer_spec.rb b/spec/facter/facts/sles/dmi/manufacturer_spec.rb deleted file mode 100644 index e894fd487..000000000 --- a/spec/facter/facts/sles/dmi/manufacturer_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Manufacturer do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Manufacturer.new } - - let(:sys_vendor) { 'VMware, Inc.' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:sys_vendor).and_return(sys_vendor) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:sys_vendor) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.manufacturer', value: sys_vendor), - an_object_having_attributes(name: 'manufacturer', value: sys_vendor, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/dmi/product/name_spec.rb b/spec/facter/facts/sles/dmi/product/name_spec.rb deleted file mode 100644 index 7abc0938f..000000000 --- a/spec/facter/facts/sles/dmi/product/name_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Dmi::Product::Name do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Dmi::Product::Name.new } - - let(:product_name) { 'VMware Virtual Platform' } - - before do - allow(Facter::Resolvers::Linux::DmiBios).to \ - receive(:resolve).with(:product_name).and_return(product_name) - end - - it 'calls Facter::Resolvers::Linux::DmiBios' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::DmiBios).to have_received(:resolve).with(:product_name) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'dmi.product.name', value: product_name), - an_object_having_attributes(name: 'productname', value: product_name, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/facterversion_spec.rb b/spec/facter/facts/sles/facterversion_spec.rb deleted file mode 100644 index 594c28285..000000000 --- a/spec/facter/facts/sles/facterversion_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Facterversion do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Facterversion.new } - - let(:value) { '4.0.3' } - - before do - allow(Facter::Resolvers::Facterversion).to receive(:resolve).with(:facterversion).and_return(value) - end - - it 'calls Facter::Resolvers::Facterversion' do - fact.call_the_resolver - expect(Facter::Resolvers::Facterversion).to have_received(:resolve).with(:facterversion) - end - - it 'returns facterversion fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'facterversion', value: value) - end - end -end diff --git a/spec/facter/facts/sles/filesystems_spec.rb b/spec/facter/facts/sles/filesystems_spec.rb deleted file mode 100644 index 1d8a90bfa..000000000 --- a/spec/facter/facts/sles/filesystems_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Filesystems do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Filesystems.new } - - let(:value) { 'ext2,ext3,ext4,xfs' } - - before do - allow(Facter::Resolvers::Linux::Filesystems).to \ - receive(:resolve).with(:systems).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::Filesystems' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Filesystems).to have_received(:resolve).with(:systems) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'filesystems', value: value) - end - end -end diff --git a/spec/facter/facts/sles/fips_enabled_spec.rb b/spec/facter/facts/sles/fips_enabled_spec.rb deleted file mode 100644 index e14644d52..000000000 --- a/spec/facter/facts/sles/fips_enabled_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::FipsEnabled do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::FipsEnabled.new } - - let(:value) { true } - - before do - allow(Facter::Resolvers::Linux::FipsEnabled).to \ - receive(:resolve).with(:fips_enabled).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::FipsEnabled' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::FipsEnabled).to have_received(:resolve).with(:fips_enabled) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'fips_enabled', value: value) - end - end -end diff --git a/spec/facter/facts/sles/identity/gid_spec.rb b/spec/facter/facts/sles/identity/gid_spec.rb deleted file mode 100644 index 3c6df95fb..000000000 --- a/spec/facter/facts/sles/identity/gid_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Identity::Gid do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Identity::Gid.new } - - let(:value) { '20' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:gid).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:gid) - end - - it 'returns identity gid fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'identity.gid', value: value) - end - end -end diff --git a/spec/facter/facts/sles/identity/privileged_spec.rb b/spec/facter/facts/sles/identity/privileged_spec.rb deleted file mode 100644 index e3a957b8d..000000000 --- a/spec/facter/facts/sles/identity/privileged_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Identity::Privileged do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Identity::Privileged.new } - - let(:value) { 'false' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:privileged).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:privileged) - end - - it 'returns identity privileged fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'identity.privileged', value: value) - end - end -end diff --git a/spec/facter/facts/sles/identity/user_spec.rb b/spec/facter/facts/sles/identity/user_spec.rb deleted file mode 100644 index c7309934a..000000000 --- a/spec/facter/facts/sles/identity/user_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Identity::User do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Identity::User.new } - - let(:value) { 'testUser' } - - before do - allow(Facter::Resolvers::PosxIdentity).to receive(:resolve).with(:user).and_return(value) - end - - it 'calls Facter::Resolvers::PosxIdentity' do - fact.call_the_resolver - expect(Facter::Resolvers::PosxIdentity).to have_received(:resolve).with(:user) - end - - it 'returns id and identity user facts' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'identity.user', value: value), - an_object_having_attributes(name: 'id', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/interfaces_spec.rb b/spec/facter/facts/sles/interfaces_spec.rb deleted file mode 100644 index a3e713628..000000000 --- a/spec/facter/facts/sles/interfaces_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Interfaces do - subject(:fact) { Facts::Sles::Interfaces.new } - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:interfaces).and_return(interfaces) - end - - describe '#call_the_resolver' do - let(:interfaces) { { 'eth0' => { ip6: 'fe80::99bf:da20:ad3:9bfe' }, 'en1' => { ip6: 'fe80::99bf:da20:ad3:9bfe' } } } - - it 'calls Facter::Resolvers::Networking' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:interfaces) - end - - it 'returns interfaces names' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'interfaces', value: interfaces.keys.sort.join(','), type: :legacy) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:interfaces) { nil } - - it 'returns nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'interfaces', value: interfaces, type: :legacy) - end - end -end diff --git a/spec/facter/facts/sles/kernelmajversion_spec.rb b/spec/facter/facts/sles/kernelmajversion_spec.rb deleted file mode 100644 index c57ef382e..000000000 --- a/spec/facter/facts/sles/kernelmajversion_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Kernelmajversion do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Kernelmajversion.new } - - let(:resolver_result) { '3.12.49-11-default' } - let(:fact_value) { '3.12' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelrelease).and_return(resolver_result) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:kernelrelease) - end - - it 'returns a kernelmajversion fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'kernelmajversion', value: fact_value) - end - end -end diff --git a/spec/facter/facts/sles/kernelrelease_spec.rb b/spec/facter/facts/sles/kernelrelease_spec.rb deleted file mode 100644 index f994379d8..000000000 --- a/spec/facter/facts/sles/kernelrelease_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Kernelrelease do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Kernelrelease.new } - - let(:value) { '3.12.49-11-default' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelrelease).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:kernelrelease) - end - - it 'returns kernelrelease fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'kernelrelease', value: value) - end - end -end diff --git a/spec/facter/facts/sles/kernelversion_spec.rb b/spec/facter/facts/sles/kernelversion_spec.rb deleted file mode 100644 index a80094cce..000000000 --- a/spec/facter/facts/sles/kernelversion_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Kernelversion do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Kernelversion.new } - - let(:resolver_value) { '3.12.49-11-default' } - let(:fact_value) { '3.12.49' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelrelease).and_return(resolver_value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:kernelrelease) - end - - it 'returns kernelversion fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'kernelversion', value: fact_value) - end - end -end diff --git a/spec/facter/facts/sles/load_averages_spec.rb b/spec/facter/facts/sles/load_averages_spec.rb deleted file mode 100644 index 4ce8d98b4..000000000 --- a/spec/facter/facts/sles/load_averages_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::LoadAverages do - subject(:fact) { Facts::Sles::LoadAverages.new } - - let(:averages) do - { - '15m' => 0.0, - '10m' => 0.0, - '5m' => 0.0 - } - end - - describe '#call_the_resolver' do - before do - allow(Facter::Resolvers::Linux::LoadAverages).to receive(:resolve).with(:load_averages).and_return(averages) - end - - it 'calls Facter::Resolvers::Linux::LoadAverages' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::LoadAverages).to have_received(:resolve).with(:load_averages) - end - - it 'returns resolved fact with name disk and value' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact) - .and have_attributes(name: 'load_averages', value: averages) - end - end -end diff --git a/spec/facter/facts/sles/memory/swap/available_bytes_spec.rb b/spec/facter/facts/sles/memory/swap/available_bytes_spec.rb deleted file mode 100644 index fdd3401bd..000000000 --- a/spec/facter/facts/sles/memory/swap/available_bytes_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::Swap::AvailableBytes do - subject(:fact) { Facts::Sles::Memory::Swap::AvailableBytes.new } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_free).and_return(value) - end - - describe '#call_the_resolver' do - let(:value) { 3_331_551_232 } - let(:value_mb) { 3177.21 } - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_free) - end - - it 'returns available memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.available_bytes', value: value), - an_object_having_attributes(name: 'swapfree_mb', value: value_mb, type: :legacy)) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:value) { nil } - - it 'returns available memory fact as nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.available_bytes', value: value), - an_object_having_attributes(name: 'swapfree_mb', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/memory/swap/available_spec.rb b/spec/facter/facts/sles/memory/swap/available_spec.rb deleted file mode 100644 index 74e4b28c9..000000000 --- a/spec/facter/facts/sles/memory/swap/available_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::Swap::Available do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::Swap::Available.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_free).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_free) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.available', value: value), - an_object_having_attributes(name: 'swapfree', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/memory/swap/capacity_spec.rb b/spec/facter/facts/sles/memory/swap/capacity_spec.rb deleted file mode 100644 index 9d07871eb..000000000 --- a/spec/facter/facts/sles/memory/swap/capacity_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::Swap::Capacity do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::Swap::Capacity.new } - - let(:value) { '7.4%' } - - before do - allow(Facter::Resolvers::Linux::Memory).to \ - receive(:resolve).with(:swap_capacity).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_capacity) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.swap.capacity', value: value) - end - end -end diff --git a/spec/facter/facts/sles/memory/swap/total_bytes_spec.rb b/spec/facter/facts/sles/memory/swap/total_bytes_spec.rb deleted file mode 100644 index aa2b4730d..000000000 --- a/spec/facter/facts/sles/memory/swap/total_bytes_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::Swap::TotalBytes do - subject(:fact) { Facts::Sles::Memory::Swap::TotalBytes.new } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_total).and_return(value) - end - - describe '#call_the_resolver' do - let(:value) { 3_331_551_232 } - let(:value_mb) { 3177.21 } - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_total) - end - - it 'returns available memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.total_bytes', value: value), - an_object_having_attributes(name: 'swapsize_mb', value: value_mb, type: :legacy)) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:value) { nil } - - it 'returns available memory fact as nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.total_bytes', value: value), - an_object_having_attributes(name: 'swapsize_mb', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/memory/swap/total_spec.rb b/spec/facter/facts/sles/memory/swap/total_spec.rb deleted file mode 100644 index 8df7902eb..000000000 --- a/spec/facter/facts/sles/memory/swap/total_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::Swap::Total do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::Swap::Total.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_total).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_total) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.swap.total', value: value), - an_object_having_attributes(name: 'swapsize', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/memory/swap/used_bytes_spec.rb b/spec/facter/facts/sles/memory/swap/used_bytes_spec.rb deleted file mode 100644 index 1c2aa5518..000000000 --- a/spec/facter/facts/sles/memory/swap/used_bytes_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::Swap::UsedBytes do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::Swap::UsedBytes.new } - - let(:value) { 1024 } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_used_bytes).and_return(value) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_used_bytes) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.swap.used_bytes', value: value) - end - end -end diff --git a/spec/facter/facts/sles/memory/swap/used_spec.rb b/spec/facter/facts/sles/memory/swap/used_spec.rb deleted file mode 100644 index 368723901..000000000 --- a/spec/facter/facts/sles/memory/swap/used_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::Swap::Used do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::Swap::Used.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:swap_used_bytes).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:swap_used_bytes) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.swap.used', value: value) - end - end -end diff --git a/spec/facter/facts/sles/memory/system/available_bytes_spec.rb b/spec/facter/facts/sles/memory/system/available_bytes_spec.rb deleted file mode 100644 index 011b4d8ff..000000000 --- a/spec/facter/facts/sles/memory/system/available_bytes_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::System::AvailableBytes do - subject(:fact) { Facts::Sles::Memory::System::AvailableBytes.new } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:memfree).and_return(value) - end - - describe '#call_the_resolver' do - let(:value) { 3_331_551_232 } - let(:value_mb) { 3177.21 } - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:memfree) - end - - it 'returns available memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.available_bytes', value: value), - an_object_having_attributes(name: 'memoryfree_mb', value: value_mb, type: :legacy)) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:value) { nil } - - it 'returns available memory fact as nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.available_bytes', value: value), - an_object_having_attributes(name: 'memoryfree_mb', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/memory/system/available_spec.rb b/spec/facter/facts/sles/memory/system/available_spec.rb deleted file mode 100644 index 6af649991..000000000 --- a/spec/facter/facts/sles/memory/system/available_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::System::Available do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::System::Available.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:memfree).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:memfree) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.available', value: value), - an_object_having_attributes(name: 'memoryfree', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/memory/system/capacity_spec.rb b/spec/facter/facts/sles/memory/system/capacity_spec.rb deleted file mode 100644 index 00d1dbf4b..000000000 --- a/spec/facter/facts/sles/memory/system/capacity_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::System::Capacity do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::System::Capacity.new } - - let(:value) { '5.3%' } - - before do - allow(Facter::Resolvers::Linux::Memory).to \ - receive(:resolve).with(:capacity).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:capacity) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.system.capacity', value: value) - end - end -end diff --git a/spec/facter/facts/sles/memory/system/total_bytes_spec.rb b/spec/facter/facts/sles/memory/system/total_bytes_spec.rb deleted file mode 100644 index 0e7191f30..000000000 --- a/spec/facter/facts/sles/memory/system/total_bytes_spec.rb +++ /dev/null @@ -1,35 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::System::TotalBytes do - subject(:fact) { Facts::Sles::Memory::System::TotalBytes.new } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:total).and_return(value) - end - - describe '#call_the_resolver' do - let(:value) { 3_331_551_232 } - let(:value_mb) { 3177.21 } - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:total) - end - - it 'returns available memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.total_bytes', value: value), - an_object_having_attributes(name: 'memorysize_mb', value: value_mb, type: :legacy)) - end - end - - describe '#call_the_resolver when resolver returns nil' do - let(:value) { nil } - - it 'returns available memory fact as nil' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.total_bytes', value: value), - an_object_having_attributes(name: 'memorysize_mb', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/memory/system/total_spec.rb b/spec/facter/facts/sles/memory/system/total_spec.rb deleted file mode 100644 index 824f3613b..000000000 --- a/spec/facter/facts/sles/memory/system/total_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::System::Total do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::System::Total.new } - - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to receive(:resolve).with(:total).and_return(1024) - end - - it 'calls Facter::Resolvers::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:total) - end - - it 'returns free memory fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'memory.system.total', value: value), - an_object_having_attributes(name: 'memorysize', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/memory/system/used_bytes_spec.rb b/spec/facter/facts/sles/memory/system/used_bytes_spec.rb deleted file mode 100644 index 49efd9cd7..000000000 --- a/spec/facter/facts/sles/memory/system/used_bytes_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::System::UsedBytes do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::System::UsedBytes.new } - - let(:value) { 1024 } - - before do - allow(Facter::Resolvers::Linux::Memory).to \ - receive(:resolve).with(:used_bytes).and_return(value) - end - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:used_bytes) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.system.used_bytes', value: value) - end - end -end diff --git a/spec/facter/facts/sles/memory/system/used_spec.rb b/spec/facter/facts/sles/memory/system/used_spec.rb deleted file mode 100644 index 5f2786f0e..000000000 --- a/spec/facter/facts/sles/memory/system/used_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Memory::System::Used do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Memory::System::Used.new } - - let(:resolver_value) { 1024 } - let(:value) { '1.00 KiB' } - - before do - allow(Facter::Resolvers::Linux::Memory).to \ - receive(:resolve).with(:used_bytes).and_return(resolver_value) - end - - it 'calls Facter::Resolvers::Linux::Memory' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Memory).to have_received(:resolve).with(:used_bytes) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'memory.system.used', value: value) - end - end -end diff --git a/spec/facter/facts/sles/networking/hostname_spec.rb b/spec/facter/facts/sles/networking/hostname_spec.rb deleted file mode 100644 index 8f3900698..000000000 --- a/spec/facter/facts/sles/networking/hostname_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Networking::Hostname do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Networking::Hostname.new } - - let(:value) { 'host' } - - before do - allow(Facter::Resolvers::Hostname).to receive(:resolve).with(:hostname).and_return(value) - end - - it 'calls Facter::Resolvers::Hostname' do - fact.call_the_resolver - expect(Facter::Resolvers::Hostname).to have_received(:resolve).with(:hostname) - end - - it 'returns hostname fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'networking.hostname', value: value), - an_object_having_attributes(name: 'hostname', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/networking/interfaces_spec.rb b/spec/facter/facts/sles/networking/interfaces_spec.rb deleted file mode 100644 index 62114d8c6..000000000 --- a/spec/facter/facts/sles/networking/interfaces_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Networking::Interfaces do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Networking::Interfaces.new } - - let(:value) do - { - 'ens160' => { - 'bindings' => [ - { - 'address' => '10.16.116.8', - 'netmask' => '255.255.240.0', - 'network' => '10.16.112.0' - } - ] - } - } - end - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:interfaces).and_return(value) - end - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:interfaces) - end - - it 'returns networking.interfaces fact' do - expect(fact.call_the_resolver) - .to be_an_instance_of(Facter::ResolvedFact) - .and have_attributes(name: 'networking.interfaces', value: value) - end - end -end diff --git a/spec/facter/facts/sles/networking/ip_spec.rb b/spec/facter/facts/sles/networking/ip_spec.rb deleted file mode 100644 index 8d0f3836e..000000000 --- a/spec/facter/facts/sles/networking/ip_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Networking::Ip do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Networking::Ip.new } - - let(:value) { '10.16.122.163' } - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:ip).and_return(value) - end - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:ip) - end - - it 'returns ipaddress fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array) - .and contain_exactly(an_object_having_attributes(name: 'networking.ip', value: value), - an_object_having_attributes(name: 'ipaddress', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/networking/mac_spec.rb b/spec/facter/facts/sles/networking/mac_spec.rb deleted file mode 100644 index 2706cc8ed..000000000 --- a/spec/facter/facts/sles/networking/mac_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Networking::Mac do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Networking::Mac.new } - - let(:value) { '64:5a:ed:ea:c3:25' } - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:macaddress).and_return(value) - end - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:macaddress) - end - - it 'return macaddress fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'networking.mac', value: value), - an_object_having_attributes(name: 'macaddress', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/networking/primary_spec.rb b/spec/facter/facts/sles/networking/primary_spec.rb deleted file mode 100644 index 8d9cbd59f..000000000 --- a/spec/facter/facts/sles/networking/primary_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Networking::Primary do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Networking::Primary.new } - - let(:value) { 'ens160' } - - before do - allow(Facter::Resolvers::NetworkingLinux).to receive(:resolve).with(:primary_interface).and_return(value) - end - - it 'calls Facter::Resolvers::NetworkingLinux' do - fact.call_the_resolver - expect(Facter::Resolvers::NetworkingLinux).to have_received(:resolve).with(:primary_interface) - end - - it 'returns networking.primary fact' do - expect(fact.call_the_resolver) - .to be_an_instance_of(Facter::ResolvedFact) - .and have_attributes(name: 'networking.primary', value: value) - end - end -end diff --git a/spec/facter/facts/sles/os/architecture_spec.rb b/spec/facter/facts/sles/os/architecture_spec.rb deleted file mode 100644 index f6747b9d6..000000000 --- a/spec/facter/facts/sles/os/architecture_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Os::Architecture do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Architecture.new } - - let(:value) { 'x86_64' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:machine).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - expect(Facter::Resolvers::Uname).to receive(:resolve).with(:machine) - fact.call_the_resolver - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.architecture', value: value), - an_object_having_attributes(name: 'architecture', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/os/distro/specification_spec.rb b/spec/facter/facts/sles/os/distro/specification_spec.rb deleted file mode 100644 index 3381c71e7..000000000 --- a/spec/facter/facts/sles/os/distro/specification_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Os::Distro::Specification do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Distro::Specification.new } - - let(:value) { ':core-4.1-amd64:core-4.1-noarch:cxx-4.1-amd64' } - - before do - allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:lsb_version).and_return(value) - end - - it 'calls Facter::Resolvers::LsbRelease' do - fact.call_the_resolver - expect(Facter::Resolvers::LsbRelease).to have_received(:resolve).with(:lsb_version) - end - - it 'returns release fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.distro.specification', value: value), - an_object_having_attributes(name: 'lsbrelease', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/os/hardware_spec.rb b/spec/facter/facts/sles/os/hardware_spec.rb deleted file mode 100644 index e6ed0a151..000000000 --- a/spec/facter/facts/sles/os/hardware_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Os::Hardware do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Hardware.new } - - let(:value) { 'x86_64' } - - before do - allow(Facter::Resolvers::Uname).to receive(:resolve).with(:machine).and_return(value) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:machine) - end - - it 'returns release fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.hardware', value: value), - an_object_having_attributes(name: 'hardwaremodel', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/os/name_spec.rb b/spec/facter/facts/sles/os/name_spec.rb deleted file mode 100644 index 76624de53..000000000 --- a/spec/facter/facts/sles/os/name_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Os::Name do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Name.new } - - let(:value) { 'SLES' } - - before do - allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:name).and_return(value) - end - - it 'calls Facter::Resolvers::OsRelease' do - expect(Facter::Resolvers::OsRelease).to receive(:resolve).with(:name) - fact.call_the_resolver - end - - it 'returns operating system name fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.name', value: value), - an_object_having_attributes(name: 'operatingsystem', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/os/selinux/config_policy_spec.rb b/spec/facter/facts/sles/os/selinux/config_policy_spec.rb deleted file mode 100644 index f872e9830..000000000 --- a/spec/facter/facts/sles/os/selinux/config_policy_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Os::Selinux::ConfigPolicy do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Selinux::ConfigPolicy.new } - - let(:config_policy) { 'targeted' } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:config_policy).and_return(config_policy) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:config_policy) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.config_policy', value: config_policy), - an_object_having_attributes(name: 'selinux_config_policy', value: config_policy, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/os/selinux/current_mode_spec.rb b/spec/facter/facts/sles/os/selinux/current_mode_spec.rb deleted file mode 100644 index 8f11ccd54..000000000 --- a/spec/facter/facts/sles/os/selinux/current_mode_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Os::Selinux::CurrentMode do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Selinux::CurrentMode.new } - - let(:current_mode) { 'permissive' } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:current_mode).and_return(current_mode) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:current_mode) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.current_mode', value: current_mode), - an_object_having_attributes(name: 'selinux_current_mode', value: current_mode, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/os/selinux/enabled_spec.rb b/spec/facter/facts/sles/os/selinux/enabled_spec.rb deleted file mode 100644 index b78a968cd..000000000 --- a/spec/facter/facts/sles/os/selinux/enabled_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Os::Selinux::Enabled do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Selinux::Enabled.new } - - let(:enabled) { true } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:enabled).and_return(enabled) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:enabled) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.enabled', value: enabled), - an_object_having_attributes(name: 'selinux', value: enabled, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/os/selinux/policy_version_spec.rb b/spec/facter/facts/sles/os/selinux/policy_version_spec.rb deleted file mode 100644 index fc615bbad..000000000 --- a/spec/facter/facts/sles/os/selinux/policy_version_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Os::Selinux::PolicyVersion do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Os::Selinux::PolicyVersion.new } - - let(:policy_version) { '31' } - - before do - allow(Facter::Resolvers::SELinux).to receive(:resolve).with(:policy_version).and_return(policy_version) - end - - it 'calls Facter::Resolvers::SELinux' do - fact.call_the_resolver - expect(Facter::Resolvers::SELinux).to have_received(:resolve).with(:policy_version) - end - - it 'returns architecture fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'os.selinux.policy_version', value: policy_version), - an_object_having_attributes(name: 'selinux_policyversion', - value: policy_version, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/path_spec.rb b/spec/facter/facts/sles/path_spec.rb deleted file mode 100644 index 03885d435..000000000 --- a/spec/facter/facts/sles/path_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Path do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Path.new } - - let(:value) { '/usr/bin:/etc:/usr/sbin:/usr/ucb:/usr/bin/X11:/sbin:/usr/java6/jre/bin:/usr/java6/bin' } - - before do - allow(Facter::Resolvers::Path).to \ - receive(:resolve).with(:path).and_return(value) - end - - it 'calls Facter::Resolvers::Path' do - fact.call_the_resolver - expect(Facter::Resolvers::Path).to have_received(:resolve).with(:path) - end - - it 'returns path fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'path', value: value) - end - end -end diff --git a/spec/facter/facts/sles/processors/count_spec.rb b/spec/facter/facts/sles/processors/count_spec.rb deleted file mode 100644 index f7d03458a..000000000 --- a/spec/facter/facts/sles/processors/count_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Processors::Count do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Processors::Count.new } - - let(:processors_count) { '4' } - - before do - allow(Facter::Resolvers::Linux::Processors).to \ - receive(:resolve).with(:processors).and_return(processors_count) - end - - it 'calls Facter::Resolvers::Linux::Processors' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Processors).to have_received(:resolve).with(:processors) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'processors.count', value: processors_count), - an_object_having_attributes(name: 'processorcount', value: processors_count, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/processors/isa_spec.rb b/spec/facter/facts/sles/processors/isa_spec.rb deleted file mode 100644 index 3fd8f964b..000000000 --- a/spec/facter/facts/sles/processors/isa_spec.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Processors::Isa do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Processors::Isa.new } - - let(:processors_arch) { 'x86_64' } - - before do - allow(Facter::Resolvers::Uname).to \ - receive(:resolve).with(:processor).and_return(processors_arch) - end - - it 'calls Facter::Resolvers::Uname' do - fact.call_the_resolver - expect(Facter::Resolvers::Uname).to have_received(:resolve).with(:processor) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'processors.isa', value: processors_arch), - an_object_having_attributes(name: 'hardwareisa', value: processors_arch, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/processors/models_spec.rb b/spec/facter/facts/sles/processors/models_spec.rb deleted file mode 100644 index a8dbfe166..000000000 --- a/spec/facter/facts/sles/processors/models_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Processors::Models do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Processors::Models.new } - - let(:models) { ['Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz', 'Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz'] } - - before do - allow(Facter::Resolvers::Linux::Processors).to \ - receive(:resolve).with(:models).and_return(models) - end - - it 'calls Facter::Resolvers::Linux::Processors' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Processors).to have_received(:resolve).with(:models) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'processors.models', value: models) - end - end -end diff --git a/spec/facter/facts/sles/processors/physicalcount_spec.rb b/spec/facter/facts/sles/processors/physicalcount_spec.rb deleted file mode 100644 index e0a7d4b49..000000000 --- a/spec/facter/facts/sles/processors/physicalcount_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Processors::Physicalcount do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Processors::Physicalcount.new } - - let(:physical_count) { '2' } - - before do - allow(Facter::Resolvers::Linux::Processors).to \ - receive(:resolve).with(:physical_count).and_return(physical_count) - end - - it 'calls Facter::Resolvers::Linux::Processors' do - fact.call_the_resolver - expect(Facter::Resolvers::Linux::Processors).to have_received(:resolve).with(:physical_count) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'processors.physicalcount', - value: physical_count), - an_object_having_attributes(name: 'physicalprocessorcount', - value: physical_count, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/puppet_version_spec.rb b/spec/facter/facts/sles/puppet_version_spec.rb deleted file mode 100644 index 4cbd51927..000000000 --- a/spec/facter/facts/sles/puppet_version_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::PuppetVersion do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::PuppetVersion.new } - - let(:puppet_version) { '6.11.0' } - - before do - allow(Facter::Resolvers::PuppetVersionResolver).to \ - receive(:resolve).with(:puppetversion).and_return(puppet_version) - end - - it 'calls Facter::Resolvers::Puppetversion' do - fact.call_the_resolver - expect(Facter::Resolvers::PuppetVersionResolver).to have_received(:resolve).with(:puppetversion) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'puppetversion', value: puppet_version) - end - end -end diff --git a/spec/facter/facts/sles/ruby/sitedir_spec.rb b/spec/facter/facts/sles/ruby/sitedir_spec.rb deleted file mode 100644 index 1d0d046b2..000000000 --- a/spec/facter/facts/sles/ruby/sitedir_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Ruby::Sitedir do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Ruby::Sitedir.new } - - let(:value) { '/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0' } - - before do - allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:sitedir).and_return(value) - end - - it 'calls Facter::Resolvers::Ruby' do - fact.call_the_resolver - expect(Facter::Resolvers::Ruby).to have_received(:resolve).with(:sitedir) - end - - it 'returns ruby sitedir fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'ruby.sitedir', value: value), - an_object_having_attributes(name: 'rubysitedir', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/ruby/version_spec.rb b/spec/facter/facts/sles/ruby/version_spec.rb deleted file mode 100644 index aa4061373..000000000 --- a/spec/facter/facts/sles/ruby/version_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Ruby::Version do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Ruby::Version.new } - - let(:value) { '2.5.7' } - - before do - allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:version).and_return(value) - end - - it 'calls Facter::Resolvers::Ruby' do - fact.call_the_resolver - expect(Facter::Resolvers::Ruby).to have_received(:resolve).with(:version) - end - - it 'returns ruby version fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'ruby.version', value: value), - an_object_having_attributes(name: 'rubyversion', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/ssh_spec.rb b/spec/facter/facts/sles/ssh_spec.rb deleted file mode 100644 index da7e9ccbc..000000000 --- a/spec/facter/facts/sles/ssh_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Ssh do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Ssh.new } - - let(:ssh) do - [Facter::Ssh.new(Facter::FingerPrint.new('test', 'test'), 'ecdsa', 'test', 'ecdsa')] - end - let(:value) do - { 'ecdsa' => { 'fingerprints' => - { 'sha1' => 'test', 'sha256' => 'test' }, - 'key' => 'test', - 'type' => 'ecdsa' } } - end - - before do - allow(Facter::Resolvers::SshResolver).to \ - receive(:resolve).with(:ssh).and_return(ssh) - end - - it 'calls Facter::Resolvers::SshResolver' do - fact.call_the_resolver - expect(Facter::Resolvers::SshResolver).to have_received(:resolve).with(:ssh) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'ssh', value: value) - end - end -end diff --git a/spec/facter/facts/sles/sshalgorithmkey_spec.rb b/spec/facter/facts/sles/sshalgorithmkey_spec.rb deleted file mode 100644 index e2fbf2a7e..000000000 --- a/spec/facter/facts/sles/sshalgorithmkey_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Sshalgorithmkey do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Sshalgorithmkey.new } - - let(:ssh) do - [Facter::Ssh.new(Facter::FingerPrint.new('test', 'test'), 'ecdsa', 'test', 'ecdsa'), - Facter::Ssh.new(Facter::FingerPrint.new('test', 'test'), 'rsa', 'test', 'rsa')] - end - let(:legacy_fact1) { { name: 'ecdsa', value: 'test' } } - let(:legacy_fact2) { { name: 'rsa', value: 'test' } } - - before do - allow(Facter::Resolvers::SshResolver).to \ - receive(:resolve).with(:ssh).and_return(ssh) - end - - it 'calls Facter::Resolvers::SshResolver' do - fact.call_the_resolver - expect(Facter::Resolvers::SshResolver).to have_received(:resolve).with(:ssh) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: "ssh#{legacy_fact1[:name]}key", value: legacy_fact1[:value]), - an_object_having_attributes(name: "ssh#{legacy_fact2[:name]}key", value: legacy_fact2[:value])) - end - end -end diff --git a/spec/facter/facts/sles/system_uptime/days_spec.rb b/spec/facter/facts/sles/system_uptime/days_spec.rb deleted file mode 100644 index 5dc61a83d..000000000 --- a/spec/facter/facts/sles/system_uptime/days_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::SystemUptime::Days do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::SystemUptime::Days.new } - - let(:value) { '2' } - - before do - allow(Facter::Resolvers::Uptime).to receive(:resolve).with(:days).and_return(value) - end - - it 'calls Facter::Resolvers::Uptime' do - fact.call_the_resolver - expect(Facter::Resolvers::Uptime).to have_received(:resolve).with(:days) - end - - it 'returns days since last boot' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'system_uptime.days', value: value), - an_object_having_attributes(name: 'uptime_days', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/system_uptime/hours_spec.rb b/spec/facter/facts/sles/system_uptime/hours_spec.rb deleted file mode 100644 index b0a852aa3..000000000 --- a/spec/facter/facts/sles/system_uptime/hours_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::SystemUptime::Hours do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::SystemUptime::Hours.new } - - let(:value) { '9' } - - before do - allow(Facter::Resolvers::Uptime).to receive(:resolve).with(:hours).and_return(value) - end - - it 'calls Facter::Resolvers::Uptime' do - fact.call_the_resolver - expect(Facter::Resolvers::Uptime).to have_received(:resolve).with(:hours) - end - - it 'returns hours since last boot' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'system_uptime.hours', value: value), - an_object_having_attributes(name: 'uptime_hours', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/system_uptime/seconds_spec.rb b/spec/facter/facts/sles/system_uptime/seconds_spec.rb deleted file mode 100644 index 7b557d641..000000000 --- a/spec/facter/facts/sles/system_uptime/seconds_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::SystemUptime::Seconds do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::SystemUptime::Seconds.new } - - let(:value) { '34974' } - - before do - allow(Facter::Resolvers::Uptime).to receive(:resolve).with(:seconds).and_return(value) - end - - it 'calls Facter::Resolvers::Uptime' do - fact.call_the_resolver - expect(Facter::Resolvers::Uptime).to have_received(:resolve).with(:seconds) - end - - it 'returns seconds since last boot' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'system_uptime.seconds', value: value), - an_object_having_attributes(name: 'uptime_seconds', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/system_uptime/uptime_spec.rb b/spec/facter/facts/sles/system_uptime/uptime_spec.rb deleted file mode 100644 index bcbcf8f64..000000000 --- a/spec/facter/facts/sles/system_uptime/uptime_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::SystemUptime::Uptime do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::SystemUptime::Uptime.new } - - let(:value) { '9:42 hours' } - - before do - allow(Facter::Resolvers::Uptime).to receive(:resolve).with(:uptime).and_return(value) - end - - it 'calls Facter::Resolvers::Uptime' do - fact.call_the_resolver - expect(Facter::Resolvers::Uptime).to have_received(:resolve).with(:uptime) - end - - it 'returns time since last boot' do - expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ - contain_exactly(an_object_having_attributes(name: 'system_uptime.uptime', value: value), - an_object_having_attributes(name: 'uptime', value: value, type: :legacy)) - end - end -end diff --git a/spec/facter/facts/sles/timezone_spec.rb b/spec/facter/facts/sles/timezone_spec.rb deleted file mode 100644 index 84794e7f7..000000000 --- a/spec/facter/facts/sles/timezone_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -describe Facts::Sles::Timezone do - describe '#call_the_resolver' do - subject(:fact) { Facts::Sles::Timezone.new } - - let(:timezone) { 'UTC' } - - before do - allow(Facter::Resolvers::Timezone).to \ - receive(:resolve).with(:timezone).and_return(timezone) - end - - it 'calls Facter::Resolvers::Timezone' do - fact.call_the_resolver - expect(Facter::Resolvers::Timezone).to have_received(:resolve).with(:timezone) - end - - it 'returns a resolved fact' do - expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ - have_attributes(name: 'timezone', value: timezone) - end - end -end diff --git a/spec/facter/facts/ubuntu/os/distro/release_spec.rb b/spec/facter/facts/ubuntu/os/distro/release_spec.rb new file mode 100644 index 000000000..1daf6a172 --- /dev/null +++ b/spec/facter/facts/ubuntu/os/distro/release_spec.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +describe Facts::Ubuntu::Os::Distro::Release do + describe '#call_the_resolver' do + subject(:fact) { Facts::Ubuntu::Os::Distro::Release.new } + + shared_examples 'returns distro release fact' do + it 'returns release fact' do + expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \ + have_attributes(name: 'os.distro.release', value: fact_value) + end + end + + before do + allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release_value) + end + + context 'when version_id is retrieved successful' do + let(:os_release_value) { '18.04' } + let(:fact_value) { { 'full' => '18.04', 'major' => '18.04' } } + + it 'calls Facter::Resolvers::OsRelease with :version_id' do + fact.call_the_resolver + expect(Facter::Resolvers::OsRelease).to have_received(:resolve).with(:version_id) + end + + it_behaves_like 'returns distro release fact' + end + + context 'when version_id could not be retrieved' do + let(:os_release_value) { nil } + let(:fact_value) { nil } + + it_behaves_like 'returns distro release fact' + end + + context 'when version has no minor' do + let(:os_release_value) { 'experimental_release' } + let(:fact_value) { { 'full' => 'experimental_release', 'major' => 'experimental_release' } } + + it_behaves_like 'returns distro release fact' + end + end +end diff --git a/spec/facter/facts/ubuntu/os/release_spec.rb b/spec/facter/facts/ubuntu/os/release_spec.rb new file mode 100644 index 000000000..0776a5b74 --- /dev/null +++ b/spec/facter/facts/ubuntu/os/release_spec.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +describe Facts::Ubuntu::Os::Release do + describe '#call_the_resolver' do + subject(:fact) { Facts::Ubuntu::Os::Release.new } + + let(:value) { '10.9' } + + before do + allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(value) + end + + it 'calls Facter::Resolvers::OsRelease' do + fact.call_the_resolver + expect(Facter::Resolvers::OsRelease).to have_received(:resolve).with(:version_id) + end + + it 'returns release fact' do + expect(fact.call_the_resolver).to be_an_instance_of(Array).and \ + contain_exactly(an_object_having_attributes(name: 'os.release', value: { 'full' => value, 'major' => value }), + an_object_having_attributes(name: 'operatingsystemmajrelease', value: value, type: :legacy), + an_object_having_attributes(name: 'operatingsystemrelease', value: value, type: :legacy)) + end + end +end diff --git a/spec/framework/core/fact/internal/internal_fact_manager_spec.rb b/spec/framework/core/fact/internal/internal_fact_manager_spec.rb index 8fd7298f6..ece8b72bb 100644 --- a/spec/framework/core/fact/internal/internal_fact_manager_spec.rb +++ b/spec/framework/core/fact/internal/internal_fact_manager_spec.rb @@ -2,8 +2,8 @@ describe Facter::InternalFactManager do let(:internal_fact_manager) { Facter::InternalFactManager.new } - let(:os_name_class_spy) { class_spy(Facts::Debian::Os::Name) } - let(:os_name_instance_spy) { instance_spy(Facts::Debian::Os::Name) } + let(:os_name_class_spy) { class_spy(Facts::Linux::Os::Name) } + let(:os_name_instance_spy) { instance_spy(Facts::Linux::Os::Name) } describe '#resolve_facts' do it 'resolved one core fact' do diff --git a/spec/framework/core/fact_loaders/fact_loader_spec.rb b/spec/framework/core/fact_loaders/fact_loader_spec.rb index c7e51d299..0e7501d5d 100644 --- a/spec/framework/core/fact_loaders/fact_loader_spec.rb +++ b/spec/framework/core/fact_loaders/fact_loader_spec.rb @@ -5,7 +5,7 @@ let(:internal_fact_loader_double) { double(Facter::InternalFactLoader) } let(:external_fact_loader_double) { double(Facter::ExternalFactLoader) } - let(:ubuntu_os_name) { double(Facts::Debian::Os::Name) } + let(:ubuntu_os_name) { double(Facts::Linux::Os::Name) } let(:networking_class) { double(Facts::Windows::NetworkInterfaces) } let(:loaded_fact_os_name) { double(Facter::LoadedFact, name: 'os.name', klass: ubuntu_os_name, type: :core) } diff --git a/spec/framework/core/fact_loaders/internal_fact_loader_spec.rb b/spec/framework/core/fact_loaders/internal_fact_loader_spec.rb index 6b4784fb6..19ce7e6bb 100644 --- a/spec/framework/core/fact_loaders/internal_fact_loader_spec.rb +++ b/spec/framework/core/fact_loaders/internal_fact_loader_spec.rb @@ -8,7 +8,7 @@ let(:class_discoverer_mock) { instance_spy(Facter::ClassDiscoverer) } before do - allow(os_detector_mock).to receive(:hierarchy).and_return([:Debian]) + allow(os_detector_mock).to receive(:hierarchy).and_return([:Linux]) allow(OsDetector).to receive(:instance).and_return(os_detector_mock) end @@ -43,11 +43,11 @@ before do allow(class_discoverer_mock) .to receive(:discover_classes) - .with(:Debian) - .and_return([Facts::Debian::Path]) + .with(:Linux) + .and_return([Facts::Linux::Path]) allow(Facter::ClassDiscoverer).to receive(:instance).and_return(class_discoverer_mock) - stub_const('Facts::Debian::Path::FACT_NAME', 'path') + stub_const('Facts::Linux::Path::FACT_NAME', 'path') end it 'loads no legacy facts' do @@ -95,7 +95,7 @@ before do allow(class_discoverer_mock) .to receive(:discover_classes) - .with(:Debian) + .with(:Linux) .and_return([]) allow(Facter::ClassDiscoverer).to receive(:instance).and_return(class_discoverer_mock) end @@ -107,33 +107,39 @@ context 'when loading hierarchy of facts' do before do - allow(os_detector_mock).to receive(:hierarchy).and_return(%i[Debian El]) + allow(os_detector_mock).to receive(:hierarchy).and_return(%i[Linux Rhel]) allow(OsDetector).to receive(:instance).and_return(os_detector_mock) allow(class_discoverer_mock) .to receive(:discover_classes) - .with(:Debian) - .and_return([Facts::Debian::Path]) + .with(:Linux) + .and_return([Facts::Linux::Os::Family]) allow(class_discoverer_mock) .to receive(:discover_classes) - .with(:El) - .and_return([Facts::El::Path]) + .with(:Rhel) + .and_return([Facts::Rhel::Os::Family]) allow(Facter::ClassDiscoverer).to receive(:instance).and_return(class_discoverer_mock) - stub_const('Facts::Debian::Path::FACT_NAME', 'path') - stub_const('Facts::El::Path::FACT_NAME', 'path') + stub_const('Facts::Linux::Path::FACT_NAME', 'os.family') + stub_const('Facts::Rhel::Path::FACT_NAME', 'os.family') end it 'loads one fact' do - expect(internal_fact_loader.facts.size).to eq(1) + core_facts = internal_fact_loader.facts.select { |loaded_fact| loaded_fact.type == :core } + + expect(core_facts.size).to eq(1) end - it 'loads path fact' do - expect(internal_fact_loader.facts.first.name).to eq('path') + it 'loads os.family fact' do + core_facts = internal_fact_loader.facts.select { |loaded_fact| loaded_fact.type == :core } + + expect(core_facts.first.name).to eq('os.family') end - it 'loads only el path' do - expect(internal_fact_loader.facts.first.klass).to eq(Facts::El::Path) + it 'loads only Rhel path' do + core_facts = internal_fact_loader.facts.select { |loaded_fact| loaded_fact.type == :core } + + expect(core_facts.first.klass).to eq(Facts::Rhel::Os::Family) end end @@ -141,12 +147,12 @@ before do allow(class_discoverer_mock) .to receive(:discover_classes) - .with(:Debian) - .and_return([Facts::Debian::Os::Name]) + .with(:Linux) + .and_return([Facts::Linux::Os::Name]) allow(Facter::ClassDiscoverer).to receive(:instance).and_return(class_discoverer_mock) - stub_const('Facts::Debian::Os::Name::FACT_NAME', 'os.name') - stub_const('Facts::Debian::Os::Name::ALIASES', 'operatingsystem') + stub_const('Facts::Linux::Os::Name::FACT_NAME', 'os.name') + stub_const('Facts::Linux::Os::Name::ALIASES', 'operatingsystem') end it 'loads two facts' do @@ -205,7 +211,7 @@ before do allow(class_discoverer_mock) .to receive(:discover_classes) - .with(:Debian) + .with(:Linux) .and_return([Facts::Debian::Lsbdistid]) allow(Facter::ClassDiscoverer).to receive(:instance).and_return(class_discoverer_mock) diff --git a/spec/framework/core/fact_manager_spec.rb b/spec/framework/core/fact_manager_spec.rb index eb9190932..166ca841b 100644 --- a/spec/framework/core/fact_manager_spec.rb +++ b/spec/framework/core/fact_manager_spec.rb @@ -14,7 +14,7 @@ describe '#resolve_facts' do it 'resolved all facts' do - ubuntu_os_name = double(Facts::Debian::Os::Name) + ubuntu_os_name = double(Facts::Linux::Os::Name) user_query = [] loaded_fact_os_name = double(Facter::LoadedFact, name: 'os.name', klass: ubuntu_os_name, type: :core) @@ -63,7 +63,7 @@ describe '#resolve_core' do it 'resolves all core facts' do - ubuntu_os_name = double(Facts::Debian::Os::Name) + ubuntu_os_name = double(Facts::Linux::Os::Name) user_query = [] loaded_fact_os_name = double(Facter::LoadedFact, name: 'os.name', klass: ubuntu_os_name, type: :core)