ohai 8.14.0 → 8.15.0

data/spec/unit/plugins/eucalyptus_spec.rb

@@ -21,21 +21,19 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 require "open-uri"
 
 describe Ohai::System, "plugin eucalyptus" do
-  before(:each) do
-    @plugin = get_plugin("eucalyptus")
-  end
+  let(:plugin) { get_plugin("eucalyptus") }
 
   shared_examples_for "!eucalyptus" do
-    it "should NOT attempt to fetch the eucalyptus metadata" do
+    it "does NOT attempt to fetch the eucalyptus metadata" do
       expect(OpenURI).not_to receive(:open)
-      @plugin.run
+      plugin.run
     end
   end
 
   shared_examples_for "eucalyptus" do
     before(:each) do
       @http_client = double("Net::HTTP client")
-      allow(@plugin).to receive(:http_client).and_return(@http_client)
+      allow(plugin).to receive(:http_client).and_return(@http_client)
 
       expect(@http_client).to receive(:get).
         with("/").twice.
@@ -57,69 +55,50 @@ describe Ohai::System, "plugin eucalyptus" do
         and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
     end
 
-    it "should recursively fetch all the eucalyptus metadata" do
+    it "recursively fetches all the eucalyptus metadata" do
       allow(IO).to receive(:select).and_return([[], [1], []])
       t = double("connection")
       allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
       allow(Socket).to receive(:new).and_return(t)
-      @plugin.run
-      expect(@plugin[:eucalyptus]).not_to be_nil
-      expect(@plugin[:eucalyptus]["instance_type"]).to eq("c1.medium")
-      expect(@plugin[:eucalyptus]["ami_id"]).to eq("ami-5d2dc934")
-      expect(@plugin[:eucalyptus]["security_groups"]).to eql %w{group1 group2}
+      plugin.run
+      expect(plugin[:eucalyptus]).not_to be_nil
+      expect(plugin[:eucalyptus]["instance_type"]).to eq("c1.medium")
+      expect(plugin[:eucalyptus]["ami_id"]).to eq("ami-5d2dc934")
+      expect(plugin[:eucalyptus]["security_groups"]).to eql %w{group1 group2}
     end
   end
 
   describe "with eucalyptus mac and metadata address connected" do
-    it_should_behave_like "eucalyptus"
+    it_behaves_like "eucalyptus"
 
     before(:each) do
       allow(IO).to receive(:select).and_return([[], [1], []])
-      @plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "d0:0d:95:47:6E:ED" => { "family" => "lladdr" } } } } }
+      plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "d0:0d:95:47:6E:ED" => { "family" => "lladdr" } } } } }
     end
   end
 
   describe "without eucalyptus mac and metadata address connected" do
-    it_should_behave_like "!eucalyptus"
+    it_behaves_like "!eucalyptus"
 
     before(:each) do
-      @plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "ff:ff:95:47:6E:ED" => { "family" => "lladdr" } } } } }
+      plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "ff:ff:95:47:6E:ED" => { "family" => "lladdr" } } } } }
     end
   end
 
-  describe "with eucalyptus cloud file" do
-    it_should_behave_like "eucalyptus"
+  describe "with eucalyptus hint file" do
+    it_behaves_like "eucalyptus"
 
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/eucalyptus.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/eucalyptus.json").and_return("")
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/eucalyptus.json').and_return("")
+      allow(plugin).to receive(:hint?).with("eucalyptus").and_return(true)
     end
   end
 
-  describe "without cloud file" do
-    it_should_behave_like "!eucalyptus"
+  describe "without hint file" do
+    it_behaves_like "!eucalyptus"
 
     before(:each) do
-      @plugin[:network] = { :interfaces => {} }
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/eucalyptus.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
-    end
-  end
-
-  describe "with ec2 cloud file" do
-    it_should_behave_like "!eucalyptus"
-
-    before(:each) do
-      @plugin[:network] = { :interfaces => {} }
-
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/eucalyptus.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/ec2.json").and_return("")
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/ec2.json').and_return("")
+      plugin[:network] = { :interfaces => {} }
+      allow(plugin).to receive(:hint?).with("eucalyptus").and_return(false)
     end
   end
 

data/spec/unit/plugins/gce_spec.rb

@@ -19,26 +19,24 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 require "open-uri"
 
 describe Ohai::System, "plugin gce" do
-  before(:each) do
-    @plugin = get_plugin("gce")
-  end
+  let(:plugin) { get_plugin("gce") }
 
   shared_examples_for "!gce" do
-    it "should NOT attempt to fetch the gce metadata" do
-      expect(@plugin).not_to receive(:http_get)
-      @plugin.run
+    it "does NOT attempt to fetch the gce metadata" do
+      expect(plugin).not_to receive(:http_get)
+      plugin.run
     end
 
-    it "should NOT set gce attributes" do
-      expect(@plugin[:gce]).to be_nil
-      @plugin.run
+    it "does NOT set gce attributes" do
+      expect(plugin[:gce]).to be_nil
+      plugin.run
     end
   end
 
   shared_examples_for "gce" do
     before(:each) do
       @http_get = double("Net::HTTP client")
-      allow(@plugin).to receive(:http_get).and_return(double("Net::HTTP Response", :body => '{"instance":{"hostname":"test-host"}}', :code => "200"))
+      allow(plugin).to receive(:http_get).and_return(double("Net::HTTP Response", :body => '{"instance":{"hostname":"test-host"}}', :code => "200"))
       allow(IO).to receive(:select).and_return([[], [1], []])
       t = double("connection")
       allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
@@ -46,32 +44,28 @@ describe Ohai::System, "plugin gce" do
       allow(Socket).to receive(:pack_sockaddr_in).and_return(nil)
     end
 
-    it "should recursively fetch and properly parse json metadata" do
-      @plugin.run
+    it "recursively fetches and properly parses json metadata" do
+      plugin.run
 
-      expect(@plugin[:gce]).not_to be_nil
-      expect(@plugin[:gce]["instance"]).to eq("hostname" => "test-host")
+      expect(plugin[:gce]).not_to be_nil
+      expect(plugin[:gce]["instance"]).to eq("hostname" => "test-host")
     end
 
   end
 
   describe "with hint file and with metadata connection" do
-    it_should_behave_like "gce"
+    it_behaves_like "gce"
 
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/gce.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/gce.json").and_return("")
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/gce.json').and_return("")
+      allow(plugin).to receive(:hint?).with("gce").and_return({})
     end
   end
 
   describe "without hint file and without metadata connection" do
-    it_should_behave_like "!gce"
+    it_behaves_like "!gce"
 
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/gce.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(false)
+      allow(plugin).to receive(:hint?).with("gce").and_return(false)
 
       # Raise Errno::ENOENT to simulate the scenario in which metadata server
       # can not be connected

data/spec/unit/plugins/linode_spec.rb

@@ -18,12 +18,10 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
 describe Ohai::System, "plugin linode" do
-  let(:hint_path_nix) { "/etc/chef/ohai/hints/linode.json" }
-  let(:hint_path_win) { 'C:\chef\ohai\hints/linode.json' }
+  let(:plugin) { get_plugin("linode") }
 
   before do
-    @plugin = get_plugin("linode")
-    @plugin[:network] = {
+    plugin[:network] = {
       "interfaces" => {
         "eth0" => {
           "addresses" => {
@@ -48,49 +46,49 @@ describe Ohai::System, "plugin linode" do
 
   shared_examples_for "!linode" do
     it "does not create the linode mash" do
-      @plugin.run
-      expect(@plugin[:linode]).to be_nil
+      plugin.run
+      expect(plugin[:linode]).to be_nil
     end
   end
 
   shared_examples_for "linode" do
-    it "creates a linode mash" do
-      @plugin.run
-      expect(@plugin[:linode]).not_to be_nil
+    it "creates the linode mash" do
+      plugin.run
+      expect(plugin[:linode]).not_to be_nil
     end
 
-    it "has all required attributes" do
-      @plugin.run
-      expect(@plugin[:linode][:public_ip]).not_to be_nil
+    it "has public_ip attribute" do
+      plugin.run
+      expect(plugin[:linode][:public_ip]).not_to be_nil
     end
 
-    it "has correct values for all attributes" do
-      @plugin.run
-      expect(@plugin[:linode][:public_ip]).to eq("1.2.3.4")
+    it "has correct value for public_ip attribute" do
+      plugin.run
+      expect(plugin[:linode][:public_ip]).to eq("1.2.3.4")
     end
 
   end
 
   context "without linode kernel" do
     before do
-      @plugin[:kernel] = { "release" => "3.5.2-x86_64" }
+      plugin[:kernel] = { "release" => "3.5.2-x86_64" }
     end
 
-    it_should_behave_like "!linode"
+    it_behaves_like "!linode"
   end
 
   context "with linode kernel" do
     before do
-      @plugin[:kernel] = { "release" => "3.5.2-x86_64-linode24" }
+      plugin[:kernel] = { "release" => "3.5.2-x86_64-linode24" }
     end
 
-    it_should_behave_like "linode"
+    it_behaves_like "linode"
 
     # This test is an interface created according to this guide by Linode
     # http://library.linode.com/networking/configuring-static-ip-interfaces
     context "with configured private ip address as suggested by linode" do
       before do
-        @plugin[:network][:interfaces]["eth0:1"] = {
+        plugin[:network][:interfaces]["eth0:1"] = {
           "addresses" => {
             "5.6.7.8" => {
               "broadcast" => "10.176.191.255",
@@ -110,49 +108,28 @@ describe Ohai::System, "plugin linode" do
       end
 
       it "detects and sets the private ip" do
-        @plugin.run
-        expect(@plugin[:linode][:private_ip]).not_to be_nil
-        expect(@plugin[:linode][:private_ip]).to eq("5.6.7.8")
+        plugin.run
+        expect(plugin[:linode][:private_ip]).not_to be_nil
+        expect(plugin[:linode][:private_ip]).to eq("5.6.7.8")
       end
     end
 
   end
 
-  describe "with linode cloud file" do
+  describe "with linode hint file" do
     before do
-      allow(File).to receive(:exist?).with(hint_path_nix).and_return(true)
-      allow(File).to receive(:read).with(hint_path_nix).and_return("")
-      allow(File).to receive(:exist?).with(hint_path_win).and_return(true)
-      allow(File).to receive(:read).with(hint_path_win).and_return("")
+      allow(plugin).to receive(:hint?).with("linode").and_return({})
     end
 
-    it_should_behave_like "linode"
+    it_behaves_like "linode"
   end
 
-  describe "without cloud file" do
+  describe "without 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)
+      allow(plugin).to receive(:hint?).with("linode").and_return(false)
     end
 
-    it_should_behave_like "!linode"
-  end
-
-  context "with ec2 cloud 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
-
-    it_should_behave_like "!linode"
+    it_behaves_like "!linode"
   end
 
 end

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

@@ -0,0 +1,59 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+
+describe Ohai::System, "plugin fips" do
+  let(:enabled) { "0" }
+  let(:plugin) { get_plugin("linux/fips") }
+  let(:fips_path) { "/proc/sys/crypto/fips_enabled" }
+
+  before(:each) do
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+    allow(::File).to receive(:read).with(fips_path).and_return(enabled)
+  end
+
+  context "fips file is present and contains 1" do
+    let(:enabled) { "1" }
+
+    it "sets fips plugin" do
+      plugin.run
+      expect(plugin["fips"]["kernel"]["enabled"]).to be(true)
+    end
+  end
+
+  context "fips file does not contain 1" do
+    let(:enabled) { "0" }
+
+    it "does not set fips plugin" do
+      plugin.run
+      expect(plugin["fips"]["kernel"]["enabled"]).to be(false)
+    end
+  end
+
+  context "fips file is not present" do
+    before do
+      allow(::File).to receive(:read).and_raise(Errno::ENOENT, "bibbleboop")
+    end
+
+    it "does not set fips plugin" do
+      plugin.run
+      expect(plugin["fips"]["kernel"]["enabled"]).to be(false)
+    end
+  end
+end

data/spec/unit/plugins/mono_spec.rb

@@ -19,29 +19,44 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
 
 describe Ohai::System, "plugin mono" do
+  let(:plugin) { get_plugin("mono") }
 
   before(:each) do
-    @plugin = get_plugin("mono")
-    @plugin[:languages] = Mash.new
-    @stdout = "Mono JIT compiler version 1.2.6 (tarball)\nCopyright (C) 2002-2007 Novell, Inc and Contributors. www.mono-project.com\n"
-    allow(@plugin).to receive(:shell_out).with("mono -V").and_return(mock_shell_out(0, @stdout, ""))
+    plugin[:languages] = Mash.new
+    @stdout = <<-OUT
+Mono JIT compiler version 4.2.3 (Stable 4.2.3.4/832de4b Wed Mar 30 13:57:48 PDT 2016)
+Copyright (C) 2002-2014 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com
+	TLS:           normal
+	SIGSEGV:       altstack
+	Notification:  kqueue
+	Architecture:  amd64
+	Disabled:      none
+	Misc:          softdebug
+	LLVM:          supported, not enabled.
+	GC:            sgen
+OUT
+    allow(plugin).to receive(:shell_out).with("mono -V").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should get the mono version from running mono -V" do
-    expect(@plugin).to receive(:shell_out).with("mono -V").and_return(mock_shell_out(0, @stdout, ""))
-    @plugin.run
+    expect(plugin).to receive(:shell_out).with("mono -V").and_return(mock_shell_out(0, @stdout, ""))
+    plugin.run
   end
 
   it "should set languages[:mono][:version]" do
-    @plugin.run
-    expect(@plugin.languages[:mono][:version]).to eql("1.2.6")
+    plugin.run
+    expect(plugin.languages[:mono][:version]).to eql("4.2.3")
+  end
+
+  it "should set languages[:mono][:builddate]" do
+    plugin.run
+    expect(plugin.languages[:mono][:builddate]).to eql("Wed Mar 30 13:57:48 PDT 2016")
   end
 
   it "should not set the languages[:mono] tree up if mono command fails" do
-    @stdout = "Mono JIT compiler version 1.2.6 (tarball)\nCopyright (C) 2002-2007 Novell, Inc and Contributors. www.mono-project.com\n"
-    allow(@plugin).to receive(:shell_out).with("mono -V").and_return(mock_shell_out(1, @stdout, ""))
-    @plugin.run
-    expect(@plugin.languages).not_to have_key(:mono)
+    allow(plugin).to receive(:shell_out).with("mono -V").and_return(mock_shell_out(1, @stdout, ""))
+    plugin.run
+    expect(plugin.languages).not_to have_key(:mono)
   end
 
 end

data/spec/unit/plugins/rackspace_spec.rb

@@ -82,19 +82,19 @@ describe Ohai::System, "plugin rackspace" do
   end
 
   shared_examples_for "!rackspace" do
-    it "does not create rackspace" do
+    it "does not create rackspace attribute" do
       plugin.run
       expect(plugin[:rackspace]).to be_nil
     end
   end
 
   shared_examples_for "rackspace" do
-    it "creates rackspace" do
+    it "has rackspace attribute" do
       plugin.run
       expect(plugin[:rackspace]).not_to be_nil
     end
 
-    it "has all required attributes" do
+    it "has expected rackspace ip/hostname attributes" do
       plugin.run
       expect(plugin[:rackspace][:public_ip]).not_to be_nil
       expect(plugin[:rackspace][:private_ip]).not_to be_nil
@@ -184,17 +184,14 @@ OUT
     end
   end
 
-  describe "with rackspace cloud file" do
+  describe "with rackspace hint file" do
     it_behaves_like "rackspace"
 
     before(:each) do
       allow(Resolv).to receive(:getname).and_raise(Resolv::ResolvError)
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/rackspace.json").and_return("")
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return("")
       allow(File).to receive(:exist?).with("/etc/resolv.conf").and_return(true)
       allow(File).to receive(:read).with("/etc/resolv.conf").and_return("")
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
     end
 
     describe "with no public interfaces (empty eth0)" do
@@ -203,7 +200,7 @@ OUT
         plugin[:network][:interfaces][:eth0]["addresses"] = {}
       end
 
-      it "has all required attributes" do
+      it "has correct rackspace attributes" do
         plugin.run
         # expliticly nil
         expect(plugin[:rackspace][:public_ip]).to be_nil
@@ -211,14 +208,7 @@ OUT
         expect(plugin[:rackspace][:public_ipv6]).to be_nil
         expect(plugin[:rackspace][:public_hostname]).to be_nil
         # per normal
-        expect(plugin[:rackspace][:private_ip]).not_to be_nil
-        expect(plugin[:rackspace][:local_ipv4]).not_to be_nil
         expect(plugin[:rackspace][:local_ipv6]).to be_nil
-        expect(plugin[:rackspace][:local_hostname]).not_to be_nil
-      end
-
-      it "has correct values for all attributes" do
-        plugin.run
         expect(plugin[:rackspace][:private_ip]).to eq("5.6.7.8")
         expect(plugin[:rackspace][:local_ipv4]).to eq("5.6.7.8")
         expect(plugin[:rackspace][:local_hostname]).to eq("katie")
@@ -226,26 +216,11 @@ OUT
     end
   end
 
-  describe "without cloud file" do
-    it_behaves_like "!rackspace"
-
-    before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(false)
-    end
-  end
-
-  describe "with ec2 cloud file" do
+  describe "without hint file" do
     it_behaves_like "!rackspace"
 
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/ec2.json").and_return("")
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/ec2.json').and_return("")
-
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(false)
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
     end
   end
 
@@ -254,6 +229,7 @@ OUT
 
     before(:each) do
       stdout = "Rackspace\n"
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
       allow(plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
   end
@@ -262,6 +238,7 @@ OUT
     it_behaves_like "!rackspace"
 
     before(:each) do
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
       stdout = "cumulonimbus\n"
       allow(plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
@@ -271,6 +248,7 @@ OUT
     it_behaves_like "!rackspace"
 
     before(:each) do
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
       allow(plugin).
         to receive(:shell_out).
         with("xenstore-read vm-data/provider_data/provider").
@@ -301,14 +279,10 @@ OUT
   describe "does not have private networks" do
     before do
       stdout = 'BC764E20422B = "{"label": "public"}"\n'
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
       allow(plugin).to receive(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
       stdout = '{"label": "public", "broadcast": "9.10.11.255", "ips": [{"ip": "9.10.11.12", "netmask": "255.255.255.0", "enabled": "1", "gateway": null}], "mac": "BC:76:4E:20:42:2B", "dns": ["69.20.0.164", "69.20.0.196"], "gateway": null}'
       allow(plugin).to receive(:shell_out).with("xenstore-read vm-data/networking/BC764E20422B").and_return(mock_shell_out(0, stdout, "" ))
-
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/rackspace.json").and_return("")
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return("")
     end
 
     it "does not have private_networks object" do
@@ -340,11 +314,7 @@ OUT
       allow(plugin).to receive(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
       stdout = '{"label": "private-network", "broadcast": "9.10.11.255", "ips": [{"ip": "9.10.11.12", "netmask": "255.255.255.0", "enabled": "1", "gateway": null}], "mac": "BC:76:4E:20:42:2B", "dns": ["69.20.0.164", "69.20.0.196"], "gateway": null}'
       allow(plugin).to receive(:shell_out).with("xenstore-read vm-data/networking/BC764E20422B").and_return(mock_shell_out(0, stdout, "" ))
-
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/rackspace.json").and_return("")
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return("")
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
     end
 
     it "has private_networks object" do
@@ -352,7 +322,7 @@ OUT
       expect(plugin[:rackspace][:private_networks]).not_to be_nil
     end
 
-    it "has correct values for all attributes" do
+    it "has correct values for all rackspace attributes" do
       plugin.run
       expect(plugin[:rackspace][:private_networks][0][:label]).to eq("private-network")
       expect(plugin[:rackspace][:private_networks][0][:broadcast]).to eq("9.10.11.255")