Merge pull request #1945 from puppetlabs/FACT-2218

(FACT-2218) virtual fact for OSX

Author: oanatmaria

.rubocop_todo.yml

@@ -92,6 +92,8 @@ RSpec/FilePath:
     - 'spec/framework/formatters/legacy_fact_formatter_spec.rb'
     - 'spec/framework/formatters/yaml_fact_formatter_spec.rb'
     - 'spec/framework/utils/utils_spec.rb'
+    - 'spec/facter/resolvers/macosx/utils/system_profile_executor_spec.rb'
+
 
 # Offense count: 15
 # Configuration parameters: AssignmentOnly.

lib/facts/macosx/is_virtual.rb

@@ -16,13 +16,13 @@ def virtual?
       end
 
       def hypervisor_name
-        model_identifier = Facter::Resolvers::SystemProfiler.resolve(:model_identifier)
+        model_identifier = Facter::Resolvers::Macosx::SystemProfiler.resolve(:model_identifier)
         return 'vmware' if model_identifier&.start_with?('VMware')
 
-        boot_rom_version = Facter::Resolvers::SystemProfiler.resolve(:boot_rom_version)
+        boot_rom_version = Facter::Resolvers::Macosx::SystemProfiler.resolve(:boot_rom_version)
         return 'virtualbox' if boot_rom_version&.start_with?('VirtualBox')
 
-        subsystem_vendor_id = Facter::Resolvers::SystemProfiler.resolve(:subsystem_vendor_id)
+        subsystem_vendor_id = Facter::Resolvers::Macosx::SystemProfiler.resolve(:subsystem_vendor_id)
         return 'parallels' if subsystem_vendor_id&.start_with?('0x1ab8')
       end
     end

lib/facts/macosx/system_profiler/boot_mode.rb

@@ -8,7 +8,7 @@ class BootMode
         ALIASES = 'sp_boot_mode'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SystemProfiler.resolve(:boot_mode)
+          fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:boot_mode)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/system_profiler/boot_rom_version.rb

@@ -8,7 +8,7 @@ class BootRomVersion
         ALIASES = 'sp_boot_rom_version'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SystemProfiler.resolve(:boot_rom_version)
+          fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:boot_rom_version)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/system_profiler/boot_volume.rb

@@ -8,7 +8,7 @@ class BootVolume
         ALIASES = 'sp_boot_volume'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SystemProfiler.resolve(:boot_volume)
+          fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:boot_volume)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/system_profiler/computer_name.rb

@@ -8,7 +8,7 @@ class ComputerName
         ALIASES = 'sp_local_host_name'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SystemProfiler.resolve(:computer_name)
+          fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:computer_name)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/system_profiler/cores.rb

@@ -8,7 +8,7 @@ class Cores
         ALIASES = 'sp_number_processors'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SystemProfiler.resolve(:total_number_of_cores)
+          fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:total_number_of_cores)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/system_profiler/hardware_uuid.rb

@@ -8,7 +8,7 @@ class HardwareUuid
         ALIASES = 'sp_hardware_uuid'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SystemProfiler.resolve(:hardware_uuid)
+          fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:hardware_uuid)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/system_profiler/kernel_version.rb

@@ -8,7 +8,7 @@ class KernelVersion
         ALIASES = 'sp_kernel_version'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SystemProfiler.resolve(:kernel_version)
+          fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:kernel_version)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end

lib/facts/macosx/system_profiler/l2_cache_per_core.rb

@@ -8,7 +8,7 @@ class L2CachePerCore
         ALIASES = 'sp_l2_cache_per_core'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SystemProfiler.resolve(:l2_cache_per_core)
+          fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:l2_cache_per_core)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end