ohai 8.8.1 → 8.9.0

data/spec/functional/application_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Claire McQuin <claire@chef.io>
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/functional/loader_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/functional/plugins/powershell_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
 #
 # License:: Apache License, Version 2.0
 #

data/spec/functional/plugins/root_group_spec.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Edwards (<adamed@getchef.com>)
+# Author:: Adam Edwards (<adamed@chef.io>)
 #
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
 #
 # License:: Apache License, Version 2.0
 #

data/spec/ohai_spec.rb

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,9 +19,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
 
 describe Ohai do
-  
+
   it "should have a version constant defined" do
     expect(Ohai::VERSION).to be_a_kind_of(String)
   end
-  
+
 end

data/spec/unit/application_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Claire McQuin <claire@chef.io>
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/config_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Claire McQuin (<claire@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/dsl/plugin_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Claire McQuin (<claire@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Claire McQuin (<claire@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/spec/unit/hints_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/loader_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Claire McQuin (<claire@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Claire McQuin (<claire@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugin_config_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,6 +1,7 @@
 #
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Isa Farnik (<isa@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,62 +39,89 @@ CPU 1 runs at 1654 MHz
 CPU 2 runs at 1654 MHz
 CPU 3 runs at 1654 MHz
 PMCYCLES_M
-    
+
     @plugin = get_plugin("aix/cpu")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
 
     allow(@plugin).to receive(:shell_out).with("lsdev -Cc processor").and_return(mock_shell_out(0, @lsdev_Cc_processor, nil))
     allow(@plugin).to receive(:shell_out).with("lsattr -El proc0").and_return(mock_shell_out(0, @lsattr_El_proc0, nil))
     allow(@plugin).to receive(:shell_out).with("pmcycles -m").and_return(mock_shell_out(0, @pmcycles_m, nil))
-    @plugin.run
   end
 
+  context "when run on an LPAR" do
+    before do
+      allow(@plugin).to receive(:shell_out).with("uname -W").and_return(mock_shell_out(0, "0", nil))
+      @plugin.run
+    end
 
-  it "sets the vendor id to IBM" do
-    expect(@plugin[:cpu]["0"][:vendor_id]).to eq("IBM")
-  end
+    it "sets the vendor id to IBM" do
+      expect(@plugin[:cpu]["0"][:vendor_id]).to eq("IBM")
+    end
 
-  it "sets the available attribute" do
-    expect(@plugin[:cpu][:available]).to eq(1)
-  end
+    it "sets the available attribute" do
+      expect(@plugin[:cpu][:available]).to eq(1)
+    end
 
-  it "sets the total number of processors" do
-    expect(@plugin[:cpu][:total]).to eq(4)
-  end
-  
-  it "sets the real number of processors" do
-    expect(@plugin[:cpu][:real]).to eq(2)
-  end
-  
-  it "sets the number of cores" do
-    #from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
-    #on AIX number of cores and processors are considered same 
-    expect(@plugin[:cpu][:cores]).to eq(@plugin[:cpu][:real])
-  end
+    it "sets the total number of processors" do
+      expect(@plugin[:cpu][:total]).to eq(4)
+    end
 
-  it "detects the model" do
-    expect(@plugin[:cpu]["0"][:model_name]).to eq("PowerPC_POWER5")
-  end
+    it "sets the real number of processors" do
+      expect(@plugin[:cpu][:real]).to eq(2)
+    end
 
-  it "detects the mhz" do
-    expect(@plugin[:cpu]["0"][:mhz]).to eq(1654)
-  end
+    it "sets the number of cores" do
+      #from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
+      #on AIX number of cores and processors are considered same
+      expect(@plugin[:cpu][:cores]).to eq(@plugin[:cpu][:real])
+    end
 
-  it "detects the status of the device" do
-    expect(@plugin[:cpu]["0"][:status]).to eq("Available")
-  end
+    it "detects the model" do
+      expect(@plugin[:cpu]["0"][:model_name]).to eq("PowerPC_POWER5")
+    end
 
-  it "detects the location of the device" do
-    expect(@plugin[:cpu]["0"][:location]).to eq("00-00")
+    it "detects the mhz" do
+      expect(@plugin[:cpu]["0"][:mhz]).to eq(1654)
+    end
+
+    it "detects the status of the device" do
+      expect(@plugin[:cpu]["0"][:status]).to eq("Available")
+    end
+
+    it "detects the location of the device" do
+      expect(@plugin[:cpu]["0"][:location]).to eq("00-00")
+    end
+
+    context "lsattr -El device_name" do
+      it "detects all the attributes of the device" do
+        expect(@plugin[:cpu]["0"][:mhz]).to eq(1654)
+        expect(@plugin[:cpu]["0"][:smt_enabled]).to eq("true")
+        expect(@plugin[:cpu]["0"][:smt_threads]).to eq("2")
+        expect(@plugin[:cpu]["0"][:state]).to eq("enable")
+        expect(@plugin[:cpu]["0"][:model_name]).to eq("PowerPC_POWER5")
+      end
+    end
   end
 
-  context "lsattr -El device_name" do
-    it "detects all the attributes of the device" do
-      expect(@plugin[:cpu]["0"][:mhz]).to eq(1654)
-      expect(@plugin[:cpu]["0"][:smt_enabled]).to eq("true")
-      expect(@plugin[:cpu]["0"][:smt_threads]).to eq("2")
-      expect(@plugin[:cpu]["0"][:state]).to eq("enable")
-      expect(@plugin[:cpu]["0"][:model_name]).to eq("PowerPC_POWER5")
+  context "when run on a WPAR" do
+    before do
+      allow(@plugin).to receive(:shell_out).with("uname -W").and_return(mock_shell_out(0, "120", nil))
+      @plugin.run
+    end
+
+    it "sets the total number of processors" do
+      expect(@plugin[:cpu][:total]).to eq(4)
+    end
+
+    it "doesn't set the real number of CPUs" do
+      expect(@plugin[:cpu][:real]).to be_nil
+    end
+
+    it "doesn't set mhz of a processor it can't see" do
+      # I'm so sorry
+      expect {
+        expect(@plugin[:cpu]["0"][:mhz]).to eq(1654)
+      }.to raise_error(NoMethodError)
     end
   end
 end

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

@@ -1,6 +1,7 @@
 #
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Isa Farnik (<isa@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,20 +19,45 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "AIX filesystem plugin" do
   before(:each) do
-    @df_P = <<-DF_P
-Filesystem    512-blocks      Used Available Capacity Mounted on
-/dev/hd4          786432    495632    290800      64% /
-/dev/hd2        10485760   8743200   1742560      84% /usr
-/dev/hd9var      2621440   1152952   1468488      44% /var
-/dev/hd3         2621440    541928   2079512      21% /tmp
-/dev/hd1         8650752   6098080   2552672      71% /home
-/dev/hd11admin     262144       760    261384       1% /admin
-/proc                  -         -         -       -  /proc
-/dev/hd10opt     3407872   1744384   1663488      52% /opt
-192.168.1.11:/stage/middleware  314572800 177025952 137546848      57% /stage/middleware
-DF_P
-
-    @mount = <<-MOUNT
+    @df_Pk_LPAR = <<-DF_PK
+Filesystem    1024-blocks      Used Available Capacity Mounted on
+/dev/hd4          2097152    219796   1877356      11% /
+/dev/hd2          5242880   2416828   2826052      47% /usr
+/dev/hd9var       5242880    395540   4847340       8% /var
+/dev/hd3          5242880   1539508   3703372      30% /tmp
+/dev/hd1         10485760      1972  10483788       1% /home
+/dev/hd11admin      131072       380    130692       1% /admin
+/proc                   -         -         -       -  /proc
+/dev/hd10opt      5242880   1286720   3956160      25% /opt
+/dev/livedump      262144       368    261776       1% /var/adm/ras/livedump
+/dev/fslv00        524288     45076    479212       9% /wpars/sink-thinker-541ba3
+/dev/fslv01       2097152      8956   2088196       1% /wpars/sink-thinker-541ba3/home
+/dev/fslv02       5242880   1307352   3935528      25% /wpars/sink-thinker-541ba3/opt
+/proc                   -         -         -       -  /wpars/sink-thinker-541ba3/proc
+/dev/fslv03       1048576    168840    879736      17% /wpars/sink-thinker-541ba3/tmp
+/dev/fslv04       5242880   2725040   2517840      52% /wpars/sink-thinker-541ba3/usr
+/dev/fslv05        524288     76000    448288      15% /wpars/sink-thinker-541ba3/var
+/dev/fslv07      10485760    130872  10354888       2% /wpars/toolchain-tester-5c969f
+/dev/fslv08       5242880     39572   5203308       1% /wpars/toolchain-tester-5c969f/home
+/dev/fslv09       5242880   1477164   3765716      29% /wpars/toolchain-tester-5c969f/opt
+/proc                   -         -         -       -  /wpars/toolchain-tester-5c969f/proc
+/dev/fslv10       5242880     42884   5199996       1% /wpars/toolchain-tester-5c969f/tmp
+/dev/fslv11       5242880   2725048   2517832      52% /wpars/toolchain-tester-5c969f/usr
+/dev/fslv12      10485760    272376  10213384       3% /wpars/toolchain-tester-5c969f/var
+DF_PK
+
+    @df_Pk_WPAR = <<-DF_PK
+Filesystem    1024-blocks      Used Available Capacity Mounted on
+Global           10485760    130872  10354888       2% /
+Global            5242880     39572   5203308       1% /home
+Global            5242880   1477164   3765716      29% /opt
+Global                  -         -         -       -  /proc
+Global            5242880     42884   5199996       1% /tmp
+Global            5242880   2725048   2517832      52% /usr
+Global           10485760    272376  10213384       3% /var
+DF_PK
+
+    @mount_LPAR = <<-MOUNT
   node       mounted        mounted over    vfs       date        options
 -------- ---------------  ---------------  ------ ------------ ---------------
          /dev/hd4         /                jfs2   Jul 17 13:22 rw,log=/dev/hd8
@@ -43,70 +69,146 @@ DF_P
          /proc            /proc            procfs Jul 17 13:22 rw
          /dev/hd10opt     /opt             jfs2   Jul 17 13:22 rw,log=/dev/hd8
 192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+MOUNT
+
+    @mount_WPAR = <<-MOUNT
+  node       mounted        mounted over    vfs       date        options
+-------- ---------------  ---------------  ------ ------------ ---------------
+         Global           /                jfs2   Nov 23 21:03 rw,log=NULL
+         Global           /home            jfs2   Nov 23 21:03 rw,log=NULL
+         Global           /opt             jfs2   Nov 23 21:03 rw,log=NULL
+         Global           /proc            namefs Nov 23 21:03 rw
+         Global           /tmp             jfs2   Nov 23 21:03 rw,log=NULL
+         Global           /usr             jfs2   Nov 23 21:03 rw,log=NULL
+         Global           /var             jfs2   Nov 23 21:03 rw,log=NULL
+192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
 MOUNT
 
     @plugin = get_plugin("aix/filesystem")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     @plugin[:filesystem] = Mash.new
-    allow(@plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @df_P, nil))
-    allow(@plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @mount, nil))
-
-    @plugin.run
   end
 
-  describe "df -P" do
-
-    it "returns the filesystem block size" do
-      expect(@plugin[:filesystem]["/dev/hd4"]['kb_size']).to eq("786432")
+  context 'when run within an LPAR' do
+    before do
+      allow(@plugin).to receive(:shell_out).with("df -Pk").and_return(mock_shell_out(0, @df_Pk_LPAR, nil))
+      allow(@plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @mount_LPAR, nil))
+      @plugin.run
     end
 
-    it "returns the filesystem used space in kb" do
-      expect(@plugin[:filesystem]["/dev/hd4"]['kb_used']).to eq("495632")
-    end
+    describe "df -Pk" do
 
-    it "returns the filesystem available space in kb" do
-      expect(@plugin[:filesystem]["/dev/hd4"]['kb_available']).to eq("290800")
-    end
+      it "returns the filesystem block size" do
+        expect(@plugin[:filesystem]["/dev/hd4"]['kb_size']).to eq("2097152")
+      end
 
-    it "returns the filesystem capacity in percentage" do
-      expect(@plugin[:filesystem]["/dev/hd4"]['percent_used']).to eq("64%")
-    end
+      it "returns the filesystem used space in kb" do
+        expect(@plugin[:filesystem]["/dev/hd4"]['kb_used']).to eq("219796")
+      end
 
-    it "returns the filesystem mounted location" do
-      expect(@plugin[:filesystem]["/dev/hd4"]['mount']).to eq("/")
-    end
-  end
+      it "returns the filesystem available space in kb" do
+        expect(@plugin[:filesystem]["/dev/hd4"]['kb_available']).to eq("1877356")
+      end
 
-  describe "mount" do
+      it "returns the filesystem capacity in percentage" do
+        expect(@plugin[:filesystem]["/dev/hd4"]['percent_used']).to eq("11%")
+      end
 
-    it "returns the filesystem mount location" do
-      expect(@plugin[:filesystem]["/dev/hd4"]['mount']).to eq("/")
+      it "returns the filesystem mounted location" do
+        expect(@plugin[:filesystem]["/dev/hd4"]['mount']).to eq("/")
+      end
     end
 
-    it "returns the filesystem type" do
-      expect(@plugin[:filesystem]["/dev/hd4"]['fs_type']).to eq("jfs2")
+    describe "mount" do
+
+      it "returns the filesystem mount location" do
+        expect(@plugin[:filesystem]["/dev/hd4"]['mount']).to eq("/")
+      end
+
+      it "returns the filesystem type" do
+        expect(@plugin[:filesystem]["/dev/hd4"]['fs_type']).to eq("jfs2")
+      end
+
+      it "returns the filesystem mount options" do
+        expect(@plugin[:filesystem]["/dev/hd4"]['mount_options']).to eq(["rw", "log=/dev/hd8"])
+      end
+
+      # For entries like 192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+      context "having node values" do
+
+        it "returns the filesystem mount location" do
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount']).to eq("/stage/middleware")
+        end
+
+        it "returns the filesystem type" do
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['fs_type']).to eq("nfs3")
+        end
+
+        it "returns the filesystem mount options" do
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount_options']).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
+        end
+      end
     end
+  end
 
-    it "returns the filesystem mount options" do
-      expect(@plugin[:filesystem]["/dev/hd4"]['mount_options']).to eq("rw,log=/dev/hd8")
+  context 'when run within a WPAR' do
+    before do
+      allow(@plugin).to receive(:shell_out).with("df -Pk").and_return(mock_shell_out(0, @df_Pk_WPAR, nil))
+      allow(@plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @mount_WPAR, nil))
+      @plugin.run
     end
 
-    # For entries like 192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
-    context "having node values" do
-      before do
-        allow(@plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, "192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys", nil))
+    describe "df -Pk" do
+
+      it "returns the filesystem block size" do
+        expect(@plugin[:filesystem]["Global:/"]['kb_size']).to eq("10485760")
+      end
+
+      it "returns the filesystem used space in kb" do
+        expect(@plugin[:filesystem]["Global:/"]['kb_used']).to eq("130872")
+      end
+
+      it "returns the filesystem available space in kb" do
+        expect(@plugin[:filesystem]["Global:/"]['kb_available']).to eq("10354888")
+      end
+
+      it "returns the filesystem capacity in percentage" do
+        expect(@plugin[:filesystem]["Global:/"]['percent_used']).to eq("2%")
       end
 
+      it "returns the filesystem mounted location" do
+        expect(@plugin[:filesystem]["Global:/"]['mount']).to eq("/")
+      end
+    end
+
+    describe "mount" do
+
       it "returns the filesystem mount location" do
-        expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount']).to eq("/stage/middleware")
+        expect(@plugin[:filesystem]["Global:/"]['mount']).to eq("/")
       end
 
       it "returns the filesystem type" do
-        expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['fs_type']).to eq("nfs3")
+        expect(@plugin[:filesystem]["Global:/"]['fs_type']).to eq("jfs2")
       end
 
       it "returns the filesystem mount options" do
-        expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount_options']).to eq("ro,bg,hard,intr,sec=sys")
+        expect(@plugin[:filesystem]["Global:/"]['mount_options']).to eq(["rw", "log=NULL"])
+      end
+
+      # For entries like 192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+      context "having node values" do
+
+        it "returns the filesystem mount location" do
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount']).to eq("/stage/middleware")
+        end
+
+        it "returns the filesystem type" do
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['fs_type']).to eq("nfs3")
+        end
+
+        it "returns the filesystem mount options" do
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount_options']).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
+        end
       end
     end
   end