ohai 13.3.0 → 13.4.0

data/spec/unit/plugins/cloud_spec.rb

@@ -288,24 +288,56 @@ describe Ohai::System, "plugin cloud" do
   describe "with Azure mash" do
     before do
       @plugin[:azure] = Mash.new
+      @plugin[:azure][:metadata] = {
+        "compute" =>
+          {
+            "location" => "westus",
+            "name" => "timtest",
+            "offer" => "UbuntuServer",
+            "osType" => "Linux",
+            "platformFaultDomain" => "0",
+            "platformUpdateDomain" => "0",
+            "publisher" => "Canonical",
+            "sku" => "16.04-LTS",
+            "version" => "16.04.201707270",
+            "vmId" => "f78151b3-da8b-4bd8-a592-d9ce8357e365",
+            "vmSize" => "Standard_DS2_v2",
+          },
+        "network" =>
+          {
+            "interfaces" =>
+              {
+                "000D3A37F080" =>
+                  {
+                    "mac" => "000D3A37F080",
+                    "public_ipv6" => [],
+                    "public_ipv4" => ["40.118.212.225"],
+                    "local_ipv6" => [],
+                    "local_ipv4" => ["10.0.1.6"],
+                  },
+              },
+            "public_ipv4" => ["40.118.212.225"],
+            "local_ipv4" => ["10.0.1.6"],
+            "public_ipv6" => [],
+            "local_ipv6" => [],
+            },
+          }
     end
 
     it "populates cloud public ip" do
-      @plugin[:azure]["public_ip"] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq(@plugin[:azure]["public_ip"])
+      expect(@plugin[:cloud][:public_ipv4_addrs][0]).to eq("40.118.212.225")
     end
 
     it "doesn't populates cloud vm_name" do
-      @plugin[:azure]["vm_name"] = "linux-vm"
       @plugin.run
-      expect(@plugin[:cloud][:vm_name]).not_to eq(@plugin[:azure]["vm_name"])
+      expect(@plugin[:cloud][:vm_name]).not_to eq("timtest")
     end
 
     it "populates cloud public_hostname" do
       @plugin[:azure]["public_fqdn"] = "linux-vm-svc.cloudapp.net"
       @plugin.run
-      expect(@plugin[:cloud][:public_hostname]).to eq(@plugin[:azure]["public_fqdn"])
+      expect(@plugin[:cloud][:public_hostname]).to eq("linux-vm-svc.cloudapp.net")
     end
 
     it "doesn't populate cloud public_ssh_port" do

data/spec/unit/plugins/ec2_spec.rb

@@ -23,14 +23,14 @@ require "base64"
 
 describe Ohai::System, "plugin ec2" do
 
+  let(:plugin) { get_plugin("ec2") }
+
   before(:each) do
     allow(plugin).to receive(:hint?).with("ec2").and_return(false)
     allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(false)
   end
 
   shared_examples_for "!ec2" do
-    let(:plugin) { get_plugin("ec2") }
-
     it "DOESN'T attempt to fetch the ec2 metadata or set ec2 attribute" do
       expect(plugin).not_to receive(:http_client)
       expect(plugin[:ec2]).to be_nil
@@ -39,8 +39,6 @@ describe Ohai::System, "plugin ec2" do
   end
 
   shared_examples_for "ec2" do
-    let(:plugin) { get_plugin("ec2") }
-
     before(:each) do
       @http_client = double("Net::HTTP client")
       allow(plugin).to receive(:http_client).and_return(@http_client)
@@ -342,14 +340,6 @@ describe Ohai::System, "plugin ec2" do
     end
   end
 
-  describe "with amazon kernel data" do
-    it_behaves_like "ec2"
-
-    before(:each) do
-      plugin[:kernel] = { :os_info => { :organization => "Amazon.com" } }
-    end
-  end
-
   describe "with EC2 Xen UUID" do
     it_behaves_like "ec2"
 
@@ -368,6 +358,38 @@ describe Ohai::System, "plugin ec2" do
     end
   end
 
+  describe "with EC2 Identifying Number", :windows_only do
+    it_behaves_like "ec2"
+
+    before do
+      allow_any_instance_of(WmiLite::Wmi).to receive(:first_of).and_return(
+        { "caption" => "Computer System Product",
+          "description" => "Computer System Product",
+          "identifyingnumber" => "ec2a355a-91cd-5fe8-bbfc-cc891d0bf9d6",
+          "name" => "HVM domU",
+          "skunumber" => nil,
+          "uuid" => "5A352AEC-CD91-E85F-BBFC-CC891D0BF9D6",
+          "vendor" => "Xen",
+          "version" => "4.2.amazon" })
+    end
+  end
+
+  describe "without EC2 Identifying Number", :windows_only do
+    it_behaves_like "!ec2"
+
+    before do
+      allow_any_instance_of(WmiLite::Wmi).to receive(:first_of).and_return(
+        { "caption" => "Computer System Product",
+          "description" => "Computer System Product",
+          "identifyingnumber" => "1234",
+          "name" => "HVM domU",
+          "skunumber" => nil,
+          "uuid" => "5A352AEC-CD91-E85F-BBFC-CC891D0BF9D6",
+          "vendor" => "Xen",
+          "version" => "1.2.3" })
+    end
+  end
+
   describe "with ec2 hint file" do
     it_behaves_like "ec2"
 

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

@@ -79,30 +79,6 @@ end
 describe Ohai::System, "General Linux cpu plugin" do
   let(:plugin) { get_plugin("linux/cpu") }
 
-  let(:cpuinfo_contents) do
-    <<-EOF
-processor     : 0
-vendor_id     : GenuineIntel
-cpu family    : 6
-model         : 23
-model name    : Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz
-stepping      : 6
-cpu MHz       : 1968.770
-cache size    : 64 KB
-fdiv_bug      : no
-hlt_bug       : no
-f00f_bug      : no
-coma_bug      : no
-fpu           : yes
-fpu_exception : yes
-cpuid level   : 10
-wp            : yes
-flags         : fpu pse tsc msr mce cx8 sep mtrr pge cmov
-bogomips      : 2575.86
-clflush size  : 32
-    EOF
-  end
-
   let(:tempfile_handle) do
     tempfile = Tempfile.new("ohai-rspec-proc-cpuinfo")
     tempfile.write cpuinfo_contents
@@ -124,81 +100,139 @@ clflush size  : 32
     end
   end
 
-  it_behaves_like "Common cpu info", 1, 0
+  context "with old kernel that doesn't include cores in /proc/cpuinfo" do
+    let(:cpuinfo_contents) do
+      <<-EOF
+  processor     : 0
+  vendor_id     : GenuineIntel
+  cpu family    : 6
+  model         : 23
+  model name    : Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz
+  stepping      : 6
+  cpu MHz       : 1968.770
+  cache size    : 64 KB
+  fdiv_bug      : no
+  hlt_bug       : no
+  f00f_bug      : no
+  coma_bug      : no
+  fpu           : yes
+  fpu_exception : yes
+  cpuid level   : 10
+  wp            : yes
+  flags         : fpu pse tsc msr mce cx8 sep mtrr pge cmov
+  bogomips      : 2575.86
+  clflush size  : 32
+      EOF
+    end
 
-  it "gets total cores" do
-    plugin.run
-    expect(plugin[:cpu][:cores]).to eql(0)
-  end
+    let(:lscpu) do
+      <<-EOF
+Architecture:          x86_64
+CPU op-mode(s):        32-bit, 64-bit
+Byte Order:            Little Endian
+CPU(s):                1
+On-line CPU(s) list:   0
+Thread(s) per core:    1
+Core(s) per socket:    1
+Socket(s):             1
+NUMA node(s):          1
+Vendor ID:             GenuineIntel
+CPU family:            6
+Model:                 23
+Model name:            Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz
+Stepping:              2
+CPU MHz:               1968.770
+BogoMIPS:              2575.86
+Hypervisor vendor:     Xen
+Virtualization type:   full
+L1d cache:             32K
+L1i cache:             32K
+L2 cache:              256K
+L3 cache:              30720K
+NUMA node0 CPU(s):     0
+Flags:                 fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx rdtscp lm constant_tsc rep_good nopl xtopology pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm fsgsbase bmi1 avx2 smep bmi2 erms invpcid xsaveopt
+      EOF
+    end
 
-  it "doesn't have a cpu 1" do
-    plugin.run
-    expect(plugin[:cpu]).not_to have_key("1")
-  end
+    it_behaves_like "Common cpu info", 1, 1
 
-  it "has a vendor_id for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).to have_key("vendor_id")
-    expect(plugin[:cpu]["0"]["vendor_id"]).to eql("GenuineIntel")
-  end
+    before(:each) do
+      allow(plugin).to receive(:shell_out).with("lscpu").and_return(mock_shell_out(0, lscpu, ""))
+    end
 
-  it "has a family for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).to have_key("family")
-    expect(plugin[:cpu]["0"]["family"]).to eql("6")
-  end
+    it "gets total cores" do
+      plugin.run
+      expect(plugin[:cpu][:cores]).to eql(1)
+    end
 
-  it "has a model for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).to have_key("model")
-    expect(plugin[:cpu]["0"]["model"]).to eql("23")
-  end
+    it "doesn't have a cpu 1" do
+      plugin.run
+      expect(plugin[:cpu]).not_to have_key("1")
+    end
 
-  it "has a stepping for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).to have_key("stepping")
-    expect(plugin[:cpu]["0"]["stepping"]).to eql("6")
-  end
+    it "has a vendor_id for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).to have_key("vendor_id")
+      expect(plugin[:cpu]["0"]["vendor_id"]).to eql("GenuineIntel")
+    end
 
-  it "doesn't have a phyiscal_id for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).not_to have_key("physical_id")
-  end
+    it "has a family for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).to have_key("family")
+      expect(plugin[:cpu]["0"]["family"]).to eql("6")
+    end
 
-  it "doesn't have a core_id for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).not_to have_key("core_id")
-  end
+    it "has a model for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).to have_key("model")
+      expect(plugin[:cpu]["0"]["model"]).to eql("23")
+    end
 
-  it "doesn't have a cores for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).not_to have_key("cores")
-  end
+    it "has a stepping for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).to have_key("stepping")
+      expect(plugin[:cpu]["0"]["stepping"]).to eql("6")
+    end
 
-  it "has a model name for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).to have_key("model_name")
-    expect(plugin[:cpu]["0"]["model_name"]).to eql("Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz")
-  end
+    it "doesn't have a phyiscal_id for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).not_to have_key("physical_id")
+    end
 
-  it "has a mhz for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).to have_key("mhz")
-    expect(plugin[:cpu]["0"]["mhz"]).to eql("1968.770")
-  end
+    it "doesn't have a core_id for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).not_to have_key("core_id")
+    end
 
-  it "has a cache_size for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).to have_key("cache_size")
-    expect(plugin[:cpu]["0"]["cache_size"]).to eql("64 KB")
-  end
+    it "doesn't have a cores for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).not_to have_key("cores")
+    end
 
-  it "has flags for cpu 0" do
-    plugin.run
-    expect(plugin[:cpu]["0"]).to have_key("flags")
-    expect(plugin[:cpu]["0"]["flags"]).to eq(%w{fpu pse tsc msr mce cx8 sep mtrr pge cmov})
-  end
+    it "has a model name for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).to have_key("model_name")
+      expect(plugin[:cpu]["0"]["model_name"]).to eql("Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz")
+    end
+
+    it "has a mhz for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).to have_key("mhz")
+      expect(plugin[:cpu]["0"]["mhz"]).to eql("1968.770")
+    end
+
+    it "has a cache_size for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).to have_key("cache_size")
+      expect(plugin[:cpu]["0"]["cache_size"]).to eql("64 KB")
+    end
 
+    it "has flags for cpu 0" do
+      plugin.run
+      expect(plugin[:cpu]["0"]).to have_key("flags")
+      expect(plugin[:cpu]["0"]["flags"]).to eq(%w{fpu pse tsc msr mce cx8 sep mtrr pge cmov})
+    end
+  end
   context "with a dual-core hyperthreaded /proc/cpuinfo" do
     let(:cpuinfo_contents) do
       <<-EOF
@@ -331,6 +365,7 @@ describe Ohai::System, "S390 linux cpu plugin" do
 
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:linux)
+    allow(plugin).to receive(:shell_out).with("lscpu").and_return(mock_shell_out(1, "", ""))
 
     @double_file = double("/proc/cpuinfo")
     allow(@double_file).to receive(:each).
@@ -343,7 +378,7 @@ describe Ohai::System, "S390 linux cpu plugin" do
     allow(File).to receive(:open).with("/proc/cpuinfo").and_return(@double_file)
   end
 
-  it_behaves_like "Common cpu info", 2, 0
+  it_behaves_like "Common cpu info", 2, nil
 
   it "has a cpu 1" do
     plugin.run
@@ -377,6 +412,7 @@ describe Ohai::System, "arm64 linux cpu plugin" do
 
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:linux)
+    allow(plugin).to receive(:shell_out).with("lscpu").and_return(mock_shell_out(1, "", ""))
 
     @double_file = double("/proc/cpuinfo")
     allow(@double_file).to receive(:each).
@@ -391,7 +427,7 @@ describe Ohai::System, "arm64 linux cpu plugin" do
     allow(File).to receive(:open).with("/proc/cpuinfo").and_return(@double_file)
   end
 
-  it_behaves_like "Common cpu info", 2, 0
+  it_behaves_like "Common cpu info", 2, nil
 
   it "has a cpu 1" do
     plugin.run

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

@@ -27,6 +27,8 @@ describe Ohai::System, "Linux filesystem plugin" do
     allow(plugin).to receive(:shell_out).with("df -iP").and_return(mock_shell_out(0, "", ""))
     allow(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, "", ""))
     allow(plugin).to receive(:which).with("lsblk").and_return(nil)
+    allow(plugin).to receive(:which).with("df").and_return("/bin/df")
+    allow(plugin).to receive(:which).with("mount").and_return("/bin/mount")
     allow(plugin).to receive(:which).with("blkid").and_return("/sbin/blkid")
     allow(plugin).to receive(:shell_out).with("/sbin/blkid", timeout: 60).and_return(mock_shell_out(0, "", ""))
 
@@ -529,4 +531,14 @@ BLKID_TYPE
       expect(plugin[:filesystem]["by_mountpoint"]["/mnt"][:devices]).to eq(["/dev/sdb1", "/dev/sdc1"])
     end
   end
+
+  %w{df mount}.each do |command|
+    describe "when #{command} does not exist" do
+      it "logs warning about #{command} missing" do
+        allow(plugin).to receive(:shell_out).with(/#{command}/).and_raise(Ohai::Exceptions::Exec)
+        expect(Ohai::Log).to receive(:warn).with("Plugin Filesystem: #{command} binary is not available. Some data will not be available.")
+        plugin.run
+      end
+    end
+  end
 end

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

@@ -552,6 +552,7 @@ CGROUP
 2:cpu:/Charlie
 1:cpuset:/Charlie
 CGROUP
+      allow(File).to receive(:read).with("/proc/1/environ").and_return("")
       expect(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
       plugin.run
@@ -572,6 +573,7 @@ CGROUP
 CGROUP
         expect(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
         allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
+        allow(File).to receive(:read).with("/proc/1/environ").and_return("")
       end
 
       it "sets lxc host if lxc-version exists" do
@@ -600,6 +602,14 @@ CGROUP
         expect(plugin[:virtualization]).to eq({ "systems" => {} })
       end
 
+      it "sets lxc guest if /proc/1/environ has lxccontainer string in it" do
+        one_environ = "container=lxccontainer_ttys=/dev/pts/0 /dev/pts/1 /dev/pts/2 /dev/pts/3".chomp
+        allow(File).to receive(:read).with("/proc/1/environ").and_return(one_environ)
+        plugin.run
+        expect(plugin[:virtualization][:system]).to eq("lxc")
+        expect(plugin[:virtualization][:role]).to eq("guest")
+      end
+
     end
 
     it "does not set virtualization if /proc/self/cgroup isn't there" do
@@ -682,6 +692,7 @@ CGROUP
 CGROUP
       allow(File).to receive(:exist?).with("/proc/self/cgroup").and_return(true)
       allow(File).to receive(:read).with("/proc/self/cgroup").and_return(self_cgroup)
+      allow(File).to receive(:read).with("/proc/1/environ").and_return("")
       plugin.run
       expect(plugin[:virtualization]).to eq({ "systems" => {} })
     end