Merge pull request #2492 from smokris/virtual-smartos-lx

(FACT-3121) Detect Illumos (SmartOS/OmniOS) LX virtualization
puppetlabs · Feb 5, 2024 · 3974869 · 3974869
2 parents 75771c9 + 430d549
commit 3974869
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/lib/facter/util/facts/posix/virtual_detector.rb b/lib/facter/util/facts/posix/virtual_detector.rb
@@ -8,9 +8,9 @@ module VirtualDetector
           class << self
             def platform
               @fact_value ||= # rubocop:disable Naming/MemoizedInstanceVariableName
-                check_docker_lxc || check_freebsd || check_gce || retrieve_from_virt_what || \
-                check_vmware || check_open_vz || check_vserver || check_xen || check_other_facts || \
-                check_lspci || 'physical'
+                check_docker_lxc || check_freebsd || check_gce || check_illumos_lx || \
+                retrieve_from_virt_what || check_vmware || check_open_vz || check_vserver || \
+                check_xen || check_other_facts || check_lspci || 'physical'
             end
 
             private
@@ -24,6 +24,10 @@ def check_gce
               'gce' if bios_vendor&.include?('Google')
             end
 
+            def check_illumos_lx
+              'illumos-lx' if Facter::Resolvers::Uname.resolve(:kernelversion) == 'BrandZ virtual linux'
+            end
+
             def check_vmware
               Facter::Resolvers::Vmware.resolve(:vm)
             end

diff --git a/spec/facter/util/facts/posix/virtual_detector_spec.rb b/spec/facter/util/facts/posix/virtual_detector_spec.rb
@@ -74,6 +74,7 @@
         allow(Facter::Resolvers::Containers).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::Freebsd::Virtual).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vm).and_return(value)
       end
 
@@ -96,6 +97,7 @@
         allow(Facter::Resolvers::Freebsd::Virtual).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vm).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
         allow(Facter::Resolvers::Vmware).to receive(:resolve).with(:vm).and_return(value)
       end
 
@@ -119,6 +121,7 @@
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::Vmware).to receive(:resolve).with(:vm).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
         allow(Facter::Resolvers::OpenVz).to receive(:resolve).with(:vm).and_return(value)
       end
 
@@ -143,6 +146,7 @@
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::Vmware).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::OpenVz).to receive(:resolve).with(:vm).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vserver).and_return(value)
       end
 
@@ -168,6 +172,7 @@
         allow(Facter::Resolvers::Vmware).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::OpenVz).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vserver).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
         allow(Facter::Resolvers::Xen).to receive(:resolve).with(:vm).and_return(value)
       end
 
@@ -193,6 +198,7 @@
         allow(Facter::Resolvers::OpenVz).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vserver).and_return(nil)
         allow(Facter::Resolvers::Xen).to receive(:resolve).with(:vm).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:product_name).and_return('Bochs Machine')
       end
@@ -227,6 +233,7 @@
         allow(Facter::Resolvers::Xen).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:product_name).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
         allow(Facter::Resolvers::Lspci).to receive(:resolve).with(:vm).and_return(value)
       end
 
@@ -241,6 +248,23 @@
       end
     end
 
+    context 'when illumos-lx' do
+      let(:value) { 'illumos-lx' }
+
+      before do
+        allow(Facter::Resolvers::Containers).to receive(:resolve).with(:vm).and_return(nil)
+        allow(Facter::Resolvers::Freebsd::Virtual).to receive(:resolve).with(:vm).and_return(nil)
+        allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
+        allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:product_name).and_return(nil)
+        allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vm).and_return('lxc')
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return('BrandZ virtual linux')
+      end
+
+      it 'returns illumos-lx' do
+        expect(detector.platform).to eq(value)
+      end
+    end
+
     context 'when all resolvers return nil ' do
       let(:vm) { 'physical' }
 
@@ -255,6 +279,7 @@
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:product_name).and_return(nil)
         allow(Facter::Resolvers::Lspci).to receive(:resolve).with(:vm).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
       end
 
       it 'returns physical' do
@@ -274,6 +299,7 @@
         allow(Facter::Resolvers::VirtWhat).to receive(:resolve).with(:vserver).and_return(nil)
         allow(Facter::Resolvers::Xen).to receive(:resolve).with(:vm).and_return(nil)
         allow(Facter::Resolvers::Lspci).to receive(:resolve).with(:vm).and_return(nil)
+        allow(Facter::Resolvers::Uname).to receive(:resolve).with(:kernelversion).and_return(nil)
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:bios_vendor).and_return('unknown')
         allow(Facter::Resolvers::Linux::DmiBios).to receive(:resolve).with(:product_name).and_return('unknown')
       end