facter 4.0.26 → 4.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90029b76954a57efa0f989018162ae7f86e26d9b111db2167086de82ef55f57
-  data.tar.gz: 65abc86b8335b04f49e533286313e86602050b097140b8462c911cb6cf44b139
+  metadata.gz: 2e1b413834535a34f7dac34136145899d86ad7b19365d96ffe123b2011bed6fc
+  data.tar.gz: 1fd66831beb687d29381fc4fd49fecd414f178e5ef4e758918033034fc6faec3
 SHA512:
-  metadata.gz: d94ca6623630e5889c10472cdfd083c3b34ba6f200c8e3ddf1bcdbe16f00a59a674b350e5c2bf0e7f99dd0339a26899bd5a7525096a2b1e36a341e9b2adac116
-  data.tar.gz: c0909ade0eab953884e87e4fe731453c1ef60e1fea653ed7d65c4d0891cdc8f75d21221a07e4a68389e1c0f280ecb18975455e1802d1864135c1115c4fc44eed
+  metadata.gz: 0d0607ee1bbfcbc7c3de2b30d73cfd457a553dad1dbdec7a8febd39738db9b17f7913db973fd1d23ec8a579625128bcf2e987b0fd682c6cd1a2fcd33a475b2d4
+  data.tar.gz: c3269d4ea6b70bc43bee5551d704d13252daa535944332e1ba5d8616921f8b4290579f5a630a6945469db1fef8446e322f772f58552a36349411ba90af85d73e

data/.github/actions/presuite.rb

@@ -10,17 +10,6 @@ def install_facter_3_dependencies
   run('bundle install')
 end
 
-def use_custom_beaker
-  message('USE CUSTOM BEAKER')
-  beaker_path, _ = run('bundle info beaker --path', FACTER_3_ACCEPTANCE_PATH)
-  Dir.chdir(beaker_path.split("\n").last) do
-    run('git init')
-    run("git remote add origin https://github.com/Filipovici-Andrei/beaker.git")
-    run('git fetch')
-    run("git reset --hard origin/github_actions")
-  end
-end
-
 def initialize_beaker
   beaker_platform_with_options = platform_with_options(beaker_platform)
 
@@ -35,6 +24,7 @@ def beaker_platform
   {
       'ubuntu-18.04' => 'ubuntu1804-64a',
       'ubuntu-16.04' => 'ubuntu1604-64a',
+      'ubuntu-20.04' => 'ubuntu2004-64a',
       'macos-10.15' => 'osx1015-64a',
       'windows-2016' => 'windows2016-64a',
       'windows-2019' => 'windows2019-64a'
@@ -135,7 +125,6 @@ HOST_PLATFORM = ARGV[0]
 install_bundler
 
 Dir.chdir(FACTER_3_ACCEPTANCE_PATH) { install_facter_3_dependencies }
-use_custom_beaker
 
 Dir.chdir(FACTER_3_ACCEPTANCE_PATH) do
   initialize_beaker

data/.github/workflows/acceptance_tests.yml

@@ -4,17 +4,17 @@ name: Acceptance tests
 on:
   push:
     branches:
-      - master
+      - 4.x
   pull_request:
     branches:
-      - master
+      - 4.x
 
 jobs:
   acceptance_tests:
     name: Platform
     strategy:
       matrix:
-        os: [windows-2016, windows-2019, ubuntu-16.04, ubuntu-18.04, macos-10.15]
+        os: [windows-2016, windows-2019, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.15]
     runs-on: ${{ matrix.os }}
     env:
       FACTER_3_ROOT: facter_3
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: puppetlabs/facter
-          ref: windows_github
+          ref: github_acceptance_tests
           path: facter_3
 
       - name: Install Ruby 2.6

data/.github/workflows/checks.yaml

@@ -4,10 +4,10 @@ name: Checks
 on:
   push:
     branches:
-      - master
+      - 4.x
   pull_request:
     branches:
-      - master
+      - 4.x
 
 jobs:
   rubocop_checks:
@@ -29,7 +29,13 @@ jobs:
     name: RuboCop TODO
     steps:
       - uses: actions/checkout@v1
-      - uses: gimmyxd/rtc-action@0.0.5
+      - uses: gimmyxd/rtc-action@0.2.1
+        env:
+          RTC_TOKEN: ${{ secrets.RTC_TOKEN }}
+          UPDATE_PR: false
+
+          # forces the job to fail if there are any new offences
+          FORCE_ERROR_EXIT: true
 
   commit_checks:
     runs-on: ubuntu-18.04

data/.github/workflows/coverage.yaml

@@ -4,7 +4,7 @@ name: Coverage
 on:
   push:
     branches:
-      - master
+      - 4.x
 
 jobs:
   coverage_checks:

data/.github/workflows/unit_tests.yaml

@@ -4,10 +4,10 @@ name: Unit tests
 on:
   push:
     branches:
-      - master
+      - 4.x
   pull_request:
     branches:
-      - master
+      - 4.x
 
 jobs:
   linux_unit_tests:

data/.rubocop.yml

@@ -3,6 +3,8 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   TargetRubyVersion: 2.3
+  Exclude:
+    - acceptance/**/*
 
 require:
   - rubocop-performance
@@ -29,6 +31,7 @@ Metrics/MethodLength:
     - 'lib/custom_facts/core/execution/windows.rb'
     - 'lib/custom_facts/core/execution/base.rb'
     - 'lib/framework/detector/os_detector.rb'
+    - 'lib/resolvers/bsd/ffi/ffi_helper.rb'
 
 Metrics/ModuleLength:
   Max: 100
@@ -56,6 +59,7 @@ Metrics/AbcSize:
     - 'lib/custom_facts/core/execution/windows.rb'
     - 'lib/custom_facts/core/execution/base.rb'
     - 'lib/custom_facts/core/resolvable.rb'
+    - 'lib/resolvers/bsd/ffi/ffi_helper.rb'
 
 Metrics/PerceivedComplexity:
   Exclude:
@@ -80,6 +84,7 @@ Metrics/ClassLength:
     - 'lib/framework/core/options/option_store.rb'
     - 'lib/framework/cli/cli.rb'
     - 'lib/resolvers/networking_linux_resolver.rb'
+    - 'lib/framework/core/cache_manager.rb'
 
 Naming/AccessorMethodName:
   Exclude:

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1000`
-# on 2020-05-11 09:20:37 +0300 using RuboCop version 0.74.0.
+# on 2020-06-11 15:48:25 +0300 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 81
+# Offense count: 82
 # Configuration parameters: CustomTransform, IgnoreMethods.
 RSpec/FilePath:
   Exclude:
@@ -41,6 +41,7 @@ RSpec/FilePath:
     - 'spec/facter/resolvers/dmi_resolver_spec.rb'
     - 'spec/facter/resolvers/filesystems_resolver_spec.rb'
     - 'spec/facter/resolvers/fips_enabled_resolver_spec.rb'
+    - 'spec/facter/resolvers/freebsd/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/identity_resolver_spec.rb'
     - 'spec/facter/resolvers/load_averages_resolver_spec.rb'
     - 'spec/facter/resolvers/macosx/dmi_resolver_spec.rb'
@@ -110,7 +111,7 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
 
-# Offense count: 99
+# Offense count: 96
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -177,7 +178,7 @@ RSpec/SubjectStub:
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
 
-# Offense count: 131
+# Offense count: 134
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -211,6 +212,7 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/resolvers/aix/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/aix/hardware_resolver_spec.rb'
     - 'spec/facter/resolvers/bsd/ffi_helper_spec.rb'
+    - 'spec/facter/resolvers/freebsd/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'

data/CHANGELOG.md

@@ -1,4 +1,26 @@
+## [4.0.28](https://github.com/puppetlabs/facter/tree/4.0.28) (2020-06-25)
 
+[Full Changelog](https://github.com/puppetlabs/facter/compare/4.0.27...4.0.28)
+
+### Fixed
+- \(maint\) Fix aio_agent_version on non AIO node [\#1938](https://github.com/puppetlabs/facter/pull/1938) ([smortex](https://github.com/smortex))
+
+## [4.0.27](https://github.com/puppetlabs/facter/tree/4.0.27) (2020-06-24)
+
+[Full Changelog](https://github.com/puppetlabs/facter/compare/4.0.26...4.0.27)
+
+### Added
+- \(FACT-2212\) Networking facts for OSX [\#1929](https://github.com/puppetlabs/facter/pull/1929) ([Filipovici-Andrei](https://github.com/Filipovici-Andrei))
+- \(maint\) Add FreeBSD disks and partitions facts [\#553](https://github.com/puppetlabs/facter-ng/pull/553) ([smortex](https://github.com/smortex))
+- \(FACT-2638\) Use puppet AIO VERSION file to specify AIO version [\#549](https://github.com/puppetlabs/facter-ng/pull/549) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2654\) Add ec2 facts for Windows [\#546](https://github.com/puppetlabs/facter-ng/pull/546) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2620\) Add EC2 facts for linux [\#544](https://github.com/puppetlabs/facter-ng/pull/544) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2619\) External facts cache [\#541](https://github.com/puppetlabs/facter-ng/pull/541) ([florindragos](https://github.com/florindragos))
+- Add support for processors facts on \*BSD [\#489](https://github.com/puppetlabs/facter-ng/pull/489) ([smortex](https://github.com/smortex))
+
+### Fixed
+- \(FACT-2668\) Networking fact on linux should have logic for selecting IPs [\#1928](https://github.com/puppetlabs/facter/pull/1928) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2678\) Facter sometimes pollutes the calling processes environment (race condition) [\#1932](https://github.com/puppetlabs/facter/pull/1932) ([IrimieBogdan](https://github.com/IrimieBogdan))
 
 ## [4.0.26](https://github.com/puppetlabs/facter-ng/tree/4.0.26) (2020-06-11)
 

data/Rakefile

@@ -29,7 +29,8 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     end
 
     config.user = 'puppetlabs'
-    config.project = 'facter-ng'
+    config.project = 'facter'
+    config.release_branch = '4.x'
     config.since_tag = File.read('VERSION').strip
     config.future_release = retrieve_from_keyboard
     config.exclude_labels = ['maintenance']

data/VERSION

@@ -1 +1 @@
-4.0.26
+4.0.28

data/acceptance/.beaker.yml

@@ -0,0 +1,15 @@
+---
+ssh:
+  keys:
+    - id_rsa_acceptance
+    - ~/.ssh/id_rsa-acceptance
+xml:                         true
+timesync:                    false
+repo_proxy:                  true
+add_el_extras:               false
+forge_host:                  api-forge-aio02-petest.puppet.com
+'master-start-curl-retries': 30
+log_level:                   debug
+preserve_hosts:              onfail
+helper:                      ./lib/helper.rb
+options_file:                ./config/aio/options.rb

data/acceptance/.gitignore

@@ -0,0 +1,12 @@
+.vagrant
+local_options.rb
+repos.tar
+repo-configs
+log
+id_rsa-acceptance
+id_rsa-acceptance.pub
+preserved_config.yaml
+merged_options.rb
+junit
+tmp
+.bundle

data/acceptance/Gemfile

@@ -0,0 +1,24 @@
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
+
+def location_for(place, fake_version = nil)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
+gem "beaker", *location_for(ENV['BEAKER_VERSION'] || "~> 4")
+gem 'beaker-puppet', *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1')
+gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || "~> 1.1")
+gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || "~> 0.5")
+gem "beaker-vagrant", *location_for(ENV['BEAKER_VAGRANT_VERSION'] || "~> 0")
+gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || "~> 1")
+gem "rake", ">= 12.3.3"
+gem "multi_json", "~> 1.8"
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end

data/acceptance/Rakefile

@@ -0,0 +1,2 @@
+require 'beaker-puppet'
+Beaker::DSL::Helpers::RakeHelpers.load_tasks

data/acceptance/bin/ci-bootstrap-from-artifacts.sh

@@ -0,0 +1,55 @@
+#! /usr/bin/env bash
+
+###############################################################################
+# Initial preparation for a ci acceptance job in Jenkins.  Crucially, it
+# handles the untarring of the build artifact and bundle install, getting us to
+# a state where we can then bundle exec rake the particular ci:test we want to
+# run.
+#
+# Having this checked in in a script makes it much easier to have multiple
+# acceptance jobs.  It must be kept agnostic between Linux/Solaris/Windows
+# builds, however.
+
+set -x
+
+# If $GEM_SOURCE is not set, fall back to rubygems.org
+if [ -z $GEM_SOURCE ]; then
+  export GEM_SOURCE='https://rubygems.org'
+fi
+
+echo "SHA: ${SHA}"
+echo "FORK: ${FORK}"
+echo "BUILD_SELECTOR: ${BUILD_SELECTOR}"
+echo "PACKAGE_BUILD_STATUS: ${PACKAGE_BUILD_STATUS}"
+
+rm -rf acceptance
+tar -xzf acceptance-artifacts.tar.gz
+cd acceptance
+
+mkdir -p log/latest
+
+echo "===== This artifact is from ====="
+cat creator.txt
+
+bundle install --without=development --path=.bundle/gems
+
+if [[ "${platform}" =~ 'solaris' ]]; then
+  repo_proxy="  :repo_proxy => false,"
+fi
+
+# If the platform is Windows, append $ruby_arch
+if [[ "${platform}" =~ 'win' ]]; then
+    platform="${platform}-${ruby_arch}"
+fi
+
+cat > local_options.rb <<-EOF
+{
+  :hosts_file => 'config/nodes/${platform}.yaml',
+  :ssh => {
+    :keys => ["${HOME}/.ssh/id_rsa-acceptance"],
+  },
+${repo_proxy}
+}
+EOF
+
+[[ (-z "${PACKAGE_BUILD_STATUS}") || ("${PACKAGE_BUILD_STATUS}" = "success") ]] || exit 1

data/acceptance/config/aio/options.rb

@@ -0,0 +1,6 @@
+{
+  :type => 'aio',
+  :pre_suite => [
+      'setup/aio/pre-suite/001_run_with_facter_ng.rb',
+  ],
+}

data/acceptance/config/git/options.rb

@@ -0,0 +1,3 @@
+{
+  :type => :git,
+}

data/acceptance/config/nodes/aix-53-power.yaml

@@ -0,0 +1,7 @@
+---
+HOSTS:
+  pe-aix-53-acceptance:
+    roles:
+      - agent
+    platform: aix-5.3-power
+    hypervisor: none

data/acceptance/config/nodes/aix-61-power.yaml

@@ -0,0 +1,7 @@
+---
+HOSTS:
+  pe-aix-61-acceptance:
+    roles:
+      - agent
+    platform: aix-6.1-power
+    hypervisor: none

data/acceptance/config/nodes/aix-71-power.yaml

@@ -0,0 +1,7 @@
+---
+HOSTS:
+  pe-aix-71-acceptance:
+    roles:
+      - agent
+    platform: aix-7.1-power
+    hypervisor: none

data/acceptance/config/nodes/huaweios-6-powerpc.yaml

@@ -0,0 +1,7 @@
+---
+HOSTS:
+  huawei-ce6850-2-debian-vm-eth0.ops.puppetlabs.net:
+    roles:
+      - agent
+    platform: huaweios-6-powerpc
+    hypervisor: none

data/acceptance/config/nodes/solaris-10-sparc.yaml

@@ -0,0 +1,9 @@
+---
+HOSTS:
+  solaris-10-sparc:
+    roles:
+      - agent
+    platform: solaris-10-sparc
+    hypervisor: none
+    ip: 10.32.121.124
+    vmhostname: sol10-1.delivery.puppetlabs.net

data/acceptance/config/nodes/solaris-11-sparc.yaml

@@ -0,0 +1,9 @@
+---
+HOSTS:
+  solaris-11-sparc:
+    roles:
+      - agent
+    platform: solaris-11-sparc
+    hypervisor: none
+    ip: 10.32.114.245
+    vmhostname: sol11-1.delivery.puppetlabs.net

data/acceptance/lib/facter/acceptance/base_fact_utils.rb

@@ -0,0 +1,565 @@
+module Facter
+  module Acceptance
+    module BaseFactUtils
+
+      # return a hash of expected facts for os, processors, and kernel facts
+      #
+      def os_processors_and_kernel_expected_facts(agent)
+        if agent['platform'] =~ /aix-/
+          aix_expected_facts(agent)
+        elsif agent['platform'] =~ /cisco/
+          cisco_expected_facts(agent)
+        elsif agent['platform'] =~ /cumulus-/
+          cumulus_expected_facts(agent)
+        elsif agent['platform'] =~ /debian-/
+          debian_expected_facts(agent)
+        elsif agent['platform'] =~ /el-|centos-/
+          el_expected_facts(agent)
+        elsif agent['platform'] =~ /eos-/ # arista
+          eos_expected_facts(agent)
+        elsif agent['platform'] =~ /fedora-/
+          fedora_expected_facts(agent)
+        elsif agent['platform'] =~ /huaweios-/
+          huawei_expected_facts(agent)
+        elsif agent['platform'] =~ /osx-/
+          osx_expected_facts(agent)
+        elsif agent['platform'] =~ /sles-/
+          sles_expected_facts(agent)
+        elsif agent['platform'] =~ /solaris-/
+          solaris_expected_facts(agent)
+        elsif agent['platform'] =~ /ubuntu-/
+          ubuntu_expected_facts(agent)
+        elsif agent['platform'] =~ /windows-/
+          windows_expected_facts(agent)
+        else
+          fail_test("unknown agent type being tested #{agent['platform']}")
+        end
+      end
+
+      # return the value from the facter json parsed set of results using the fact path separated using '.'s
+      #
+      def json_result_fact_by_key_path(results, fact)
+        fact.split('.').each do |key|
+          results = results[key]
+        end
+        results
+      end
+
+      # AIX
+      def aix_expected_facts(agent)
+        version = agent['platform'].match(/aix-(\d)\.(\d)/)
+        if version.nil?
+          kernel_major_version = /\d\d00/
+        else
+          kernel_major_version = /#{version[1]}#{version[2]}00/
+        end
+        kernel_release = /^#{kernel_major_version}-\d+-\d+-\d+/
+        os_arch        = /[Pp]ower[Pp][Cc]/
+        os_hardware    = /IBM/
+
+        expected_facts = {
+            'os.architecture'   => os_arch,
+            'os.family'         => 'AIX',
+            'os.hardware'       => os_hardware,
+            'os.name'           => 'AIX',
+            'os.release.full'   => kernel_release,
+            'os.release.major'  => kernel_major_version,
+            'processors.count'  => /[1-9]+/,
+            'processors.isa'    => os_arch,
+            'processors.models' => os_arch,
+            'kernel'            => 'AIX',
+            'kernelrelease'     => kernel_release,
+            'kernelversion'     => kernel_major_version,
+            'kernelmajversion'  => kernel_major_version
+        }
+        expected_facts
+      end
+
+      # Cisco
+      def cisco_expected_facts(agent)
+        os_arch                 = 'x86_64'
+        os_hardware             = 'x86_64'
+        processor_model_pattern = 'Westmere'
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.family'                => 'cisco-wrlinux',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => /ios_xr|nexus/,
+            'os.release.full'          => /\d+\.\d+(\.\d+)?/,
+            'os.release.major'         => /\d+/,
+            'os.release.minor'         => /\d+/,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => /unknown|#{os_hardware}/,
+            'processors.models'        => /#{processor_model_pattern}/,
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # Cumulus
+      def cumulus_expected_facts(agent)
+        os_version       = /\d+\.\d+/
+        os_release_major = /\d+/
+        os_release_minor = /\d+/
+        os_arch          = 'x86_64'
+        os_hardware      = 'x86_64'
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.distro.codename'       => /\w+/,
+            'os.distro.description'    => /#{os_version}\.\d+-/,
+            'os.distro.id'             => 'Cumulus Linux',
+            'os.distro.release.full'   => /#{os_version}\.\d+/,
+            'os.distro.release.major'  => os_release_major,
+            'os.distro.release.minor'  => os_release_minor,
+            'os.family'                => 'Debian',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => 'CumulusLinux',
+            'os.release.full'          => /#{os_version}\.\d+/,
+            'os.release.major'         => os_release_major,
+            'os.release.minor'         => os_release_minor,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => /unknown|#{os_hardware}/,
+            'processors.models'        => /(Intel\(R\).*)|(AMD.*)/,
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # Debian
+      def debian_expected_facts(agent)
+        version = agent['platform'].match(/debian-(\d{1,2})/)
+        if version.nil?
+          os_version = /\d+/
+        else
+          os_version = /#{version[1]}/
+        end
+        if agent['platform'] =~ /amd64/
+          os_arch     = 'amd64'
+          os_hardware = 'x86_64'
+        else
+          os_arch     = 'i386'
+          os_hardware = 'i686'
+        end
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.distro.codename'       => /\w+/,
+            'os.distro.description'    => /Debian GNU\/Linux #{os_version}(\.\d)?/,
+            'os.distro.id'             => 'Debian',
+            'os.distro.release.full'   => /#{os_version}\.\d+/,
+            'os.distro.release.major'  => os_version,
+            'os.distro.release.minor'  => /\d/,
+            'os.family'                => 'Debian',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => 'Debian',
+            'os.release.full'          => /#{os_version}\.\d+/,
+            'os.release.major'         => os_version,
+            'os.release.minor'         => /\d/,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => /unknown|#{os_hardware}/,
+            'processors.models'        => /(Intel\(R\).*)|(AMD.*)/,
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # el (RedHat, Centos)
+      def el_expected_facts(agent)
+        version = agent['platform'].match(/(el|centos)-(\d)/)
+        if version.nil?
+          os_version = /\d+/
+        else
+          os_version = /#{version[2]}/
+        end
+        release_string = on(agent, 'cat /etc/*-release').stdout.downcase
+        case release_string
+          when /amazon/
+            os_name = 'Amazon'
+            # This parses: VERSION_ID="2017.09"
+            os_version = on(agent, 'grep VERSION_ID /etc/os-release | cut --delimiter=\" --fields=2 | cut --delimiter=. --fields=1').stdout.chomp
+          when /centos/
+            os_name = 'CentOS'
+          when /oracle/
+            os_name = 'OracleLinux'
+          when /scientific/
+            os_name = 'Scientific'
+          else
+            os_name = 'RedHat'
+        end
+        if agent['platform'] =~ /x86_64/
+          os_arch                 = 'x86_64'
+          os_hardware             = 'x86_64'
+          processor_model_pattern = /(Intel\(R\).*)|(AMD.*)/
+        elsif agent['platform'] =~ /ppc|power|64le/
+          os_arch                 = 'ppc64le'
+          os_hardware             = 'ppc64le'
+          processor_model_pattern = // # facter doesn't figure out the processor type on these machines
+        elsif agent['platform'] =~ /s390x/
+          os_arch                 = 's390x'
+          os_hardware             = 's390x'
+          processor_model_pattern = // # s390x does not populate a model value in /proc/cpuinfo
+        elsif agent['platform'] =~ /aarch64/
+          os_arch                 = 'aarch64'
+          os_hardware             = 'aarch64'
+          processor_model_pattern = // # aarch64 does not populate a model value in /proc/cpuinfo
+        else
+          os_arch                 = 'i386'
+          os_hardware             = 'i686'
+          processor_model_pattern = /(Intel\(R\).*)|(AMD.*)/
+        end
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.family'                => 'RedHat',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => os_name,
+            'os.release.full'          => /#{os_version}(\.\d+)?(\.\d+)?/,
+            'os.release.major'         => os_version,
+            'os.release.minor'         => /(\d+)?/,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => os_hardware,
+            'processors.models'        => processor_model_pattern,
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # eos Arista
+      def eos_expected_facts(agent)
+        version = agent['platform'].match(/eos-(\d+)-/)
+        if version.nil?
+          os_version = /\d+/
+        else
+          os_version = /#{version[1]}/
+        end
+        os_arch                 = 'x86_64'
+        os_hardware             = 'x86_64'
+        processor_model_pattern = 'Intel\(R\)'
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.family'                => 'Linux',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => 'AristaEOS',
+            'os.release.full'          => /#{os_version}\.\d+(\.\dF)?/,
+            'os.release.major'         => os_version,
+            'os.release.minor'         => /\d+/,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => os_hardware,
+            'processors.models'        => /#{processor_model_pattern}/,
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # fedora
+      def fedora_expected_facts(agent)
+        version = agent['platform'].match(/fedora-(\d\d)-/)
+        if version.nil?
+          os_version = /\d+/
+        else
+          os_version = /#{version[1]}/
+        end
+        if agent['platform'] =~ /x86_64/
+          os_arch     = 'x86_64'
+          os_hardware = 'x86_64'
+        else
+          os_arch     = 'i386'
+          os_hardware = 'i686'
+        end
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.family'                => 'RedHat',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => 'Fedora',
+            'os.release.full'          => os_version,
+            'os.release.major'         => os_version,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => os_hardware,
+            'processors.models'        => /(Intel\(R\).*)|(AMD.*)/,
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # huawei
+      def huawei_expected_facts(agent)
+        os_version       = /\d+\.\d+/
+        os_version_major = /\d+/
+        os_version_minor = /\d+/
+        os_arch          = 'ppc'
+        os_hardware      = 'ppc'
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.family'                => 'Debian',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => 'Debian',
+            'os.release.full'          => os_version,
+            'os.release.major'         => os_version_major,
+            'os.release.minor'         => os_version_minor,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => 'unknown',
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # osx
+      def osx_expected_facts(agent)
+        version = agent['platform'].match(/osx-(10\.\d+)/)
+        if version.nil?
+          os_version = /\d+\.\d+/
+        else
+          os_version = /#{version[1]}/
+        end
+
+        expected_facts = {
+            'os.architecture'          => 'x86_64',
+            'os.family'                => 'Darwin',
+            'os.hardware'              => 'x86_64',
+            'os.name'                  => 'Darwin',
+            'os.macosx.build'          => /\d+[A-Z]\d{2,4}\w?/,
+            'os.macosx.product'        => 'Mac OS X',
+            'os.macosx.version.full'   => /#{os_version}\.\d+/,
+            'os.macosx.version.major'  => os_version,
+            'os.macosx.version.minor'  => /\d+/,
+            'os.release.full'          => /\d+\.\d+\.\d+/,
+            'os.release.major'         => /\d+/,
+            'os.release.minor'         => /\d+/,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => 'i386',
+            'processors.models'        => /"Intel\(R\).*"/,
+            'kernel'                   => 'Darwin',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # SLES
+      def sles_expected_facts(agent)
+        version = agent['platform'].match(/sles-(\d\d)/)
+        if version.nil?
+          os_version = /\d+/
+        else
+          os_version = /#{version[1]}/
+        end
+        if agent['platform'] =~ /x86_64/
+          os_arch                 = 'x86_64'
+          os_hardware             = 'x86_64'
+          processor_model_pattern = /(Intel\(R\).*)|(AMD.*)/
+        elsif agent['platform'] =~ /ppc|power|64le/
+          os_arch                 = 'ppc64le'
+          os_hardware             = 'ppc64le'
+          processor_model_pattern = // # facter doesn't figure out the processor type on these machines
+        elsif agent['platform'] =~ /s390x/
+          os_arch                 = 's390x'
+          os_hardware             = 's390x'
+          processor_model_pattern = // # s390x does not populate a model value in /proc/cpuinfo
+        else
+          os_arch                 = 'i386'
+          os_hardware             = 'i686'
+          processor_model_pattern = /(Intel\(R\).*)|(AMD.*)/
+        end
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.family'                => 'Suse',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => 'SLES',
+            'os.release.full'          => /#{os_version}\.\d+(\.\d+)?/,
+            'os.release.major'         => os_version,
+            'os.release.minor'         => /\d+/,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => os_hardware,
+            'processors.models'        => processor_model_pattern,
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # Solaris
+      def solaris_expected_facts(agent)
+        version = agent['platform'].match(/solaris-(\d\d)/)
+        if version.nil?
+          os_version = /\d+/
+        else
+          os_version = /#{version[1]}/
+        end
+        case agent[:platform]
+          when /solaris-10/
+            os_release_full = /#{os_version}_u\d+/
+            os_kernel       = /Generic_\d+-\d+/
+            os_kernel_major = os_kernel
+          when /solaris-11/
+            os_release_full = /#{os_version}\.\d+/
+            os_kernel       = os_release_full
+            os_kernel_major = os_version
+          else
+            fail_test("Unknown Solaris version #{agent['platform']}")
+        end
+        case agent[:platform]
+          when /sparc/
+            os_architecture = 'sun4v'
+            proc_models     = /.*SPARC.*/
+            proc_isa        = /sparc/
+          else
+            os_architecture = 'i86pc'
+            proc_models     = /(Intel.*)|(AMD.*)/
+            proc_isa        = /i386/
+        end
+
+        expected_facts = {
+            'os.architecture'          => os_architecture,
+            'os.family'                => 'Solaris',
+            'os.hardware'              => os_architecture,
+            'os.name'                  => 'Solaris',
+            'os.release.full'          => os_release_full,
+            'os.release.major'         => os_version,
+            'os.release.minor'         => /\d+/,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => proc_isa,
+            'processors.models'        => proc_models,
+            'kernel'                   => 'SunOS',
+            'kernelrelease'            => /5\.#{os_version}/,
+            'kernelversion'            => os_kernel,
+            'kernelmajversion'         => os_kernel_major
+        }
+        expected_facts
+      end
+
+      # Ubuntu
+      def ubuntu_expected_facts(agent)
+        version = agent['platform'].match(/ubuntu-(\d\d\.\d\d)/)
+        if version.nil?
+          os_version = /\d+\.\d+/
+        else
+          os_version = /#{version[1]}/
+        end
+        if agent['platform'] =~ /x86_64|amd64/
+          os_arch     = 'amd64'
+          os_hardware = 'x86_64'
+          processor_model_pattern = /(Intel\(R\).*)|(AMD.*)/
+        elsif agent['platform'] =~ /ppc|power|64le/
+          os_arch                 = 'ppc64le'
+          os_hardware             = 'ppc64le'
+          processor_model_pattern = // # facter doesn't figure out the processor type on these machines
+        else
+          os_arch     = 'i386'
+          os_hardware = 'i686'
+          processor_model_pattern = /(Intel\(R\).*)|(AMD.*)/
+        end
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.distro.codename'       => /\w+/,
+            'os.distro.description'    => /Ubuntu #{os_version}/,
+            'os.distro.id'             => 'Ubuntu',
+            'os.distro.release.full'   => os_version,
+            'os.distro.release.major'  => os_version,
+            'os.family'                => 'Debian',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => 'Ubuntu',
+            'os.release.full'          => os_version,
+            'os.release.major'         => os_version,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => os_hardware,
+            'processors.models'        => processor_model_pattern,
+            'kernel'                   => 'Linux',
+            'kernelrelease'            => /\d+\.\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+
+      # Windows
+      def windows_expected_facts(agent)
+        # Get expected values based on platform name
+        if agent['platform'] =~ /windows-7/
+          os_version = '7'
+        elsif agent['platform'] =~ /windows-8.1/
+          os_version = '8.1'
+        elsif agent['platform'] =~ /2008/
+          os_version = '2008 R2'
+        elsif agent['platform'] =~ /2012/
+          os_version = agent['platform'] =~ /R2/ ? '2012 R2' : '2012'
+        elsif agent['platform'] =~ /-10/
+          os_version = '10'
+        elsif agent['platform'] =~ /2016/
+          os_version = '2016'
+        elsif agent['platform'] =~ /2019/
+          os_version = '2019'
+        else
+          fail_test "Unknown Windows version #{agent['platform']}"
+        end
+        if agent['platform'] =~ /64/
+          os_arch     = 'x64'
+          os_hardware = 'x86_64'
+        else
+          os_arch     = 'x86'
+          os_hardware = 'i686'
+        end
+
+        expected_facts = {
+            'os.architecture'          => os_arch,
+            'os.family'                => 'windows',
+            'os.hardware'              => os_hardware,
+            'os.name'                  => 'windows',
+            'os.release.full'          => os_version,
+            'os.release.major'         => os_version,
+            'os.windows.system32'      => /C:\\(WINDOWS|Windows)\\(system32|sysnative)/,
+            'processors.count'         => /[1-9]/,
+            'processors.physicalcount' => /[1-9]/,
+            'processors.isa'           => /x86|x64/,
+            'processors.models'        => /(Intel\(R\).*)|(AMD.*)/,
+            'kernel'                   => 'windows',
+            'kernelrelease'            => /\d+\.\d+/,
+            'kernelversion'            => /\d+\.\d+/,
+            'kernelmajversion'         => /\d+\.\d+/
+        }
+        expected_facts
+      end
+    end
+  end
+end