ohai 13.12.6 → 14.0.28

data/spec/unit/plugins/linux/platform_spec.rb

@@ -458,22 +458,6 @@ OS_RELEASE
         expect(@plugin[:platform_version].to_f).to eq(7.3)
       end
 
-      it "should read the platform as amazon and version as 2 on the RC release" do
-        expect(File).to receive(:read).with("/etc/redhat-release").and_return("Amazon Linux release 2 (2017.12) LTS Release Candidate")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("amazon")
-        expect(@plugin[:platform_family]).to eq("amazon")
-        expect(@plugin[:platform_version].to_f).to eq(2)
-      end
-
-      it "should read the platform as amazon and version as 2 on the final release" do
-        expect(File).to receive(:read).with("/etc/redhat-release").and_return("Amazon Linux 2")
-        @plugin.run
-        expect(@plugin[:platform]).to eq("amazon")
-        expect(@plugin[:platform_family]).to eq("amazon")
-        expect(@plugin[:platform_version].to_f).to eq(2)
-      end
-
       # https://github.com/chef/ohai/issues/560
       # Issue is seen on EL7, so that's what we're testing.
       context "on versions that have /etc/os-release" do
@@ -727,7 +711,7 @@ OS_RELEASE
 
       it "correctly detects SLES15" do
         @plugin.run
-        expect(@plugin[:platform]).to eq("suse")
+        expect(@plugin[:platform]).to eq("sles")
         expect(@plugin[:platform_version]).to eq("15")
         expect(@plugin[:platform_family]).to eq("suse")
       end

data/spec/unit/plugins/linux/virtualization_spec.rb

@@ -40,11 +40,13 @@ describe Ohai::System, "Linux virtualization platform" do
     allow(File).to receive(:exist?).with("/sys/devices/virtual/misc/kvm").and_return(false)
     allow(File).to receive(:exist?).with("/dev/lxd/sock").and_return(false)
     allow(File).to receive(:exist?).with("/var/lib/lxd/devlxd").and_return(false)
+    allow(File).to receive(:exist?).with("/var/snap/lxd/common/lxd/devlxd").and_return(false)
     allow(File).to receive(:exist?).with("/proc/1/environ").and_return(false)
 
     # default the which wrappers to nil
     allow(plugin).to receive(:which).with("lxc-version").and_return(nil)
     allow(plugin).to receive(:which).with("lxc-start").and_return(nil)
+    allow(plugin).to receive(:which).with("docker").and_return(nil)
     allow(plugin).to receive(:nova_exists?).and_return(false)
   end
 
@@ -85,6 +87,16 @@ describe Ohai::System, "Linux virtualization platform" do
     end
   end
 
+  describe "when we are checking for docker" do
+    it "sets docker host if docker binary exists" do
+      allow(plugin).to receive(:which).with("docker").and_return(true)
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("docker")
+      expect(plugin[:virtualization][:role]).to eq("host")
+      expect(plugin[:virtualization][:systems][:docker]).to eq("host")
+    end
+  end
+
   describe "when we are checking for openstack" do
     it "sets openstack host if nova binary exists" do
       allow(plugin).to receive(:nova_exists?).and_return("/usr/bin/nova")
@@ -495,13 +507,21 @@ VEERTU
       expect(plugin[:virtualization][:role]).to eq("guest")
     end
 
-    it "setx lxd host if /var/lib/lxd/devlxd exists" do
+    it "sets lxd host if /var/lib/lxd/devlxd exists" do
       expect(File).to receive(:exist?).with("/var/lib/lxd/devlxd").and_return(true)
 
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("lxd")
       expect(plugin[:virtualization][:role]).to eq("host")
     end
+
+    it "sets lxd host if /var/snap/lxd/common/lxd/devlxd exists" do
+      expect(File).to receive(:exist?).with("/var/snap/lxd/common/lxd/devlxd").and_return(true)
+
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("lxd")
+      expect(plugin[:virtualization][:role]).to eq("host")
+    end
   end
 
   describe "when we are checking for lxc" do

data/spec/unit/plugins/network_spec.rb

@@ -20,8 +20,8 @@ require_relative "../../spec_helper.rb"
 
 def it_doesnt_fail
   it "doesnt fail" do
-    allow(Ohai::Log).to receive(:warn)
-    expect(Ohai::Log).not_to receive(:debug).with(/^Plugin network threw exception/)
+    allow(@plugin.logger).to receive(:warn)
+    expect(@plugin.logger).not_to receive(:trace).with(/^Plugin network threw exception/)
     @plugin.run
   end
 end
@@ -32,8 +32,8 @@ def it_populates_ipaddress_attributes
 
   it "populates ipaddress, macaddress and ip6address" do
     begin
-      allow(Ohai::Log).to receive(:warn)
-      expect(Ohai::Log).not_to receive(:debug).with(/^Plugin network threw exception/)
+      allow(@plugin.logger).to receive(:warn)
+      expect(@plugin.logger).not_to receive(:trace).with(/^Plugin network threw exception/)
       @plugin.run
       %w{ ipaddress macaddress ip6address }.each do |attribute|
         expect(@plugin).to have_key(attribute)
@@ -367,8 +367,8 @@ describe Ohai::System, "Network Plugin" do
           end
 
           it "informs about this setup" do
-            expect(Ohai::Log).to receive(:debug).with(/ipaddress and ip6address are set from different interfaces/)
-            allow(Ohai::Log).to receive(:debug)
+            expect(@plugin.logger).to receive(:trace).with(/ipaddress and ip6address are set from different interfaces/)
+            allow(@plugin.logger).to receive(:trace)
             @plugin.run
           end
         end
@@ -396,8 +396,8 @@ describe Ohai::System, "Network Plugin" do
           end
 
           it "informs about this setup" do
-            expect(Ohai::Log).to receive(:debug).with(/ipaddress and ip6address are set from different interfaces/)
-            allow(Ohai::Log).to receive(:debug)
+            expect(@plugin.logger).to receive(:trace).with(/ipaddress and ip6address are set from different interfaces/)
+            allow(@plugin.logger).to receive(:trace)
             @plugin.run
           end
         end
@@ -413,7 +413,7 @@ describe Ohai::System, "Network Plugin" do
           it_populates_ipaddress_attributes
 
           it "picks {ip,ip6,mac}address" do
-            allow(Ohai::Log).to receive(:warn)
+            allow(@plugin.logger).to receive(:warn)
             @plugin.run
             expect(@plugin["ipaddress"]).to eq("192.168.99.11")
             expect(@plugin["macaddress"]).to eq("00:16:3E:2F:36:80")
@@ -421,9 +421,9 @@ describe Ohai::System, "Network Plugin" do
           end
 
           it "warns about this conflict" do
-            expect(Ohai::Log).to receive(:debug).with(/\[inet\] no ipaddress\/mask on eth1/).once
-            expect(Ohai::Log).to receive(:debug).with(/\[inet6\] no ipaddress\/mask on eth1/).once
-            allow(Ohai::Log).to receive(:debug)
+            expect(@plugin.logger).to receive(:trace).with(/\[inet\] no ipaddress\/mask on eth1/).once
+            expect(@plugin.logger).to receive(:trace).with(/\[inet6\] no ipaddress\/mask on eth1/).once
+            allow(@plugin.logger).to receive(:trace)
             @plugin.run
           end
         end
@@ -435,7 +435,7 @@ describe Ohai::System, "Network Plugin" do
           end
 
           it "picks {ip,ip6,mac}address" do
-            allow(Ohai::Log).to receive(:warn)
+            allow(@plugin.logger).to receive(:warn)
             @plugin.run
             expect(@plugin["ipaddress"]).to eq("192.168.66.33")
             expect(@plugin["macaddress"]).to eq("00:16:3E:2F:36:79")
@@ -452,7 +452,7 @@ describe Ohai::System, "Network Plugin" do
           it_doesnt_fail
 
           it "doesn't detect {ip,ip6,mac}address" do
-            allow(Ohai::Log).to receive(:warn)
+            allow(@plugin.logger).to receive(:warn)
             @plugin.run
             expect(@plugin["ipaddress"]).to be_nil
             expect(@plugin["macaddress"]).to be_nil
@@ -460,11 +460,11 @@ describe Ohai::System, "Network Plugin" do
           end
 
           it "warns about this conflict" do
-            expect(Ohai::Log).to receive(:warn).with(/unable to detect ipaddress/).once
-            expect(Ohai::Log).to receive(:warn).with(/\[inet\] no ip address on eth0/).once
-            expect(Ohai::Log).to receive(:debug).with(/unable to detect ip6address/).once
-            expect(Ohai::Log).to receive(:debug).with(/unable to detect macaddress/).twice # for each family
-            expect(Ohai::Log).to receive(:warn).with(/\[inet6\] no ip address on eth0/).once
+            expect(@plugin.logger).to receive(:warn).with(/unable to detect ipaddress/).once
+            expect(@plugin.logger).to receive(:warn).with(/\[inet\] no ip address on eth0/).once
+            expect(@plugin.logger).to receive(:trace).with(/unable to detect ip6address/).once
+            expect(@plugin.logger).to receive(:trace).with(/unable to detect macaddress/).twice # for each family
+            expect(@plugin.logger).to receive(:warn).with(/\[inet6\] no ip address on eth0/).once
             @plugin.run
           end
         end
@@ -475,15 +475,15 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["default_interface"] = nil
             @plugin["network"]["default_inet6_gateway"] = nil
             @plugin["network"]["default_inet6_interface"] = nil
-            @plugin["network"]["interfaces"].each do |i, iv|
-              iv["addresses"].delete_if { |k, kv| %w{inet inet6}.include? kv["family"] }
+            @plugin["network"]["interfaces"].each_value do |val|
+              val["addresses"].delete_if { |k, kv| %w{inet inet6}.include? kv["family"] }
             end
           end
 
           it_doesnt_fail
 
           it "doesn't detect {ip,ip6,mac}address" do
-            allow(Ohai::Log).to receive(:warn)
+            allow(@plugin.logger).to receive(:warn)
             @plugin.run
             expect(@plugin["ipaddress"]).to be_nil
             expect(@plugin["macaddress"]).to be_nil
@@ -491,9 +491,9 @@ describe Ohai::System, "Network Plugin" do
           end
 
           it "should warn about it" do
-            expect(Ohai::Log).to receive(:warn).with(/unable to detect ipaddress/).once
-            expect(Ohai::Log).to receive(:debug).with(/unable to detect macaddress/).twice # for each family
-            expect(Ohai::Log).to receive(:debug).with(/unable to detect ip6address/).once
+            expect(@plugin.logger).to receive(:warn).with(/unable to detect ipaddress/).once
+            expect(@plugin.logger).to receive(:trace).with(/unable to detect macaddress/).twice # for each family
+            expect(@plugin.logger).to receive(:trace).with(/unable to detect ip6address/).once
             @plugin.run
           end
         end
@@ -643,9 +643,9 @@ describe Ohai::System, "Network Plugin" do
           it_populates_ipaddress_attributes
 
           it "picks {ip,mac,ip6}address from the first interface" do
-            expect(Ohai::Log).to receive(:debug).with(/\[inet\] no default interface/).once
-            expect(Ohai::Log).to receive(:debug).with(/\[inet6\] no default interface/).once
-            allow(Ohai::Log).to receive(:debug)
+            expect(@plugin.logger).to receive(:trace).with(/\[inet\] no default interface/).once
+            expect(@plugin.logger).to receive(:trace).with(/\[inet6\] no default interface/).once
+            allow(@plugin.logger).to receive(:trace)
             @plugin.run
             expect(@plugin["ipaddress"]).to eq("192.168.99.11")
             expect(@plugin["macaddress"]).to eq("00:16:3E:2F:36:80")
@@ -660,15 +660,15 @@ describe Ohai::System, "Network Plugin" do
             @plugin["network"]["default_inet6_gateway"] = nil
             @plugin["network"]["default_inet6_interface"] = nil
             # just changing scopes to lInK for eth0 addresses
-            @plugin["network"]["interfaces"]["eth0"]["addresses"].each { |k, v| v[:scope] = "lInK" if %w{inet inet6}.include? v["family"] }
+            @plugin["network"]["interfaces"]["eth0"]["addresses"].each_value { |v| v[:scope] = "lInK" if %w{inet inet6}.include? v["family"] }
           end
 
           it_populates_ipaddress_attributes
 
           it "prefers global scope addressses to set {ip,mac,ip6}address" do
-            expect(Ohai::Log).to receive(:debug).with(/\[inet\] no default interface/).once
-            expect(Ohai::Log).to receive(:debug).with(/\[inet6\] no default interface/).once
-            allow(Ohai::Log).to receive(:debug)
+            expect(@plugin.logger).to receive(:trace).with(/\[inet\] no default interface/).once
+            expect(@plugin.logger).to receive(:trace).with(/\[inet6\] no default interface/).once
+            allow(@plugin.logger).to receive(:trace)
             @plugin.run
             expect(@plugin["ipaddress"]).to eq("192.168.99.11")
             expect(@plugin["macaddress"]).to eq("00:16:3E:2F:36:80")
@@ -781,37 +781,37 @@ describe Ohai::System, "Network Plugin" do
         before do
           @plugin["network"]["default_gateway"] = nil
           @plugin["network"]["default_interface"] = nil
-          @plugin["network"]["interfaces"].each do |i, iv|
-            iv["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
+          @plugin["network"]["interfaces"].each_value do |val|
+            val["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
           end
         end
 
         it_doesnt_fail
 
         it "can't detect ipaddress" do
-          allow(Ohai::Log).to receive(:warn)
+          allow(@plugin.logger).to receive(:warn)
           @plugin.run
           expect(@plugin["ipaddress"]).to be_nil
         end
 
         it "warns about not being able to set {ip,mac}address (ipv4)" do
-          expect(Ohai::Log).to receive(:warn).with(/unable to detect ipaddress/).once
-          expect(Ohai::Log).to receive(:debug).with(/unable to detect macaddress/) # for ipv4
-          expect(Ohai::Log).to receive(:debug).with(/setting macaddress to/) # for ipv6
-          expect(Ohai::Log).to receive(:debug).with(/\[inet6\] Using default interface eth0 and default gateway/) # for ipv6
+          expect(@plugin.logger).to receive(:warn).with(/unable to detect ipaddress/).once
+          expect(@plugin.logger).to receive(:trace).with(/unable to detect macaddress/) # for ipv4
+          expect(@plugin.logger).to receive(:trace).with(/setting macaddress to/) # for ipv6
+          expect(@plugin.logger).to receive(:trace).with(/\[inet6\] Using default interface eth0 and default gateway/) # for ipv6
           @plugin.run
         end
 
         it "sets {ip6,mac}address" do
-          allow(Ohai::Log).to receive(:warn)
+          allow(@plugin.logger).to receive(:warn)
           @plugin.run
           expect(@plugin["ip6address"]).to eq("3ffe:1111:2222::33")
           expect(@plugin["macaddress"]).to eq("00:16:3E:2F:36:79")
         end
 
         it "informs about macaddress being set using the ipv6 setup" do
-          expect(Ohai::Log).to receive(:debug).with(/setting macaddress to '00:16:3E:2F:36:79'/)
-          allow(Ohai::Log).to receive(:debug)
+          expect(@plugin.logger).to receive(:trace).with(/setting macaddress to '00:16:3E:2F:36:79'/)
+          allow(@plugin.logger).to receive(:trace)
           @plugin.run
         end
       end
@@ -829,21 +829,21 @@ describe Ohai::System, "Network Plugin" do
         it_doesnt_fail
 
         it "can't detect ipaddress" do
-          allow(Ohai::Log).to receive(:warn)
+          allow(@plugin.logger).to receive(:warn)
           @plugin.run
           expect(@plugin["ipaddress"]).to eq("127.0.0.1")
         end
 
         it "sets {ip6,mac}address" do
-          allow(Ohai::Log).to receive(:warn)
+          allow(@plugin.logger).to receive(:warn)
           @plugin.run
           expect(@plugin["ip6address"]).to eq("3ffe:1111:2222::33")
           expect(@plugin["macaddress"]).to eq("00:16:3E:2F:36:79")
         end
 
         it "informs about macaddress being set using the ipv6 setup" do
-          expect(Ohai::Log).to receive(:debug).with(/setting macaddress to '00:16:3E:2F:36:79'/)
-          allow(Ohai::Log).to receive(:debug)
+          expect(@plugin.logger).to receive(:trace).with(/setting macaddress to '00:16:3E:2F:36:79'/)
+          allow(@plugin.logger).to receive(:trace)
           @plugin.run
         end
       end
@@ -928,9 +928,9 @@ describe Ohai::System, "Network Plugin" do
             before do
               @plugin["network"]["default_gateway"] = nil
               @plugin["network"]["default_interface"] = nil
-              @plugin["network"]["interfaces"].each do |i, iv|
-                if iv.has_key? "addresses"
-                  iv["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
+              @plugin["network"]["interfaces"].each_value do |val|
+                if val.has_key? "addresses"
+                  val["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
                 end
               end
               @plugin["ip6address"] = "3ffe:8888:9999::1"
@@ -950,24 +950,24 @@ describe Ohai::System, "Network Plugin" do
             it_doesnt_fail
 
             it "can't detect ipaddress (ipv4)" do
-              allow(Ohai::Log).to receive(:warn)
+              allow(@plugin.logger).to receive(:warn)
               @plugin.run
               expect(@plugin["ipaddress"]).to be_nil
             end
 
             it "takes the macaddress from ipv6" do
-              allow(Ohai::Log).to receive(:warn)
+              allow(@plugin.logger).to receive(:warn)
               @plugin.run
               expect(@plugin["macaddress"]).to eq(@expected_results[os]["macaddress"])
             end
 
             it "warns about not being able to set ipaddress" do
-              expect(Ohai::Log).to receive(:warn).with(/unable to detect ipaddress/).once
+              expect(@plugin.logger).to receive(:warn).with(/unable to detect ipaddress/).once
               @plugin.run
             end
 
             it "doesn't overwrite ip6address" do
-              allow(Ohai::Log).to receive(:warn)
+              allow(@plugin.logger).to receive(:warn)
               @plugin.run
               expect(@plugin["ip6address"]).to eq("3ffe:8888:9999::1")
             end
@@ -1013,9 +1013,9 @@ describe Ohai::System, "Network Plugin" do
             before do
               @plugin["network"]["default_gateway"] = nil
               @plugin["network"]["default_interface"] = nil
-              @plugin["network"]["interfaces"].each do |i, iv|
-                if iv.has_key? "addresses"
-                  iv["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
+              @plugin["network"]["interfaces"].each_value do |val|
+                if val.has_key? "addresses"
+                  val["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
                 end
               end
               @plugin["macaddress"] = "00:AA:BB:CC:DD:EE"
@@ -1025,13 +1025,13 @@ describe Ohai::System, "Network Plugin" do
             it_doesnt_fail
 
             it "can't set ipaddress" do
-              allow(Ohai::Log).to receive(:warn)
+              allow(@plugin.logger).to receive(:warn)
               @plugin.run
               expect(@plugin["ipaddress"]).to be_nil
             end
 
             it "doesn't overwrite {ip6,mac}address" do
-              allow(Ohai::Log).to receive(:warn)
+              allow(@plugin.logger).to receive(:warn)
               @plugin.run
               expect(@plugin["ip6address"]).to eq("3ffe:8888:9999::1")
               expect(@plugin["macaddress"]).to eq("00:AA:BB:CC:DD:EE")

data/spec/unit/plugins/openstack_spec.rb

@@ -40,35 +40,16 @@ describe Ohai::System, "plugin openstack" do
         allow(plugin).to receive(:can_socket_connect?).
           with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
           and_return(false)
-        plugin[:dmi] = dmi_data
+        plugin[:dmi] = { :system => { :all_records => [ { :Manufacturer => "OpenStack Foundation" } ] } }
         plugin.run
       end
 
-      context "with normal openstack metadata" do
-        let(:dmi_data) do
-          { :system => { :all_records => [ { :Manufacturer => "OpenStack Foundation" } ] } }
-        end
-
-        it "sets openstack attribute" do
-          expect(plugin[:openstack][:provider]).to eq("openstack")
-        end
-
-        it "doesn't set metadata attributes" do
-          expect(plugin[:openstack][:instance_id]).to be_nil
-        end
+      it "sets openstack attribute" do
+        expect(plugin[:openstack][:provider]).to eq("openstack")
       end
-      context "with Red Hat openstack metadata" do
-        let(:dmi_data) do
-          { :system => { :manufacturer => "Red Hat", :product_name => "OpenStack Compute" } }
-        end
-
-        it "sets openstack attribute" do
-          expect(plugin[:openstack][:provider]).to eq("openstack")
-        end
 
-        it "doesn't set metadata attributes" do
-          expect(plugin[:openstack][:instance_id]).to be_nil
-        end
+      it "doesn't set metadata attributes" do
+        expect(plugin[:openstack][:instance_id]).to be_nil
       end
     end
   end

data/spec/unit/plugins/rackspace_spec.rb

@@ -149,8 +149,8 @@ OUT
         with("xenstore-ls vm-data/provider_data").
         and_raise(Ohai::Exceptions::Exec)
 
-      expect(Ohai::Log).
-        to receive(:debug).
+      expect(plugin.logger).
+        to receive(:trace).
         with("Plugin Rackspace: Unable to find xenstore-ls, cannot capture " \
              "region information for Rackspace cloud")
 
@@ -172,8 +172,8 @@ OUT
         with("xenstore-read name").
         and_raise(Ohai::Exceptions::Exec)
 
-      expect(Ohai::Log).
-        to receive(:debug).
+      expect(plugin.logger).
+        to receive(:trace).
         with("Plugin Rackspace: Unable to find xenstore-read, cannot capture " \
              "instance ID information for Rackspace cloud")
 
@@ -276,8 +276,8 @@ OUT
         with("xenstore-ls vm-data/networking").
         and_raise(Ohai::Exceptions::Exec)
 
-      expect(Ohai::Log).
-        to receive(:debug).
+      expect(plugin.logger).
+        to receive(:trace).
         with("Plugin Rackspace: Unable to capture custom private networking " \
              "information for Rackspace cloud")