ohai 8.0.1 → 8.1.0

data/spec/unit/plugins/cloudstack_spec.rb

@@ -138,7 +138,7 @@ EOM
         expect(ohai_data['cloudstack']['service_offering']).to eq("2vCPU, 1GHz, 2GB RAM")
       end
      it "reads the public ipv4 from the metadata service" do
-        expect(ohai_data['cloudstack']['public_ipv4']).to eq("10.235.34.23")
+        expect(ohai_data['cloudstack']['router_ipv4']).to eq("10.235.34.23")
       end
      it "reads the vm id from the metadata service" do
         expect(ohai_data['cloudstack']['vm_id']).to eq("8983fb85-fb7f-46d6-8af1-c1b6666fec39")

data/spec/unit/plugins/digital_ocean_spec.rb

@@ -0,0 +1,211 @@
+#
+# Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'ipaddress'
+require 'spec_helper'
+
+describe Ohai::System, "plugin digital_ocean" do
+  let(:hint_path_nix) { '/etc/chef/ohai/hints/digital_ocean.json' }
+  let(:hint_path_win) { 'C:\chef\ohai\hints/digital_ocean.json' }
+  let(:digitalocean_path) { '/etc/digitalocean' }
+  let(:hint) {
+    '{
+      "droplet_id": 12345678,
+      "name": "example.com",
+      "image_id": 3240036,
+      "size_id": 66,
+      "region_id": 4,
+      "ip_addresses": {
+        "public": "1.2.3.4",
+        "private": "5.6.7.8"
+      }
+    }'
+  }
+
+  before do
+    @plugin = get_plugin("digital_ocean")
+    @plugin[:network] = {
+      "interfaces"=> {
+        "eth0"=> {
+          "addresses"=> {
+            "1.2.3.4"=> {
+              "netmask"=> "255.255.255.0"
+            },
+            "2400:6180:0000:00d0:0000:0000:0009:7001"=> {}
+          }
+        }
+      }
+    }
+
+    allow(File).to receive(:exist?).with(hint_path_nix).and_return(true)
+    allow(File).to receive(:read).with(hint_path_nix).and_return(hint)
+    allow(File).to receive(:exist?).with(hint_path_win).and_return(true)
+    allow(File).to receive(:read).with(hint_path_win).and_return(hint)
+  end
+
+
+  shared_examples_for "!digital_ocean"  do
+    before(:each) do
+      @plugin.run
+    end
+
+    it "does not create the digital_ocean mash" do
+      expect(@plugin[:digital_ocean]).to be_nil
+    end
+  end
+
+  shared_examples_for "digital_ocean_networking" do
+    it "creates the networks attribute" do
+      expect(@plugin[:digital_ocean][:networks]).not_to be_nil
+    end
+
+    it "pulls ip addresses from the network interfaces" do
+      expect(@plugin[:digital_ocean][:networks][:v4]).to eq([{"ip_address" => "1.2.3.4",
+                                                         "type" => "public",
+                                                         "netmask" => "255.255.255.0"}])
+      expect(@plugin[:digital_ocean][:networks][:v6]).to eq([{"ip_address"=>"2400:6180:0000:00d0:0000:0000:0009:7001",
+                                                          "type"=>"public",
+                                                          "cidr"=>128}])
+    end
+  end
+
+  shared_examples_for "digital_ocean" do
+    before(:each) do
+      @plugin.run
+    end
+
+    it "creates a digital_ocean mash" do
+      expect(@plugin[:digital_ocean]).not_to be_nil
+    end
+
+    it "has all hint attributes" do
+      expect(@plugin[:digital_ocean][:droplet_id]).not_to be_nil
+      expect(@plugin[:digital_ocean][:name]).not_to be_nil
+      expect(@plugin[:digital_ocean][:image_id]).not_to be_nil
+      expect(@plugin[:digital_ocean][:size_id]).not_to be_nil
+      expect(@plugin[:digital_ocean][:region_id]).not_to be_nil
+    end
+
+    it "skips the ip_addresses hint attribute" do
+      expect(@plugin[:digital_ocean][:ip_addresses]).to be_nil
+    end
+
+    it "has correct values for all hint attributes" do
+      expect(@plugin[:digital_ocean][:droplet_id]).to eq(12345678)
+      expect(@plugin[:digital_ocean][:name]).to eq("example.com")
+      expect(@plugin[:digital_ocean][:image_id]).to eq(3240036)
+      expect(@plugin[:digital_ocean][:size_id]).to eq(66)
+      expect(@plugin[:digital_ocean][:region_id]).to eq(4)
+    end
+
+    include_examples 'digital_ocean_networking'
+  end
+
+  describe "with digital_ocean hint file" do
+    before do
+      allow(File).to receive(:exist?).with(hint_path_nix).and_return(true)
+      allow(File).to receive(:exist?).with(hint_path_win).and_return(true)
+    end
+
+    context "without private networking enabled" do
+      it_should_behave_like "digital_ocean"
+    end
+
+    context "with private networking enabled" do
+      before do
+        @plugin[:network][:interfaces][:eth1] = {
+          "addresses"=> {
+            "10.128.142.89" => {
+              "netmask" => "255.255.255.0"
+            },
+            "fdf8:f53b:82e4:0000:0000:0000:0000:0053" => {}
+          }
+        }
+
+        @plugin.run
+      end
+
+      it "should extract the private networking ips" do
+        expect(@plugin[:digital_ocean][:networks][:v4]).to eq([{"ip_address" => "1.2.3.4",
+                                                            "type" => "public",
+                                                            "netmask" => "255.255.255.0"},
+                                                            {"ip_address" => "10.128.142.89",
+                                                            "type" => "private",
+                                                            "netmask" => "255.255.255.0"}])
+        expect(@plugin[:digital_ocean][:networks][:v6]).to eq([{"ip_address"=>"2400:6180:0000:00d0:0000:0000:0009:7001",
+                                                            "type"=>"public",
+                                                            "cidr"=>128},
+                                                           {"ip_address"=>"fdf8:f53b:82e4:0000:0000:0000:0000:0053",
+                                                            "type"=>"private",
+                                                            "cidr"=>128}])
+      end
+    end
+  end
+
+  describe "without digital_ocean hint file" do
+    before do
+      allow(File).to receive(:exist?).with(hint_path_nix).and_return(false)
+      allow(File).to receive(:exist?).with(hint_path_win).and_return(false)
+    end
+
+
+    describe "with the /etc/digitalocean file" do
+      before do
+        allow(File).to receive(:exist?).with(digitalocean_path).and_return(true)
+        @plugin.run
+      end
+      it_should_behave_like "digital_ocean_networking"
+    end
+
+    describe "without the /etc/digitalocean file" do
+      before do
+        allow(File).to receive(:exist?).with(digitalocean_path).and_return(false)
+      end
+      it_should_behave_like "!digital_ocean"
+    end
+  end
+
+  context "with ec2 hint file" do
+    let(:ec2_hint_path_nix) { '/etc/chef/ohai/hints/ec2.json' }
+    let(:ec2_hint_path_win) { 'C:\chef\ohai\hints/ec2.json' }
+
+    before do
+      allow(File).to receive(:exist?).with(hint_path_nix).and_return(false)
+      allow(File).to receive(:exist?).with(hint_path_win).and_return(false)
+
+      allow(File).to receive(:exist?).with(ec2_hint_path_nix).and_return(true)
+      allow(File).to receive(:read).with(ec2_hint_path_nix).and_return('')
+      allow(File).to receive(:exist?).with(ec2_hint_path_win).and_return(true)
+      allow(File).to receive(:read).with(ec2_hint_path_win).and_return('')
+    end
+
+    describe "with the /etc/digitalocean file" do
+      before do
+        allow(File).to receive(:exist?).with(digitalocean_path).and_return(true)
+        @plugin.run
+      end
+      it_should_behave_like "digital_ocean_networking"
+    end
+
+    describe "without the /etc/digitalocean file" do
+      before do
+        allow(File).to receive(:exist?).with(digitalocean_path).and_return(false)
+      end
+      it_should_behave_like "!digital_ocean"
+    end
+  end
+end

data/spec/unit/plugins/elixir_spec.rb

@@ -0,0 +1,46 @@
+# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
+# 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.
+# See the License for the specific language elixirverning permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
+
+describe Ohai::System, "plugin elixir" do
+
+  before(:each) do
+    @plugin = get_plugin("elixir")
+    @plugin[:languages] = Mash.new
+    @stdout = "Elixir 1.0.2"
+    allow(@plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(0, @stdout, ""))
+  end
+
+  it "should get the elixir version" do
+    expect(@plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
+  end
+
+  it "should set languages[:elixir][:version]" do
+    @plugin.run
+    expect(@plugin.languages[:elixir][:version]).to eql("1.0.2")
+  end
+
+  it "should not set the languages[:elixir] if elixir command fails" do
+    @stdout = "Elixir 1.0.2\n"
+    allow(@plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(1, @stdout, ""))
+    @plugin.run
+    expect(@plugin.languages).not_to have_key(:elixir)
+  end
+
+end
+

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

@@ -19,7 +19,48 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
-describe Ohai::System, "Linux cpu plugin" do
+shared_examples "Common cpu info" do |total_cpu, real_cpu|
+  describe "cpu" do
+    it "has cpu[:total] equals to #{total_cpu}" do
+      @plugin.run
+      expect(@plugin[:cpu][:total]).to eq(total_cpu)
+    end
+
+    it "has cpu[:real] equals to #{real_cpu}" do
+      @plugin.run
+      expect(@plugin[:cpu][:real]).to eq(real_cpu)
+    end
+
+    it "has a cpu 0" do
+      @plugin.run
+      expect(@plugin[:cpu]).to have_key("0")
+    end
+  end
+end
+
+shared_examples "S390 processor info" do |cpu_no, version, identification, machine|
+  describe "S390 processor" do
+    it "has a version for cpu #{cpu_no}" do
+      @plugin.run
+      expect(@plugin[:cpu]["#{cpu_no}"]).to have_key("version")
+      expect(@plugin[:cpu]["#{cpu_no}"]["version"]).to eql(version)
+    end
+
+    it "has a identification for cpu #{cpu_no}" do
+      @plugin.run
+      expect(@plugin[:cpu]["#{cpu_no}"]).to have_key("identification")
+      expect(@plugin[:cpu]["#{cpu_no}"]["identification"]).to eql(identification)
+    end
+
+    it "has a machine for cpu #{cpu_no}" do
+      @plugin.run
+      expect(@plugin[:cpu]["#{cpu_no}"]).to have_key("machine")
+      expect(@plugin[:cpu]["#{cpu_no}"]["machine"]).to eql(machine)
+    end
+  end
+end 
+
+describe Ohai::System, "General Linux cpu plugin" do
   before(:each) do
     @plugin = get_plugin("linux/cpu")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
@@ -47,81 +88,117 @@ describe Ohai::System, "Linux cpu plugin" do
     allow(File).to receive(:open).with("/proc/cpuinfo").and_return(@double_file)
   end
   
-  it "should set cpu[:total] to 1" do
-    @plugin.run
-    expect(@plugin[:cpu][:total]).to eq(1)
-  end
-  
-  it "should set cpu[:real] to 0" do
-    @plugin.run
-    expect(@plugin[:cpu][:real]).to eq(0)
-  end
-  
-  it "should have a cpu 0" do
+  it_behaves_like "Common cpu info", 1, 0
+
+  it "doesn't have a cpu 1" do
     @plugin.run
-    expect(@plugin[:cpu]).to have_key("0")
+    expect(@plugin[:cpu]).not_to have_key("1")
   end
-  
-  it "should have a vendor_id for cpu 0" do
+
+  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 "should have a family for cpu 0" do
+
+  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 "should have a model for cpu 0" do
+
+  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 "should have a stepping for cpu 0" do
+
+  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 "should not have a phyiscal_id for cpu 0" do
+
+  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 "should not have a core_id for cpu 0" do
+
+  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 "should not have a cores for cpu 0" do
+
+  it "doesn't have a cores for cpu 0" do
     @plugin.run
     expect(@plugin[:cpu]["0"]).not_to have_key("cores")
   end
-  
-  it "should have a model name for cpu 0" do
+
+  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 "should have a mhz for cpu 0" do
+
+  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 "should have a cache_size for cpu 0" do
+
+  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 "should have flags for cpu 0" do
+
+  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
+
+describe Ohai::System, "S390 linux cpu plugin" do
+  before(:each) do
+    @plugin = get_plugin("linux/cpu")
+    allow(@plugin).to receive(:collect_os).and_return(:linux)
+    @double_file = double("/proc/cpuinfo")
+    allow(@double_file).to receive(:each).
+      and_yield("vendor_id : IBM/S390").
+      and_yield("# processors : 2").
+      and_yield("bogomips per cpu: 9328.00").
+      and_yield("features : esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs").
+      and_yield("processor 0: version = EE, identification = 06E276, machine = 2717").
+      and_yield("processor 1: version = FF, identification = 06E278, machine = 2818")
+    allow(File).to receive(:open).with("/proc/cpuinfo").and_return(@double_file)
+  end
+
+  it_behaves_like "Common cpu info", 2, 0
+ 
+  it "has a cpu 1" do
+    @plugin.run
+    expect(@plugin[:cpu]).to have_key("1")
+  end
+
+  it "has a vendor_id" do
+    @plugin.run
+    expect(@plugin[:cpu]).to have_key("vendor_id")
+    expect(@plugin[:cpu]["vendor_id"]).to eql("IBM/S390")
+  end
+
+  it "has a bogomips per cpu" do
+    @plugin.run
+    expect(@plugin[:cpu]).to have_key("bogomips_per_cpu")
+    expect(@plugin[:cpu]["bogomips_per_cpu"]).to eql("9328.00")
+  end
+
+  it "has features" do
+    @plugin.run
+    expect(@plugin[:cpu]).to have_key("features")
+    expect(@plugin[:cpu]["features"]).to eq(%w{esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs})
+  end
+
+  it_behaves_like "S390 processor info", 0, "EE", "06E276", "2717"
+  it_behaves_like "S390 processor info", 1, "FF", "06E278", "2818"
+end