ohai 8.10.0 → 8.11.1

data/spec/unit/plugins/darwin/platform_spec.rb

@@ -16,8 +16,7 @@
 # limitations under the License.
 #
 
-
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "Darwin plugin platform" do
   before(:each) do

data/spec/unit/plugins/darwin/system_profiler_spec.rb

@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 require File.expand_path("#{File.dirname(__FILE__)}/system_profiler_output.rb")
 
 begin
-  require 'plist'
+  require "plist"
 rescue LoadError => e
   puts "The darwin systemprofile plugin spec tests will fail without the 'plist' library/gem.\n\n"
   raise e
@@ -42,6 +42,6 @@ describe Ohai::System, "Darwin system_profiler plugin", :unix_only do
     allow(@plugin).to receive(:shell_out).with(full_cmd).and_return(mock_shell_out(0, SystemProfilerOutput::Full, ""))
     allow(@plugin).to receive(:shell_out).with(mini_cmd).and_return(mock_shell_out(0, SystemProfilerOutput::Mini, ""))
     @plugin.run
-    expect(@plugin['system_profile'][18]["_items"][0]["serial_number"]).to eq('ABCDEFG12345')
+    expect(@plugin["system_profile"][18]["_items"][0]["serial_number"]).to eq("ABCDEFG12345")
   end
 end

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

@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "Darwin virtualization platform" do
-  let(:plugin) { get_plugin("darwin/virtualization")}
+  let(:plugin) { get_plugin("darwin/virtualization") }
 
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:darwin)
@@ -38,12 +38,12 @@ describe Ohai::System, "Darwin virtualization platform" do
     it "should not set parallels host if /usr/bin/prlctl not exist" do
       allow(plugin).to receive(:prlctl_exists?).and_return(false)
       plugin.run
-      expect(plugin[:virtualization]).to eq({'systems' => {}})
+      expect(plugin[:virtualization]).to eq({ "systems" => {} })
     end
 
     it "should set parallels guest if /usr/sbin/ioreg exists and it's output contains pci1ab8,4000" do
       allow(plugin).to receive(:ioreg_exists?).and_return(true)
-      ioreg=<<-IOREG
+      ioreg = <<-IOREG
     | |   +-o pci1ab8,4000@3  <class IOPCIDevice, id 0x1000001d1, registered, matched, active, busy 0 (40 ms), retain 9>
     | |   | | {
     | |   | |   "compatible" = <"pci1ab8,400","pci1ab8,4000","pciclass,ff0000">
@@ -77,7 +77,7 @@ describe Ohai::System, "Darwin virtualization platform" do
 
     it "should not set parallels guest if /usr/sbin/ioreg exists and it's output not contain pci1ab8,4000" do
       allow(plugin).to receive(:ioreg_exists?).and_return(true)
-      ioreg=<<-IOREG
+      ioreg = <<-IOREG
     | |   +-o pci8086,2445@1F,4  <class IOPCIDevice, id 0x1000001d4, registered, matched, active, busy 0 (974 ms), retain 11>
     | |     | {
     | |     |   "compatible" = <"pci1ab8,400","pci8086,2445","pciclass,040100">
@@ -103,7 +103,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       allow(shellout).to receive(:stdout).and_return(ioreg)
       allow(plugin).to receive(:shell_out).with("ioreg -l").and_return(shellout)
       plugin.run
-      expect(plugin[:virtualization]).to eq({'systems' => {}})
+      expect(plugin[:virtualization]).to eq({ "systems" => {} })
     end
   end
 end

data/spec/unit/plugins/digital_ocean_spec.rb

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'ipaddress'
-require 'spec_helper'
+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_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(:digitalocean_path) { "/etc/digitalocean" }
   let(:hint) {
     '{
       "droplet_id": 12345678,
@@ -39,13 +39,16 @@ describe Ohai::System, "plugin digital_ocean" do
   before do
     @plugin = get_plugin("digital_ocean")
     @plugin[:network] = {
-      "interfaces"=> {
-        "eth0"=> {
-          "addresses"=> {
-            "1.2.3.4"=> {
-              "netmask"=> "255.255.255.0"
+      "interfaces" => {
+        "eth0" => {
+          "addresses" => {
+            "00:D3:AD:B3:3F:00" => {
+              "family" => "lladdr"
             },
-            "2400:6180:0000:00d0:0000:0000:0009:7001"=> {}
+            "1.2.3.4" => {
+              "netmask" => "255.255.255.0"
+            },
+            "2400:6180:0000:00d0:0000:0000:0009:7001" => {},
           }
         }
       }
@@ -57,8 +60,7 @@ describe Ohai::System, "plugin digital_ocean" do
     allow(File).to receive(:read).with(hint_path_win).and_return(hint)
   end
 
-
-  shared_examples_for "!digital_ocean"  do
+  shared_examples_for "!digital_ocean" do
     before(:each) do
       @plugin.run
     end
@@ -74,12 +76,12 @@ describe Ohai::System, "plugin digital_ocean" do
     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}])
+      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
 
@@ -112,7 +114,7 @@ describe Ohai::System, "plugin digital_ocean" do
       expect(@plugin[:digital_ocean][:region_id]).to eq(4)
     end
 
-    include_examples 'digital_ocean_networking'
+    include_examples "digital_ocean_networking"
   end
 
   describe "with digital_ocean hint file" do
@@ -128,11 +130,11 @@ describe Ohai::System, "plugin digital_ocean" do
     context "with private networking enabled" do
       before do
         @plugin[:network][:interfaces][:eth1] = {
-          "addresses"=> {
+          "addresses" => {
             "10.128.142.89" => {
               "netmask" => "255.255.255.0"
             },
-            "fdf8:f53b:82e4:0000:0000:0000:0000:0053" => {}
+            "fdf8:f53b:82e4:0000:0000:0000:0000:0053" => {},
           }
         }
 
@@ -140,18 +142,18 @@ describe Ohai::System, "plugin digital_ocean" do
       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}])
+        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
@@ -162,7 +164,6 @@ describe Ohai::System, "plugin digital_ocean" do
       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)
@@ -180,7 +181,7 @@ describe Ohai::System, "plugin digital_ocean" do
   end
 
   context "with ec2 hint file" do
-    let(:ec2_hint_path_nix) { '/etc/chef/ohai/hints/ec2.json' }
+    let(:ec2_hint_path_nix) { "/etc/chef/ohai/hints/ec2.json" }
     let(:ec2_hint_path_win) { 'C:\chef\ohai\hints/ec2.json' }
 
     before do
@@ -188,9 +189,9 @@ describe Ohai::System, "plugin digital_ocean" do
       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(: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('')
+      allow(File).to receive(:read).with(ec2_hint_path_win).and_return("")
     end
 
     describe "with the /etc/digitalocean file" do

data/spec/unit/plugins/dmi_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
 # NOTE: These data lines must be prefixed with one or two tabs, not spaces.
 DMI_OUT = <<-EOS

data/spec/unit/plugins/ec2_spec.rb

@@ -17,21 +17,24 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-require 'open-uri'
-require 'base64'
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require "open-uri"
+require "base64"
 
 describe Ohai::System, "plugin ec2" do
   before(:each) do
     @plugin = get_plugin("ec2")
-    @plugin[:network] = {:interfaces => {:eth0 => {} } }
-    allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(false)
+    @plugin[:network] = { :interfaces => { :eth0 => {} } }
+    allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(false)
     allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
+    allow(File).to receive(:exist?).with("/usr/bin/ec2metadata").and_return(false)
+    allow(File).to receive(:exist?).with("/usr/bin/rackspace-monitoring-agent").and_return(false)
   end
 
   shared_examples_for "!ec2" do
-    it "should NOT attempt to fetch the ec2 metadata" do
+    it "should NOT attempt to fetch the ec2 metadata or set ec2 attribute" do
       expect(@plugin).not_to receive(:http_client)
+      expect(@plugin[:ec2]).to be_nil
       @plugin.run
     end
   end
@@ -40,61 +43,61 @@ describe Ohai::System, "plugin ec2" do
     before(:each) do
       @http_client = double("Net::HTTP client")
       allow(@plugin).to receive(:http_client).and_return(@http_client)
-      allow(IO).to receive(:select).and_return([[],[1],[]])
+      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)
       expect(@http_client).to receive(:get).
         with("/").twice.
         and_return(double("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
-      allow(File).to receive(:exist?).and_return(false)
     end
 
-context "with common metadata paths" do
-   let(:paths) do
-     { "meta-data/" => "instance_type\nami_id\nsecurity-groups",
-       "meta-data/instance_type" => "c1.medium",
-       "meta-data/ami_id" => "ami-5d2dc934",
-       "meta-data/security-groups" => "group1\ngroup2"
-     }
-   end
-    it "recursively fetches all the ec2 metadata" do
-      paths.each do |name,body|
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/#{name}").
-          and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+    context "with common metadata paths" do
+      let(:paths) do
+        { "meta-data/" => "instance_type\nami_id\nsecurity-groups",
+          "meta-data/instance_type" => "c1.medium",
+          "meta-data/ami_id" => "ami-5d2dc934",
+          "meta-data/security-groups" => "group1\ngroup2",
+        }
       end
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/user-data/").
-        and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
 
-      @plugin.run
+      it "recursively fetches all the ec2 metadata" do
+        paths.each do |name, body|
+          expect(@http_client).to receive(:get).
+            with("/2012-01-12/#{name}").
+            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+        end
+        expect(@http_client).to receive(:get).
+          with("/2012-01-12/user-data/").
+          and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
 
-      expect(@plugin[:ec2]).not_to be_nil
-      expect(@plugin[:ec2]['instance_type']).to eq("c1.medium")
-      expect(@plugin[:ec2]['ami_id']).to eq("ami-5d2dc934")
-      expect(@plugin[:ec2]['security_groups']).to eql ['group1', 'group2']
-    end
+        @plugin.run
 
-    it "fetches binary userdata opaquely" do
-      paths.each do |name,body|
-        expect(@http_client).to receive(:get).
-          with("/2012-01-12/#{name}").
-          and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+        expect(@plugin[:ec2]).not_to be_nil
+        expect(@plugin[:ec2]["instance_type"]).to eq("c1.medium")
+        expect(@plugin[:ec2]["ami_id"]).to eq("ami-5d2dc934")
+        expect(@plugin[:ec2]["security_groups"]).to eql %w{group1 group2}
       end
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/user-data/").
-        and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
 
-      @plugin.run
+      it "fetches binary userdata opaquely" do
+        paths.each do |name, body|
+          expect(@http_client).to receive(:get).
+            with("/2012-01-12/#{name}").
+            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+        end
+        expect(@http_client).to receive(:get).
+          with("/2012-01-12/user-data/").
+          and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
 
-      expect(@plugin[:ec2]).not_to be_nil
-      expect(@plugin[:ec2]['instance_type']).to eq("c1.medium")
-      expect(@plugin[:ec2]['ami_id']).to eq("ami-5d2dc934")
-      expect(@plugin[:ec2]['security_groups']).to eql ['group1', 'group2']
-      expect(@plugin[:ec2]['userdata']).to eq(Base64.decode64("Xl88OEI+XkheSDxDNz5VXkBeQ3NvbWV0aGluZ15AS1Q8Qzg+PEM5PiwpPEM5\nPklVKEktLkk8Q0I+PENDPkk8RTU+XkJeQF5RejxCRj48QjA+XlJeQF5AXkA="))
+        @plugin.run
+
+        expect(@plugin[:ec2]).not_to be_nil
+        expect(@plugin[:ec2]["instance_type"]).to eq("c1.medium")
+        expect(@plugin[:ec2]["ami_id"]).to eq("ami-5d2dc934")
+        expect(@plugin[:ec2]["security_groups"]).to eql %w{group1 group2}
+        expect(@plugin[:ec2]["userdata"]).to eq(Base64.decode64("Xl88OEI+XkheSDxDNz5VXkBeQ3NvbWV0aGluZ15AS1Q8Qzg+PEM5PiwpPEM5\nPklVKEktLkk8Q0I+PENDPkk8RTU+XkJeQF5RejxCRj48QjA+XlJeQF5AXkA="))
+      end
     end
-end
 
     it "should parse ec2 network/ directory as a multi-level hash" do
       expect(@http_client).to receive(:get).
@@ -122,17 +125,17 @@ end
       @plugin.run
 
       expect(@plugin[:ec2]).not_to be_nil
-      expect(@plugin[:ec2]['network_interfaces_macs']['12:34:56:78:9a:bc']['public_hostname']).to eql('server17.opscode.com')
-    end
+      expect(@plugin[:ec2]["network_interfaces_macs"]["12:34:56:78:9a:bc"]["public_hostname"]).to eql("server17.opscode.com")
+    end # context with common metadata paths
 
-    context "with ec2_iam cloud file" do
+    context "with ec2_iam hint file" do
       before do
         if windows?
           allow(File).to receive(:exist?).with('C:\chef\ohai\hints/iam.json').and_return(true)
-          allow(File).to receive(:read).with('C:\chef\ohai\hints/iam.json').and_return('')
+          allow(File).to receive(:read).with('C:\chef\ohai\hints/iam.json').and_return("")
         else
-          allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/iam.json').and_return(true)
-          allow(File).to receive(:read).with('/etc/chef/ohai/hints/iam.json').and_return('')
+          allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/iam.json").and_return(true)
+          allow(File).to receive(:read).with("/etc/chef/ohai/hints/iam.json").and_return("")
         end
       end
 
@@ -156,17 +159,17 @@ end
         @plugin.run
 
         expect(@plugin[:ec2]).not_to be_nil
-        expect(@plugin[:ec2]['iam']['security-credentials']['MyRole']['Code']).to eql 'Success'
-        expect(@plugin[:ec2]['iam']['security-credentials']['MyRole']['Token']).to eql '12345678'
+        expect(@plugin[:ec2]["iam"]["security-credentials"]["MyRole"]["Code"]).to eql "Success"
+        expect(@plugin[:ec2]["iam"]["security-credentials"]["MyRole"]["Token"]).to eql "12345678"
       end
     end
 
-    context "without ec2_iam cloud file" do
+    context "without ec2_iam hint file" do
       before do
         if windows?
           allow(File).to receive(:exist?).with('C:\chef\ohai\hints/iam.json').and_return(false)
         else
-          allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/iam.json').and_return(false)
+          allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/iam.json").and_return(false)
         end
       end
 
@@ -190,7 +193,7 @@ end
         @plugin.run
 
         expect(@plugin[:ec2]).not_to be_nil
-        expect(@plugin[:ec2]['iam']).to be_nil
+        expect(@plugin[:ec2]["iam"]).to be_nil
       end
     end
 
@@ -248,78 +251,84 @@ end
       @plugin.run
 
       expect(@plugin[:ec2]).not_to be_nil
-      expect(@plugin[:ec2]['metrics']).to be_nil
-      expect(@plugin[:ec2]['metrics_vhostmd']).to be_nil
+      expect(@plugin[:ec2]["metrics"]).to be_nil
+      expect(@plugin[:ec2]["metrics_vhostmd"]).to be_nil
     end
-  end
-
-  describe "with ec2 mac and metadata address connected" do
-    it_should_behave_like "ec2"
+  end # shared examples for ec2
 
+  describe "without dmi or ec2metadata binary, with xen mac, and metadata address connected" do
     before(:each) do
-      allow(IO).to receive(:select).and_return([[],[1],[]])
-      @plugin[:network][:interfaces][:eth0][:arp] = {"169.254.1.0"=>"fe:ff:ff:ff:ff:ff"}
+      allow(IO).to receive(:select).and_return([[], [1], []])
+      @plugin[:network][:interfaces][:eth0][:arp] = { "169.254.1.0" => "fe:ff:ff:ff:ff:ff" }
     end
-  end
 
-  describe "without ec2 mac and metadata address connected" do
-    it_should_behave_like "!ec2"
+    it_should_behave_like "ec2"
 
-    before(:each) do
-      @plugin[:network][:interfaces][:eth0][:arp] = {"169.254.1.0"=>"00:50:56:c0:00:08"}
+    it "warns that the arp table method is deprecated" do
+      expect(Ohai::Log).to receive(:warn).with(/will be removed/)
+      @plugin.has_xen_mac?
     end
   end
 
-  describe "with ec2 dmi data" do
+  describe "with ec2metadata binary" do
     it_should_behave_like "ec2"
 
     before(:each) do
-      @plugin[:dmi] = { :bios => { :all_records => [  { :Version => "4.2.amazon" } ] } }
+      allow(File).to receive(:exist?).with("/usr/bin/ec2metadata").and_return(true)
     end
   end
 
-  describe "without ec2 dmi data" do
-    it_should_behave_like "!ec2"
+  describe "with ec2 dmi data" do
+    it_should_behave_like "ec2"
 
     before(:each) do
-      @plugin[:dmi] = nil
+      @plugin[:dmi] = { :bios => { :all_records => [ { :Version => "4.2.amazon" } ] } }
     end
   end
 
-  describe "with ec2 cloud file" do
+  describe "with ec2 hint file" do
     it_should_behave_like "ec2"
 
     before(:each) do
       if windows?
         expect(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(:read).with('C:\chef\ohai\hints/ec2.json').and_return("")
       else
-        expect(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('')
+        expect(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("")
       end
     end
   end
 
-  describe "without cloud file" do
+  describe "with rackspace hint file" do
     it_should_behave_like "!ec2"
 
     before(:each) do
-      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
+      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
   end
 
-  describe "with rackspace cloud file" do
+  describe "with ec2metadata, but with rackspace-monitoring-agent" do
     it_should_behave_like "!ec2"
 
     before(:each) do
-      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
+      allow(File).to receive(:exist?).with("/usr/bin/ec2metadata").and_return(true)
+      allow(File).to receive(:exist?).with("/usr/bin/rackspace-monitoring-agent").and_return(true)
+    end
+  end
 
-      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('')
+  describe "without any hints that it is an ec2 system" do
+    it_should_behave_like "!ec2"
+
+    before(:each) do
+      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/ec2.json").and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
+      allow(File).to receive(:exist?).with("/usr/bin/ec2metadata").and_return(false)
+      @plugin[:dmi] = nil
+      @plugin[:network][:interfaces][:eth0][:arp] = { "169.254.1.0" => "00:50:56:c0:00:08" }
     end
   end