ohai 8.13.0 → 8.14.0

data/spec/unit/plugins/openstack_spec.rb

@@ -171,7 +171,7 @@ EOM
 
         expect_get_response(
           URI.parse("#{openstack_metadata_endpoint}#{openstack_metadata_version}/meta_data.json"),
-          openstack_metadata_values,
+          openstack_metadata_values
         )
 
         openstack_plugin.run

data/spec/unit/plugins/packages_spec.rb

@@ -20,252 +20,226 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
 describe Ohai::System, "plugin packages" do
-  context "when the packages plugin is disabled" do
-    before do
-      Ohai.config[:plugin][:packages][:enabled] = false
-      allow(plugin).to receive(:collect_os).and_return(platform_family.to_s)
-      plugin.run
-    end
-
+  context "on debian" do
     let(:plugin) do
       get_plugin("packages").tap do |plugin|
-        plugin[:platform_family] = platform_family
+        plugin[:platform_family] = "debian"
       end
     end
 
-    [:debian, :fedora, :windows, :aix, :solaris2].each do |os|
-      context "on #{os}" do
-        let(:platform_family) { os }
-
-        it "does not enumerate the packages" do
-          expect(plugin[:packages]).to eq(nil)
-        end
-      end
+    let(:stdout) do
+      File.read(File.join(SPEC_PLUGIN_PATH, "dpkg-query.output"))
     end
-  end
 
-  context "when the packages plugin is enabled" do
-    before do
-      Ohai.config[:plugin][:packages][:enabled] = true
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:linux)
+      allow(plugin).to receive(:shell_out)
+        .with("dpkg-query -W")
+        .and_return(mock_shell_out(0, stdout, ""))
+      plugin.run
     end
 
-    context "on debian" do
-      let(:plugin) do
-        get_plugin("packages").tap do |plugin|
-          plugin[:platform_family] = "debian"
-        end
-      end
+    it "calls dpkg query" do
+      expect(plugin).to receive(:shell_out)
+        .with("dpkg-query -W")
+        .and_return(mock_shell_out(0, stdout, ""))
+      plugin.run
+    end
 
-      let(:stdout) do
-        File.read(File.join(SPEC_PLUGIN_PATH, "dpkg-query.output"))
-      end
+    it "gets packages and versions" do
+      expect(plugin[:packages]["vim-common"][:version]).to eq("2:7.4.052-1ubuntu3")
+    end
+  end
 
-      before(:each) do
-        allow(plugin).to receive(:collect_os).and_return(:linux)
-        allow(plugin).to receive(:shell_out)
-          .with("dpkg-query -W")
-          .and_return(mock_shell_out(0, stdout, ""))
-        plugin.run
+  context "on fedora" do
+    let(:plugin) do
+      get_plugin("packages").tap do |plugin|
+        plugin[:platform_family] = "fedora"
       end
+    end
 
-      it "calls dpkg query" do
-        expect(plugin).to receive(:shell_out)
-          .with("dpkg-query -W")
-          .and_return(mock_shell_out(0, stdout, ""))
-        plugin.run
-      end
+    let(:format) { Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n' }
 
-      it "gets packages and versions" do
-        expect(plugin[:packages]["vim-common"][:version]).to eq("2:7.4.052-1ubuntu3")
-      end
+    let(:stdout) do
+      File.read(File.join(SPEC_PLUGIN_PATH, "rpmquery.output"))
     end
 
-    context "on fedora" do
-      let(:plugin) do
-        get_plugin("packages").tap do |plugin|
-          plugin[:platform_family] = "fedora"
-        end
-      end
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:linux)
+      allow(plugin).to receive(:shell_out).with("rpm -qa --queryformat #{format}").and_return(mock_shell_out(0, stdout, ""))
+      plugin.run
+    end
 
-      let(:format) { Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n' }
+    it "calls rpm -qa" do
+      expect(plugin).to receive(:shell_out)
+        .with("rpm -qa --queryformat #{format}")
+        .and_return(mock_shell_out(0, stdout, ""))
+      plugin.run
+    end
 
-      let(:stdout) do
-        File.read(File.join(SPEC_PLUGIN_PATH, "rpmquery.output"))
-      end
+    it "gets packages and versions/release" do
+      expect(plugin[:packages]["vim-common"][:version]).to eq("7.2.411")
+      expect(plugin[:packages]["vim-common"][:release]).to eq("1.8.el6")
+    end
+  end
 
-      before(:each) do
-        allow(plugin).to receive(:collect_os).and_return(:linux)
-        allow(plugin).to receive(:shell_out).with("rpm -qa --queryformat #{format}").and_return(mock_shell_out(0, stdout, ""))
-        plugin.run
-      end
+  context "on windows", :windows_only do
 
-      it "calls rpm -qa" do
-        expect(plugin).to receive(:shell_out)
-          .with("rpm -qa --queryformat #{format}")
-          .and_return(mock_shell_out(0, stdout, ""))
-        plugin.run
+    let(:plugin) do
+      get_plugin("packages").tap do |plugin|
+        plugin[:platform_family] = "windows"
       end
+    end
 
-      it "gets packages and versions/release" do
-        expect(plugin[:packages]["vim-common"][:version]).to eq("7.2.411")
-        expect(plugin[:packages]["vim-common"][:release]).to eq("1.8.el6")
-      end
+    let(:win_reg_double) do
+      instance_double("Win32::Registry")
     end
 
-    context "on windows", :windows_only do
-      require "wmi-lite"
+    let(:win_reg_keys) do
+      [ "{22FA28AB-3C1B-438B-A8B5-E23892C8B567}",
+        "{0D4BCDCD-6225-4BA5-91A3-54AFCECC281E}" ]
+    end
 
-      let(:plugin) do
-        get_plugin("packages").tap do |plugin|
-          plugin[:platform_family] = "windows"
-        end
-      end
+    let(:i386_reg_type) do
+      Win32::Registry::KEY_READ | 0x100
+    end
 
-      let(:win32_product_output) do
-        [{ "assignmenttype" => 0,
-           "caption" => "NXLOG-CE",
-           "description" => "NXLOG-CE",
-           "helplink" => nil,
-           "helptelephone" => nil,
-           "identifyingnumber" => "{22FA28AB-3C1B-438B-A8B5-E23892C8B567}",
-           "installdate" => "20150511",
-           "installdate2" => nil,
-           "installlocation" => nil,
-           "installsource" => 'C:\\chef\\cache\\',
-           "installstate" => 5,
-           "language" => "1033",
-           "localpackage" => 'C:\\Windows\\Installer\\30884.msi',
-           "name" => "NXLOG-CE",
-           "packagecache" => 'C:\\Windows\\Installer\\30884.msi',
-           "packagecode" => "{EC3A13C4-4634-47FC-9662-DC293CB96F9F}",
-           "packagename" => "nexlog-ce-2.8.1248.msi",
-           "productid" => nil,
-           "regcompany" => nil,
-           "regowner" => nil,
-           "skunumber" => nil,
-           "transforms" => nil,
-           "urlinfoabout" => nil,
-           "urlupdateinfo" => nil,
-           "vendor" => "nxsec.com",
-           "version" => "2.8.1248",
-           "wordcount" => 2 },
-           { "assignmenttype" => 1,
-             "caption" => "Chef Development Kit v0.7.0",
-             "description" => "Chef Development Kit v0.7.0",
-             "helplink" => "http://www.getchef.com/support/",
-             "helptelephone" => nil,
-             "identifyingnumber" => "{90754A33-404C-4172-8F3B-7F04CE98011C}",
-             "installdate" => "20150925", "installdate2" => nil,
-             "installlocation" => nil,
-             "installsource" => 'C:\\Users\\skhajamohid1\\Downloads\\',
-             "installstate" => 5, "language" => "1033",
-             "localpackage" => 'C:\\WINDOWS\\Installer\\d9e1ca7.msi',
-             "name" => "Chef Development Kit v0.7.0",
-             "packagecache" => 'C:\\WINDOWS\\Installer\\d9e1ca7.msi',
-             "packagecode" => "{9B82FB86-40AE-4CDF-9DE8-97574F9395B9}",
-             "packagename" => "chefdk-0.7.0-1 (2).msi",
-             "productid" => nil,
-             "regcompany" => nil,
-             "regowner" => nil,
-             "skunumber" => nil,
-             "transforms" => nil,
-             "urlinfoabout" => nil,
-             "urlupdateinfo" => nil,
-             "vendor" => "\"Chef Software, Inc. <maintainers@chef.io>\"",
-             "version" => "0.7.0.1",
-             "wordcount" => 2 }]
-      end
+    let(:x86_64_reg_type) do
+      Win32::Registry::KEY_READ | 0x200
+    end
 
-      before(:each) do
-        allow(plugin).to receive(:collect_os).and_return(:windows)
-        expect_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with("Win32_Product").and_return(win32_product_output)
-        plugin.run
-      end
+    let(:win_reg_output) do
+      [{ "DisplayName" => "NXLOG-CE",
+         "DisplayVersion" => "2.8.1248",
+         "Publisher" => "nxsec.com",
+         "InstallDate" => "20150511",
+        },
+        { "DisplayName" => "Chef Development Kit v0.7.0",
+          "DisplayVersion" => "0.7.0.1",
+          "Publisher" => "\"Chef Software, Inc. <maintainers@chef.io>\"",
+          "InstallDate" => "20150925" }]
+    end
 
+    shared_examples "windows_package_plugin" do
       it "gets package info" do
+        plugin.run
         expect(plugin[:packages]["Chef Development Kit v0.7.0"][:version]).to eq("0.7.0.1")
-        expect(plugin[:packages]["Chef Development Kit v0.7.0"][:vendor]).to eq("\"Chef Software, Inc. <maintainers@chef.io>\"")
+        expect(plugin[:packages]["Chef Development Kit v0.7.0"][:publisher]).to eq("\"Chef Software, Inc. <maintainers@chef.io>\"")
         expect(plugin[:packages]["Chef Development Kit v0.7.0"][:installdate]).to eq("20150925")
 
         expect(plugin[:packages]["NXLOG-CE"][:version]).to eq("2.8.1248")
-        expect(plugin[:packages]["NXLOG-CE"][:vendor]).to eq("nxsec.com")
+        expect(plugin[:packages]["NXLOG-CE"][:publisher]).to eq("nxsec.com")
         expect(plugin[:packages]["NXLOG-CE"][:installdate]).to eq("20150511")
       end
     end
 
-    context "on aix" do
-      let(:plugin) { get_plugin("packages") }
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:windows)
+      allow(win_reg_double).to receive(:open).with(win_reg_keys[0]).and_return(win_reg_output[0])
+      allow(win_reg_double).to receive(:open).with(win_reg_keys[1]).and_return(win_reg_output[1])
+      allow(win_reg_double).to receive(:each_key).and_yield(win_reg_keys[0], 0).and_yield(win_reg_keys[1], 1)
+    end
 
-      let(:stdout) do
-        File.read(File.join(SPEC_PLUGIN_PATH, "lslpp.output"))
+    describe "on 32 bit ruby" do
+      before do
+        stub_const("::RbConfig::CONFIG", { "target_cpu" => "i386" } )
+        allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Microsoft\Windows\CurrentVersion\Uninstall', i386_reg_type).and_yield(win_reg_double)
+        allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall', i386_reg_type).and_yield(win_reg_double)
       end
+      it_behaves_like "windows_package_plugin"
+    end
 
-      before(:each) do
-        allow(plugin).to receive(:collect_os).and_return(:aix)
-        allow(plugin).to receive(:shell_out).with("lslpp -L -q -c").and_return(mock_shell_out(0, stdout, ""))
-        plugin.run
+    describe "on 64 bit ruby" do
+      before do
+        stub_const("::RbConfig::CONFIG", { "target_cpu" => "x86_64" } )
+        allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Microsoft\Windows\CurrentVersion\Uninstall', x86_64_reg_type).and_yield(win_reg_double)
+        allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall', x86_64_reg_type).and_yield(win_reg_double)
       end
+      it_behaves_like "windows_package_plugin"
+    end
 
-      it "calls lslpp -L -q -c" do
-        expect(plugin).to receive(:shell_out)
-          .with("lslpp -L -q -c")
-          .and_return(mock_shell_out(0, stdout, ""))
-        plugin.run
+    describe "on unknown ruby" do
+      before do
+        stub_const("::RbConfig::CONFIG", { "target_cpu" => nil } )
+        allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Microsoft\Windows\CurrentVersion\Uninstall', Win32::Registry::KEY_READ).and_yield(win_reg_double)
+        allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall', Win32::Registry::KEY_READ).and_yield(win_reg_double)
       end
+      it_behaves_like "windows_package_plugin"
+    end
+  end
 
-      it "gets packages with version" do
-        expect(plugin[:packages]["chef"][:version]).to eq("12.5.1.1")
-      end
+  context "on aix" do
+    let(:plugin) { get_plugin("packages") }
+
+    let(:stdout) do
+      File.read(File.join(SPEC_PLUGIN_PATH, "lslpp.output"))
     end
 
-    context "on solaris2" do
-      let(:plugin) { get_plugin("packages") }
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:aix)
+      allow(plugin).to receive(:shell_out).with("lslpp -L -q -c").and_return(mock_shell_out(0, stdout, ""))
+      plugin.run
+    end
 
-      let(:pkglist_output) do
-        File.read(File.join(SPEC_PLUGIN_PATH, "pkglist.output"))
-      end
+    it "calls lslpp -L -q -c" do
+      expect(plugin).to receive(:shell_out)
+        .with("lslpp -L -q -c")
+        .and_return(mock_shell_out(0, stdout, ""))
+      plugin.run
+    end
 
-      let(:pkginfo_output) do
-        File.read(File.join(SPEC_PLUGIN_PATH, "pkginfo.output"))
-      end
+    it "gets packages with version" do
+      expect(plugin[:packages]["chef"][:version]).to eq("12.5.1.1")
+    end
+  end
 
-      before(:each) do
-        allow(plugin).to receive(:collect_os).and_return(:solaris2)
-        allow(plugin).to receive(:shell_out).with("pkg list -H").and_return(mock_shell_out(0, pkglist_output, ""))
-        allow(plugin).to receive(:shell_out).with("pkginfo -l").and_return(mock_shell_out(0, pkginfo_output, ""))
-        plugin.run
-      end
+  context "on solaris2" do
+    let(:plugin) { get_plugin("packages") }
 
-      it "calls pkg list -H" do
-        expect(plugin).to receive(:shell_out)
-          .with("pkg list -H")
-          .and_return(mock_shell_out(0, pkglist_output, ""))
-        plugin.run
-      end
+    let(:pkglist_output) do
+      File.read(File.join(SPEC_PLUGIN_PATH, "pkglist.output"))
+    end
 
-      it "calls pkginfo -l" do
-        expect(plugin).to receive(:shell_out)
-          .with("pkginfo -l")
-          .and_return(mock_shell_out(0, pkginfo_output, ""))
-        plugin.run
-      end
+    let(:pkginfo_output) do
+      File.read(File.join(SPEC_PLUGIN_PATH, "pkginfo.output"))
+    end
 
-      it "gets ips packages with version" do
-        expect(plugin[:packages]["chef"][:version]).to eq("12.5.1")
-      end
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:solaris2)
+      allow(plugin).to receive(:shell_out).with("pkg list -H").and_return(mock_shell_out(0, pkglist_output, ""))
+      allow(plugin).to receive(:shell_out).with("pkginfo -l").and_return(mock_shell_out(0, pkginfo_output, ""))
+      plugin.run
+    end
 
-      it "gets ips packages with version and publisher" do
-        expect(plugin[:packages]["system/EMCpower"][:version]).to eq("6.0.0.1.0-3")
-        expect(plugin[:packages]["system/EMCpower"][:publisher]).to eq("emc.com")
-      end
+    it "calls pkg list -H" do
+      expect(plugin).to receive(:shell_out)
+        .with("pkg list -H")
+        .and_return(mock_shell_out(0, pkglist_output, ""))
+      plugin.run
+    end
 
-      it "gets sysv packages with version" do
-        expect(plugin[:packages]["chef"][:version]).to eq("12.5.1")
-      end
+    it "calls pkginfo -l" do
+      expect(plugin).to receive(:shell_out)
+        .with("pkginfo -l")
+        .and_return(mock_shell_out(0, pkginfo_output, ""))
+      plugin.run
+    end
 
-      it "gets sysv packages with version" do
-        expect(plugin[:packages]["mqm"][:version]).to eq("7.0.1.4")
-      end
+    it "gets ips packages with version" do
+      expect(plugin[:packages]["chef"][:version]).to eq("12.5.1")
+    end
+
+    it "gets ips packages with version and publisher" do
+      expect(plugin[:packages]["system/EMCpower"][:version]).to eq("6.0.0.1.0-3")
+      expect(plugin[:packages]["system/EMCpower"][:publisher]).to eq("emc.com")
+    end
+
+    it "gets sysv packages with version" do
+      expect(plugin[:packages]["chef"][:version]).to eq("12.5.1")
+    end
+
+    it "gets sysv packages with version" do
+      expect(plugin[:packages]["mqm"][:version]).to eq("7.0.1.4")
     end
   end
 end

data/spec/unit/plugins/rackspace_spec.rb

@@ -20,110 +20,118 @@ require "resolv"
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
 describe Ohai::System, "plugin rackspace" do
+  let(:plugin) { get_plugin("rackspace") }
+
   before(:each) do
     allow(Resolv).to receive(:getname).and_return("1.2.3.4")
-    @plugin = get_plugin("rackspace")
-    @plugin[:hostname] = "katie"
-    @plugin[:network] = { :interfaces => { :eth0 => { "addresses" => {
-      "1.2.3.4" => {
-        "broadcast" => "67.23.20.255",
-        "netmask" => "255.255.255.0",
-        "family" => "inet",
-      },
-      "2a00:1a48:7805:111:e875:efaf:ff08:75" => {
-        "family" => "inet6",
-        "prefixlen" => "64",
-        "scope" => "Global",
-      },
-      "fe80::4240:95ff:fe47:6eed" => {
-        "scope" => "Link",
-        "prefixlen" => "64",
-        "family" => "inet6",
-      },
-      "40:40:95:47:6E:ED" => {
-        "family" => "lladdr"
+
+    plugin[:hostname] = "katie"
+
+    plugin[:network] = {
+      :interfaces => {
+        :eth0 => {
+          "addresses" => {
+            "1.2.3.4" => {
+              "broadcast" => "67.23.20.255",
+              "netmask" => "255.255.255.0",
+              "family" => "inet",
+            },
+            "2a00:1a48:7805:111:e875:efaf:ff08:75" => {
+              "family" => "inet6",
+              "prefixlen" => "64",
+              "scope" => "Global",
+            },
+            "fe80::4240:95ff:fe47:6eed" => {
+              "scope" => "Link",
+              "prefixlen" => "64",
+              "family" => "inet6",
+            },
+            "40:40:95:47:6E:ED" => {
+              "family" => "lladdr",
+            },
+          },
+        },
       },
-      } }
     }
-  }
 
-    @plugin[:network][:interfaces][:eth1] = { :addresses => {
-      "fe80::4240:f5ff:feab:2836" => {
-        "scope" => "Link",
-        "prefixlen" => "64",
-        "family" => "inet6",
-      },
-      "5.6.7.8" => {
-        "broadcast" => "10.176.191.255",
-        "netmask" => "255.255.224.0",
-        "family" => "inet",
-      },
-      "40:40:F5:AB:28:36" => {
-        "family" => "lladdr"
+    plugin[:network][:interfaces][:eth1] = {
+      :addresses => {
+        "fe80::4240:f5ff:feab:2836" => {
+          "scope" => "Link",
+          "prefixlen" => "64",
+          "family" => "inet6",
+        },
+        "5.6.7.8" => {
+          "broadcast" => "10.176.191.255",
+          "netmask" => "255.255.224.0",
+          "family" => "inet",
+        },
+        "40:40:F5:AB:28:36" => {
+          "family" => "lladdr",
+        },
       },
-    } }
+    }
 
     # In olden days we could detect rackspace by a -rscloud suffix on the kernel
     # This is here to make #has_rackspace_kernel? fail until we remove that check
-    @plugin[:kernel] = { :release => "1.2.13-not-rackspace" }
+    plugin[:kernel] = { :release => "1.2.13-not-rackspace" }
 
     # We need a generic stub here for the later stubs with arguments to work
     # Because, magic.
-    allow(@plugin).to receive(:shell_out).and_return(mock_shell_out(1, "", ""))
+    allow(plugin).to receive(:shell_out).and_return(mock_shell_out(1, "", ""))
   end
 
   shared_examples_for "!rackspace" do
-    it "should NOT create rackspace" do
-      @plugin.run
-      expect(@plugin[:rackspace]).to be_nil
+    it "does not create rackspace" do
+      plugin.run
+      expect(plugin[:rackspace]).to be_nil
     end
   end
 
   shared_examples_for "rackspace" do
-
-    it "should create rackspace" do
-      @plugin.run
-      expect(@plugin[:rackspace]).not_to be_nil
+    it "creates rackspace" do
+      plugin.run
+      expect(plugin[:rackspace]).not_to be_nil
     end
 
-    it "should have all required attributes" do
-      @plugin.run
-      expect(@plugin[:rackspace][:public_ip]).not_to be_nil
-      expect(@plugin[:rackspace][:private_ip]).not_to be_nil
-      expect(@plugin[:rackspace][:public_ipv4]).not_to be_nil
-      expect(@plugin[:rackspace][:local_ipv4]).not_to be_nil
-      expect(@plugin[:rackspace][:public_ipv6]).not_to be_nil
-      expect(@plugin[:rackspace][:local_ipv6]).to be_nil
-      expect(@plugin[:rackspace][:local_hostname]).not_to be_nil
-      expect(@plugin[:rackspace][:public_hostname]).not_to be_nil
+    it "has all required attributes" do
+      plugin.run
+      expect(plugin[:rackspace][:public_ip]).not_to be_nil
+      expect(plugin[:rackspace][:private_ip]).not_to be_nil
+      expect(plugin[:rackspace][:public_ipv4]).not_to be_nil
+      expect(plugin[:rackspace][:local_ipv4]).not_to be_nil
+      expect(plugin[:rackspace][:public_ipv6]).not_to be_nil
+      expect(plugin[:rackspace][:local_ipv6]).to be_nil
+      expect(plugin[:rackspace][:local_hostname]).not_to be_nil
+      expect(plugin[:rackspace][:public_hostname]).not_to be_nil
     end
 
-    it "should resolve hostname if reverse dns is set" do
+    it "resolves hostname if reverse dns is set" do
       allow(Resolv).to receive(:getname).and_return("1234.resolved.com")
-      @plugin.run
-      expect(@plugin[:rackspace][:public_hostname]).to eq("1234.resolved.com")
+      plugin.run
+      expect(plugin[:rackspace][:public_hostname]).to eq("1234.resolved.com")
     end
 
     [Resolv::ResolvError, Resolv::ResolvTimeout].each do |exception|
-      it "should return ip address when reverse dns returns exception: #{exception}" do
+      it "returns ip address when reverse dns returns exception: #{exception}" do
         allow(Resolv).to receive(:getname).and_raise(exception)
-        @plugin.run
-        expect(@plugin[:rackspace][:public_hostname]).to eq("1.2.3.4")
+        plugin.run
+        expect(plugin[:rackspace][:public_hostname]).to eq("1.2.3.4")
       end
     end
 
-    it "should have correct values for all attributes" do
-      @plugin.run
-      expect(@plugin[:rackspace][:public_ip]).to eq("1.2.3.4")
-      expect(@plugin[:rackspace][:private_ip]).to eq("5.6.7.8")
-      expect(@plugin[:rackspace][:public_ipv4]).to eq("1.2.3.4")
-      expect(@plugin[:rackspace][:local_ipv4]).to eq("5.6.7.8")
-      expect(@plugin[:rackspace][:public_ipv6]).to eq("2a00:1a48:7805:111:e875:efaf:ff08:75")
-      expect(@plugin[:rackspace][:local_hostname]).to eq("katie")
-      expect(@plugin[:rackspace][:public_hostname]).to eq("1.2.3.4")
+    it "has correct values for all attributes" do
+      plugin.run
+      expect(plugin[:rackspace][:public_ip]).to eq("1.2.3.4")
+      expect(plugin[:rackspace][:private_ip]).to eq("5.6.7.8")
+      expect(plugin[:rackspace][:public_ipv4]).to eq("1.2.3.4")
+      expect(plugin[:rackspace][:local_ipv4]).to eq("5.6.7.8")
+      expect(plugin[:rackspace][:public_ipv6]).to eq("2a00:1a48:7805:111:e875:efaf:ff08:75")
+      expect(plugin[:rackspace][:local_hostname]).to eq("katie")
+      expect(plugin[:rackspace][:public_hostname]).to eq("1.2.3.4")
     end
 
-    it "should capture region information" do
+    it "captures region information" do
       provider_data = <<-OUT
 provider = "Rackspace"
 service_type = "cloudServers"
@@ -131,21 +139,53 @@ server_id = "21301000"
 created_at = "2012-12-06T22:08:16Z"
 region = "dfw"
 OUT
-      allow(@plugin).to receive(:shell_out).with("xenstore-ls vm-data/provider_data").and_return(mock_shell_out(0, provider_data, ""))
-      @plugin.run
-      expect(@plugin[:rackspace][:region]).to eq("dfw")
+      allow(plugin).to receive(:shell_out).with("xenstore-ls vm-data/provider_data").and_return(mock_shell_out(0, provider_data, ""))
+      plugin.run
+      expect(plugin[:rackspace][:region]).to eq("dfw")
+    end
+
+    it "logs a debug message when region info cannot be collected" do
+      expect(plugin).
+        to receive(:shell_out).
+        with("xenstore-ls vm-data/provider_data").
+        and_raise(Ohai::Exceptions::Exec)
+
+      expect(Ohai::Log).
+        to receive(:debug).
+        with("rackspace plugin: Unable to find xenstore-ls, cannot capture " \
+             "region information for Rackspace cloud")
+
+      plugin.run
+
+      expect(plugin[:rackspace]).not_to have_key(:region)
     end
 
-    it "should capture instance ID information" do
+    it "captures instance ID information" do
       provider_data = "instance-xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-      allow(@plugin).to receive(:shell_out).with("xenstore-read name").and_return(mock_shell_out(0, provider_data, ""))
-      @plugin.run
-      expect(@plugin[:rackspace][:instance_id]).to eq("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")
+      allow(plugin).to receive(:shell_out).with("xenstore-read name").and_return(mock_shell_out(0, provider_data, ""))
+      plugin.run
+      expect(plugin[:rackspace][:instance_id]).to eq("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")
+    end
+
+    it "logs error if instance id cannot be found" do
+      expect(plugin).
+        to receive(:shell_out).
+        with("xenstore-read name").
+        and_raise(Ohai::Exceptions::Exec)
+
+      expect(Ohai::Log).
+        to receive(:debug).
+        with("rackspace plugin: Unable to find xenstore-read, cannot capture " \
+             "instance ID information for Rackspace cloud")
+
+      plugin.run
+
+      expect(plugin[:rackspace]).not_to have_key(:instance_id)
     end
   end
 
   describe "with rackspace cloud file" do
-    it_should_behave_like "rackspace"
+    it_behaves_like "rackspace"
 
     before(:each) do
       allow(Resolv).to receive(:getname).and_raise(Resolv::ResolvError)
@@ -160,34 +200,34 @@ OUT
     describe "with no public interfaces (empty eth0)" do
       before do
         # unset public (eth0) addresses
-        @plugin[:network][:interfaces][:eth0]["addresses"] = {}
+        plugin[:network][:interfaces][:eth0]["addresses"] = {}
       end
 
-      it "should have all required attributes" do
-        @plugin.run
+      it "has all required attributes" do
+        plugin.run
         # expliticly nil
-        expect(@plugin[:rackspace][:public_ip]).to be_nil
-        expect(@plugin[:rackspace][:public_ipv4]).to be_nil
-        expect(@plugin[:rackspace][:public_ipv6]).to be_nil
-        expect(@plugin[:rackspace][:public_hostname]).to be_nil
+        expect(plugin[:rackspace][:public_ip]).to be_nil
+        expect(plugin[:rackspace][:public_ipv4]).to be_nil
+        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
+        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 "should have 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")
+      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")
       end
     end
   end
 
   describe "without cloud file" do
-    it_should_behave_like "!rackspace"
+    it_behaves_like "!rackspace"
 
     before(:each) do
       allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(false)
@@ -196,7 +236,7 @@ OUT
   end
 
   describe "with ec2 cloud file" do
-    it_should_behave_like "!rackspace"
+    it_behaves_like "!rackspace"
 
     before(:each) do
       allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(true)
@@ -210,29 +250,60 @@ OUT
   end
 
   describe "xenstore provider returns rackspace" do
-    it_should_behave_like "rackspace"
+    it_behaves_like "rackspace"
 
     before(:each) do
       stdout = "Rackspace\n"
-      allow(@plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
+      allow(plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
   end
 
   describe "xenstore provider does not return rackspace" do
-    it_should_behave_like "!rackspace"
+    it_behaves_like "!rackspace"
 
     before(:each) do
       stdout = "cumulonimbus\n"
-      allow(@plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
+      allow(plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
+    end
+  end
+
+  describe "xenstore provider does not exist" do
+    it_behaves_like "!rackspace"
+
+    before(:each) do
+      allow(plugin).
+        to receive(:shell_out).
+        with("xenstore-read vm-data/provider_data/provider").
+        and_raise(Ohai::Exceptions::Exec)
+    end
+  end
+
+  describe "when private networks shell out fails" do
+    it "logs an error and does not collect private_networks" do
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
+
+      expect(plugin).
+        to receive(:shell_out).
+        with("xenstore-ls vm-data/networking").
+        and_raise(Ohai::Exceptions::Exec)
+
+      expect(Ohai::Log).
+        to receive(:debug).
+        with("rackspace plugin: Unable to capture custom private networking " \
+             "information for Rackspace cloud")
+
+      plugin.run
+
+      expect(plugin[:rackspace]).not_to have_key(:private_networks)
     end
   end
 
   describe "does not have private networks" do
     before do
       stdout = 'BC764E20422B = "{"label": "public"}"\n'
-      allow(@plugin).to receive(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
+      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(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("")
@@ -240,33 +311,35 @@ OUT
       allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return("")
     end
 
-    it "should not have private_networks object" do
-      @plugin.run
-      expect(@plugin[:rackspace][:private_networks]).to eq([])
+    it "does not have private_networks object" do
+      plugin.run
+      expect(plugin[:rackspace][:private_networks]).to eq([])
     end
   end
 
   describe "has private networks" do
     before do
-      @plugin[:network][:interfaces][:eth2] = { :addresses => {
-        "fe80::be76:4eff:fe20:422b" => {
-          "scope" => "Link",
-          "prefixlen" => "64",
-          "family" => "inet6",
-       },
-        "9.10.11.12" => {
-          "broadcast" => "9.10.11.255",
-          "netmask" => "255.255.255.0",
-          "family" => "inet",
-        },
-        "BC:76:4E:20:42:2B" => {
-          "family" => "lladdr"
+      plugin[:network][:interfaces][:eth2] = {
+        :addresses => {
+          "fe80::be76:4eff:fe20:422b" => {
+            "scope" => "Link",
+            "prefixlen" => "64",
+            "family" => "inet6",
+         },
+          "9.10.11.12" => {
+            "broadcast" => "9.10.11.255",
+            "netmask" => "255.255.255.0",
+            "family" => "inet",
+          },
+          "BC:76:4E:20:42:2B" => {
+            "family" => "lladdr",
+          },
         },
-      } }
+      }
       stdout = 'BC764E20422B = "{"label": "private-network"}"\n'
-      allow(@plugin).to receive(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
+      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(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("")
@@ -274,16 +347,16 @@ OUT
       allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return("")
     end
 
-    it "should private_networks object" do
-      @plugin.run
-      expect(@plugin[:rackspace][:private_networks]).not_to be_nil
+    it "has private_networks object" do
+      plugin.run
+      expect(plugin[:rackspace][:private_networks]).not_to be_nil
     end
 
-    it "should have correct values for all 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")
-      expect(@plugin[:rackspace][:private_networks][0][:mac]).to eq("BC:76:4E:20:42:2B")
+    it "has correct values for all 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")
+      expect(plugin[:rackspace][:private_networks][0][:mac]).to eq("BC:76:4E:20:42:2B")
     end
 
   end