ohai 6.24.2 → 7.0.0.rc.0

data/spec/unit/plugins/mono_spec.rb

@@ -22,32 +22,27 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_he
 describe Ohai::System, "plugin mono" do
 
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:languages] = Mash.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @status = 0
+    @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"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"mono -V"}).and_return([@status, @stdout, @stderr])
+    @plugin.stub(:shell_out).with("mono -V").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should get the mono version from running mono -V" do
-    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"mono -V"}).and_return([0, "Mono JIT compiler version 1.2.6 (tarball)\nCopyright (C) 2002-2007 Novell, Inc and Contributors. www.mono-project.com\n", ""])
-    @ohai._require_plugin("mono")
+    @plugin.should_receive(:shell_out).with("mono -V").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
   end
 
   it "should set languages[:mono][:version]" do
-    @ohai._require_plugin("mono")
-    @ohai.languages[:mono][:version].should eql("1.2.6")
+    @plugin.run
+    @plugin.languages[:mono][:version].should eql("1.2.6")
   end
 
   it "should not set the languages[:mono] tree up if mono command fails" do
-    @status = 1
     @stdout = "Mono JIT compiler version 1.2.6 (tarball)\nCopyright (C) 2002-2007 Novell, Inc and Contributors. www.mono-project.com\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"mono -V"}).and_return([@status, @stdout, @stderr])
-    @ohai._require_plugin("mono")
-    @ohai.languages.should_not have_key(:mono)
+    @plugin.stub(:shell_out).with("mono -V").and_return(mock_shell_out(1, @stdout, ""))
+    @plugin.run
+    @plugin.languages.should_not have_key(:mono)
   end
 
 end

data/spec/unit/plugins/netbsd/hostname_spec.rb

@@ -21,14 +21,24 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "NetBSD hostname plugin" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = "netbsd"
-    @ohai.stub!(:from).with("hostname -s").and_return("katie")
-    @ohai.stub!(:from).with("hostname").and_return("katie.bethell")
+    @plugin = get_plugin("hostname")
+    @plugin.stub(:collect_os).and_return(:netbsd)
+    @plugin.stub(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie\n", ""))
+    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
+    @plugin.stub(:resolve_fqdn).and_return("katie.bethell")
   end
 
-  it_should_check_from("netbsd::hostname", "hostname", "hostname -s", "katie")
+  it_should_check_from("linux::hostname", "hostname", "hostname -s", "katie")
 
-  it_should_check_from("netbsd::hostname", "fqdn", "hostname", "katie.bethell")
+  it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
+
+  it "should use #resolve_fqdn to find the fqdn" do
+    @plugin.run
+    @plugin[:fqdn].should == "katie.bethell"
+  end
+
+  it "should set the domain to everything after the first dot of the fqdn" do
+    @plugin.run
+    @plugin[:domain].should == "bethell"
+  end
 end

data/spec/unit/plugins/netbsd/kernel_spec.rb

@@ -21,16 +21,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "NetBSD kernel plugin" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai.stub!(:from).with("uname -i").and_return("foo")
-    @ohai.stub!(:from_with_regex).with("sysctl kern.securelevel").and_return("kern.securelevel: 1")
-    @ohai[:kernel] = Mash.new
-    @ohai[:kernel][:name] = "netbsd"
+    @plugin = get_plugin("kernel")
+    @plugin.stub(:collect_os).and_return(:netbsd)
+    @plugin.stub(:init_kernel).and_return({})
+    @plugin.stub(:shell_out).with("uname -i").and_return(mock_shell_out(0, "foo", ""))
+    @plugin.stub(:shell_out).with("sysctl kern.securelevel").and_return(mock_shell_out(0, "kern.securelevel: 1\n", ""))
+    @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/usr/bin/modstat" )}").and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
   end
 
   it "should set the kernel_os to the kernel_name value" do
-    @ohai._require_plugin("netbsd::kernel")
-    @ohai[:kernel][:os].should == @ohai[:kernel][:name]
+    @plugin.run
+    @plugin[:kernel][:os].should == @plugin[:kernel][:name]
   end
 end

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

@@ -16,25 +16,23 @@
 # limitations under the License.
 #
 
-
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "NetBSD plugin platform" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai.stub!(:from).with("uname -s").and_return("NetBSD")
-    @ohai.stub!(:from).with("uname -r").and_return("4.5")
-    @ohai[:os] = "netbsd"
+    @plugin = get_plugin("netbsd/platform")
+    @plugin.stub(:shell_out).with("uname -s").and_return(mock_shell_out(0, "NetBSD\n", ""))
+    @plugin.stub(:shell_out).with("uname -r").and_return(mock_shell_out(0, "4.5\n", ""))
+    @plugin.stub(:collect_os).and_return(:netbsd)
   end
 
   it "should set platform to lowercased lsb[:id]" do
-    @ohai._require_plugin("netbsd::platform")
-    @ohai[:platform].should == "netbsd"
+    @plugin.run
+    @plugin[:platform].should == "netbsd"
   end
 
   it "should set platform_version to lsb[:release]" do
-    @ohai._require_plugin("netbsd::platform")
-    @ohai[:platform_version].should == "4.5"
+    @plugin.run
+    @plugin[:platform_version].should == "4.5"
   end
 end

data/spec/unit/plugins/network_spec.rb

@@ -20,11 +20,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 def it_does_not_fail
   it "doesn't fail" do
-    Ohai::Log.should_receive(:warn).any_number_of_times
+    Ohai::Log.stub(:warn)
     Ohai::Log.should_not_receive(:debug).with(/^Plugin network threw exception/)
-    @ohai._require_plugin("network")
-    %w[ ipaddress, macaddress, ip6address ].each do |attribute|
-      @ohai.should have_key(attribute)
+    @plugin.run
+    %w{ ipaddress macaddress ip6address }.each do |attribute|
+      @plugin.should have_key(attribute)
     end
   end
 end
@@ -32,6 +32,143 @@ end
 describe Ohai::System, "Network Plugin" do
 
   basic_data = {
+    "freebsd" => {
+      "network" => {
+        "interfaces" => {
+          "vr0" => {
+            "type" => "vr",
+            "number" => "0",
+            "flags" => ["UP", "BROADCAST", "RUNNING", "SIMPLEX", "MULTICAST"],
+            "addresses" => {
+              "00:00:24:c9:5e:b8" => {"family" => "lladdr"},
+              "fe80::200:24ff:fec9:5eb8" => {
+                "family" => "inet6",
+                "zoneid" => "vr0",
+                "prefixlen" => "64",
+                "scopeid" => "0x1"
+              },
+              "76.91.1.255" => {
+                "family" => "inet",
+                "netmask" => "255.255.252.0",
+                "broadcast" => "255.255.255.255"
+              }
+            },
+            "arp" => {
+              "76.91.1.255" => "00:00:24:c9:5e:b8",
+              "76.91.0.1" => "00:01:5c:24:8c:01"
+            }
+          },
+          "vr1" => {
+            "type" => "vr",
+            "number" => "1",
+            "flags" => ["UP", "BROADCAST", "RUNNING", "PROMISC", "SIMPLEX", "MULTICAST"],
+            "addresses" => {
+              "00:00:24:c9:5e:b9" => {"family" => "lladdr"},
+              "fe80::200:24ff:fec9:5eb9" => {
+                "family" => "inet6",
+                "zoneid" => "vr1",
+                "prefixlen" => "64",
+                "scopeid" => "0x2"
+              }
+            }
+          },
+          "vr2" => {
+            "type" => "vr",
+            "number" => "2",
+            "flags" => ["UP", "BROADCAST", "RUNNING", "PROMISC", "SIMPLEX", "MULTICAST"],
+            "addresses" => {
+              "00:00:24:c9:5e:ba" => {"family" => "lladdr"},
+              "fe80::200:24ff:fec9:5eba" => {
+                "family" => "inet6",
+                "zoneid" => "vr2",
+                "prefixlen" => "64",
+                "scopeid" => "0x3"
+              }
+            }
+          },
+          "vr3" => {
+            "type" => "vr",
+            "number" => "3",
+            "flags" => ["UP", "BROADCAST", "RUNNING", "PROMISC", "SIMPLEX", "MULTICAST"],
+            "addresses" => {
+              "00:00:24:c9:5e:bb" => {"family" => "lladdr"},
+              "fe80::200:24ff:fec9:5ebb" => {
+                "family" => "inet6",
+                "zoneid" => "vr3",
+                "prefixlen" => "64",
+                "scopeid" => "0x4"
+              }
+            }
+          },
+          "ipfw0" => {
+            # OHAI-492: Ensure network plugin works with interfaces without addresses.
+            "type" => "ipfw",
+            "number" => "0",
+            "flags" => ["UP", "SIMPLEX", "MULTICAST"]
+          },
+          "lo0" => {
+            "type" => "lo",
+            "number" => "0",
+            "flags" => ["UP", "LOOPBACK", "RUNNING", "MULTICAST"],
+            "addresses" => {
+              "127.0.0.1" => {"family" => "inet", "netmask" => "255.0.0.0"},
+              "::1" => {"family" => "inet6", "prefixlen" => "128"},
+              "fe80::1" => {
+                "family" => "inet6",
+                "zoneid" => "lo0",
+                "prefixlen" => "64",
+                "scopeid" => "0x8"
+              }
+            }
+          },
+          "bridge0" => {
+            "type" => "bridge",
+            "number" => "0",
+            "flags" => ["LEARNING", "DISCOVER", "AUTOEDGE", "AUTOPTP"],
+            "addresses" => {
+              "02:20:6f:d2:c4:00" => {"family"=>"lladdr"},
+              "192.168.2.1" => {
+                "family" => "inet",
+                "netmask" => "255.255.255.0",
+                "broadcast" => "192.168.2.255"
+              },
+              "2001:470:d:cb4::1" => {"family" => "inet6", "prefixlen" => "64"},
+              "fe80::cafe:babe:dead:beef" => {
+                "family" => "inet6",
+                "zoneid" => "bridge0",
+                "prefixlen" => "64",
+                "scopeid" => "0x9"
+              }
+            },
+            "arp" => {
+              "192.168.2.142" => "60:67:20:75:a2:0c",
+              "192.168.2.205" => "c0:c1:c0:f9:40:ed",
+              "192.168.2.160" => "cc:3a:61:cf:67:13",
+              "192.168.2.1" => "02:20:6f:d2:c4:00",
+              "192.168.2.135" => "f8:0c:f3:d7:c6:b6",
+              "192.168.2.165" => "f8:8f:ca:24:49:ad",
+              "192.168.2.158" => "48:5d:60:1f:ea:d1",
+              "192.168.2.150" => "60:a4:4c:60:b3:d9"
+            }
+          },
+          "gif0" => {
+            "type" => "gif",
+            "number" => "0",
+            "flags" => ["UP", "POINTOPOINT", "RUNNING", "MULTICAST"],
+            "addresses" => {
+              "fe80::200:24ff:fec9:5eb8" => {
+                "family" => "inet6",
+                "zoneid" => "gif0",
+                "prefixlen" => "64",
+                "scopeid" => "0xa"
+              }
+            }
+          }
+        },
+        "default_gateway" => "76.91.0.1",
+        "default_interface" => "vr0"
+      }
+    },
     "linux" => {
       "network" => {
         # pp Hash[node['network']] from  shef to get the network data
@@ -149,84 +286,76 @@ describe Ohai::System, "Network Plugin" do
 
   describe "with linux" do
     before(:each) do
-      @ohai = Ohai::System.new
-      @ohai.stub!(:require_plugin).twice.and_return(true)
-      @ohai["network"] = basic_data["linux"]["network"]
+      @plugin = get_plugin("network")
+      @plugin["network"] = basic_data["linux"]["network"]
     end
 
     describe "when the linux::network plugin hasn't set any of {ip,ip6,mac}address attributes" do
       describe "simple setup" do
         it_does_not_fail
 
-        it "logs 2 debug messages" do
-          Ohai::Log.should_receive(:debug).with(/^Loading plugin network/).once
-          Ohai::Log.should_receive(:debug).with(/^\[inet\] Using default/).once
-          Ohai::Log.should_receive(:debug).with(/^\[inet6\] Using default/).once
-          @ohai._require_plugin("network")
-        end
-
         it "detects {ip,ip6,mac}address" do
-          @ohai._require_plugin("network")
-          @ohai["ipaddress"].should == "192.168.66.33"
-          @ohai["macaddress"].should == "00:16:3E:2F:36:79"
-          @ohai["ip6address"].should == "3ffe:1111:2222::33"
+          @plugin.run
+          @plugin["ipaddress"].should == "192.168.66.33"
+          @plugin["macaddress"].should == "00:16:3E:2F:36:79"
+          @plugin["ip6address"].should == "3ffe:1111:2222::33"
         end
       end
 
       describe "default ipv4 and ipv6 gateway on different interfaces" do
         describe "both interfaces have an ARP" do
           before do
-            @ohai["network"]["default_inet6_gateway"] = "3ffe:1111:3333::"
-            @ohai["network"]["default_inet6_interface"] = "eth1"
+            @plugin["network"]["default_inet6_gateway"] = "3ffe:1111:3333::"
+            @plugin["network"]["default_inet6_interface"] = "eth1"
           end
 
           it_does_not_fail
 
           it "detects {ip,ip6}address" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.66.33"
-            @ohai["ip6address"].should == "3ffe:1111:3333::1"
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.66.33"
+            @plugin["ip6address"].should == "3ffe:1111:3333::1"
           end
 
           it "set macaddress from the ipv4 setup" do
-            @ohai._require_plugin("network")
-            @ohai["macaddress"].should == "00:16:3E:2F:36:79"
+            @plugin.run
+            @plugin["macaddress"].should == "00:16:3E:2F:36:79"
           end
 
           it "informs about this setup" do
             Ohai::Log.should_receive(:debug).with(/^ipaddress and ip6address are set from different interfaces/)
-            Ohai::Log.should_receive(:debug).any_number_of_times
-            @ohai._require_plugin("network")
+            Ohai::Log.stub(:debug)
+            @plugin.run
           end
         end
 
         describe "ipv4 interface has no ARP" do
           before do
-            @ohai["network"]["interfaces"]["eth0"]["addresses"].delete_if{|k,kv| kv["family"] == "lladdr" }
+            @plugin["network"]["interfaces"]["eth0"]["addresses"].delete_if{|k,kv| kv["family"] == "lladdr" }
             # not really checked by this pluging
-            @ohai["network"]["interfaces"]["eth0"]["flags"] << "NOARP"
-            @ohai["network"]["default_inet6_gateway"] = "3ffe:1111:3333::"
-            @ohai["network"]["default_inet6_interface"] = "eth1"
+            @plugin["network"]["interfaces"]["eth0"]["flags"] << "NOARP"
+            @plugin["network"]["default_inet6_gateway"] = "3ffe:1111:3333::"
+            @plugin["network"]["default_inet6_interface"] = "eth1"
           end
 
           it_does_not_fail
 
           it "detects {ip,ip6}address" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.66.33"
-            @ohai["ip6address"].should == "3ffe:1111:3333::1"
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.66.33"
+            @plugin["ip6address"].should == "3ffe:1111:3333::1"
           end
 
           it "doesn't set macaddress, ipv4 setup is valid and has precedence over ipv6" do
             Ohai::Log.should_not_receive(:warn).with(/^unable to detect macaddress/)
-            @ohai._require_plugin("network")
-            @ohai["macaddress"].should be_nil
+            @plugin.run
+            @plugin["macaddress"].should be_nil
           end
 
           it "informs about this setup" do
             Ohai::Log.should_receive(:debug).with(/^ipaddress and ip6address are set from different interfaces/)
-            Ohai::Log.should_receive(:debug).any_number_of_times
-            @ohai._require_plugin("network")
+            Ohai::Log.stub(:debug)
+            @plugin.run
           end
         end
       end
@@ -234,61 +363,56 @@ describe Ohai::System, "Network Plugin" do
       describe "conflicting results from the linux::network plugin" do
         describe "default interface doesn't match the default_gateway" do
           before do
-            @ohai["network"]["default_interface"] = "eth1"
-            @ohai["network"]["default_inet6_interface"] = "eth1"
+            @plugin["network"]["default_interface"] = "eth1"
+            @plugin["network"]["default_inet6_interface"] = "eth1"
           end
 
           it_does_not_fail
 
           it "picks {ip,ip6,mac}address" do
-            Ohai::Log.should_receive(:warn).any_number_of_times
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.99.11"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:80"
-            @ohai["ip6address"].should == "3ffe:1111:3333::1"
+            Ohai::Log.stub(:warn)
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.99.11"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:80"
+            @plugin["ip6address"].should == "3ffe:1111:3333::1"
           end
 
           it "warns about this conflict" do
             Ohai::Log.should_receive(:warn).with(/^\[inet\] no ipaddress\/mask on eth1/).once
             Ohai::Log.should_receive(:warn).with(/^\[inet6\] no ipaddress\/mask on eth1/).once
-            @ohai._require_plugin("network")
+            @plugin.run
           end
         end
 
         describe "there's a default gateway, none of the configured ip/mask theorically allows to reach it" do
           before do
-            @ohai["network"]["default_gateway"] = "172.16.12.42"
-            @ohai["network"]["default_inet6_gateway"] = "3ffe:12:42::7070"
+            @plugin["network"]["default_gateway"] = "172.16.12.42"
+            @plugin["network"]["default_inet6_gateway"] = "3ffe:12:42::7070"
           end
 
           it "picks {ip,ip6,mac}address" do
-            Ohai::Log.should_receive(:warn).any_number_of_times
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.66.33"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:79"
-            @ohai["ip6address"].should == "3ffe:1111:2222::33"
+            Ohai::Log.stub(:warn)
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.66.33"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:79"
+            @plugin["ip6address"].should == "3ffe:1111:2222::33"
           end
 
-          it "warns about this conflict" do
-            Ohai::Log.should_receive(:warn).with(/^\[inet\] no ipaddress\/mask on eth0/).once
-            Ohai::Log.should_receive(:warn).with(/^\[inet6\] no ipaddress\/mask on eth0/).once
-            @ohai._require_plugin("network")
-          end
         end
 
         describe "no ip address for the given default interface/gateway" do
           before do
-            @ohai["network"]["interfaces"]["eth0"]["addresses"].delete_if{|k,v| %w[inet inet6].include? v["family"]}
+            @plugin["network"]["interfaces"]["eth0"]["addresses"].delete_if{|k,v| %w[inet inet6].include? v["family"]}
           end
 
           it_does_not_fail
 
           it "doesn't detect {ip,ip6,mac}address" do
-            Ohai::Log.should_receive(:warn).any_number_of_times
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should be_nil
-            @ohai["macaddress"].should be_nil
-            @ohai["ip6address"].should be_nil
+            Ohai::Log.stub(:warn)
+            @plugin.run
+            @plugin["ipaddress"].should be_nil
+            @plugin["macaddress"].should be_nil
+            @plugin["ip6address"].should be_nil
           end
 
           it "warns about this conflict" do
@@ -297,17 +421,17 @@ describe Ohai::System, "Network Plugin" do
             Ohai::Log.should_receive(:warn).with(/^\[inet\] no ip address on eth0/).once
             Ohai::Log.should_receive(:warn).with(/^unable to detect ip6address/).once
             Ohai::Log.should_receive(:warn).with(/^\[inet6\] no ip address on eth0/).once
-            @ohai._require_plugin("network")
+            @plugin.run
           end
         end
 
         describe "no ip at all" do
           before do
-            @ohai["network"]["default_gateway"] = nil
-            @ohai["network"]["default_interface"] = nil
-            @ohai["network"]["default_inet6_gateway"] = nil
-            @ohai["network"]["default_inet6_interface"] = nil
-            @ohai["network"]["interfaces"].each do |i,iv|
+            @plugin["network"]["default_gateway"] = nil
+            @plugin["network"]["default_interface"] = nil
+            @plugin["network"]["default_inet6_gateway"] = nil
+            @plugin["network"]["default_inet6_interface"] = nil
+            @plugin["network"]["interfaces"].each do |i,iv|
               iv["addresses"].delete_if{|k,kv| %w[inet inet6].include? kv["family"]}
             end
           end
@@ -315,18 +439,18 @@ describe Ohai::System, "Network Plugin" do
           it_does_not_fail
 
           it "doesn't detect {ip,ip6,mac}address" do
-            Ohai::Log.should_receive(:warn).any_number_of_times
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should be_nil
-            @ohai["macaddress"].should be_nil
-            @ohai["ip6address"].should be_nil
+            Ohai::Log.stub(:warn)
+            @plugin.run
+            @plugin["ipaddress"].should be_nil
+            @plugin["macaddress"].should be_nil
+            @plugin["ip6address"].should be_nil
           end
 
           it "should warn about it" do
             Ohai::Log.should_receive(:warn).with(/^unable to detect ipaddress/).once
             Ohai::Log.should_receive(:warn).with(/^unable to detect macaddress/).once
             Ohai::Log.should_receive(:warn).with(/^unable to detect ip6address/).once
-            @ohai._require_plugin("network")
+            @plugin.run
           end
         end
       end
@@ -334,7 +458,7 @@ describe Ohai::System, "Network Plugin" do
       describe "several ipaddresses matching the default route" do
         describe "bigger prefix not set on the default interface" do
           before do
-            @ohai["network"]["interfaces"]["eth2"] = {
+            @plugin["network"]["interfaces"]["eth2"] = {
               "flags" => ["BROADCAST", "MULTICAST", "UP"],
               "number" => "2",
               "addresses" => {
@@ -363,23 +487,23 @@ describe Ohai::System, "Network Plugin" do
           it_does_not_fail
 
           it "sets {ip,ip6,mac}address correctly" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.66.33"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:79"
-            @ohai["ip6address"].should == "3ffe:1111:2222::33"
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.66.33"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:79"
+            @plugin["ip6address"].should == "3ffe:1111:2222::33"
           end
         end
 
         describe "bigger prefix set on the default interface" do
           before do
-            @ohai["network"]["interfaces"]["eth0"]["addresses"]["192.168.66.99"] = {
+            @plugin["network"]["interfaces"]["eth0"]["addresses"]["192.168.66.99"] = {
               "scope" => "Global",
               "netmask" => "255.255.255.128",
               "broadcast" => "192.168.66.127",
               "prefixlen" => "25",
               "family" => "inet"
             }
-            @ohai["network"]["interfaces"]["eth0"]["addresses"]["3ffe:1111:2222:0:4444::1"] = {
+            @plugin["network"]["interfaces"]["eth0"]["addresses"]["3ffe:1111:2222:0:4444::1"] = {
               "prefixlen" => "64",
               "family" => "inet6",
               "scope" => "Global"
@@ -389,16 +513,16 @@ describe Ohai::System, "Network Plugin" do
           it_does_not_fail
 
           it "sets {ip,ip6,mac}address correctly" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.66.99"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:79"
-            @ohai["ip6address"].should == "3ffe:1111:2222:0:4444::1"
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.66.99"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:79"
+            @plugin["ip6address"].should == "3ffe:1111:2222:0:4444::1"
           end
         end
 
         describe "smallest ip not set on the default_interface" do
           before do
-            @ohai["network"]["interfaces"]["eth2"] = {
+            @plugin["network"]["interfaces"]["eth2"] = {
               "flags" => ["BROADCAST", "MULTICAST", "UP"],
               "number" => "2",
               "addresses" => {
@@ -427,23 +551,23 @@ describe Ohai::System, "Network Plugin" do
           it_does_not_fail
 
           it "sets {ip,ip6,mac}address correctly" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.66.33"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:79"
-            @ohai["ip6address"].should == "3ffe:1111:2222::33"
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.66.33"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:79"
+            @plugin["ip6address"].should == "3ffe:1111:2222::33"
           end
         end
 
         describe "smallest ip set on the default_interface" do
           before do
-            @ohai["network"]["interfaces"]["eth0"]["addresses"]["192.168.66.32"] = {
+            @plugin["network"]["interfaces"]["eth0"]["addresses"]["192.168.66.32"] = {
               "scope" => "Global",
               "netmask" => "255.255.255.0",
               "broadcast" => "192.168.66.255",
               "prefixlen" => "24",
               "family" => "inet"
             }
-            @ohai["network"]["interfaces"]["eth0"]["addresses"]["3ffe:1111:2222::32"] = {
+            @plugin["network"]["interfaces"]["eth0"]["addresses"]["3ffe:1111:2222::32"] = {
               "prefixlen" => "48",
               "family" => "inet6",
               "scope" => "Global"
@@ -453,10 +577,10 @@ describe Ohai::System, "Network Plugin" do
           it_does_not_fail
 
           it "sets {ip,ip6,mac}address correctly" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.66.32"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:79"
-            @ohai["ip6address"].should == "3ffe:1111:2222::32"
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.66.32"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:79"
+            @plugin["ip6address"].should == "3ffe:1111:2222::32"
           end
         end
       end
@@ -464,12 +588,12 @@ describe Ohai::System, "Network Plugin" do
       describe "no default route" do
         describe "first interface is not the best choice" do
           before do
-            @ohai["network"]["default_gateway"] = nil
-            @ohai["network"]["default_interface"] = nil
-            @ohai["network"]["default_inet6_gateway"] = nil
-            @ohai["network"]["default_inet6_interface"] = nil
+            @plugin["network"]["default_gateway"] = nil
+            @plugin["network"]["default_interface"] = nil
+            @plugin["network"]["default_inet6_gateway"] = nil
+            @plugin["network"]["default_inet6_interface"] = nil
             # removing inet* addresses from eth0, to complicate things a bit
-            @ohai["network"]["interfaces"]["eth0"]["addresses"].delete_if{|k,v| %w[inet inet6].include? v["family"]}
+            @plugin["network"]["interfaces"]["eth0"]["addresses"].delete_if{|k,v| %w[inet inet6].include? v["family"]}
           end
 
           it_does_not_fail
@@ -477,22 +601,22 @@ describe Ohai::System, "Network Plugin" do
           it "picks {ip,mac,ip6}address from the first interface" do
             Ohai::Log.should_receive(:debug).with(/^\[inet\] no default interface/).once
             Ohai::Log.should_receive(:debug).with(/^\[inet6\] no default interface/).once
-            Ohai::Log.should_receive(:debug).any_number_of_times
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.99.11"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:80"
-            @ohai["ip6address"].should == "3ffe:1111:3333::1"
+            Ohai::Log.stub(:debug)
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.99.11"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:80"
+            @plugin["ip6address"].should == "3ffe:1111:3333::1"
           end
         end
 
         describe "can choose from addresses with different scopes" do
           before do
-            @ohai["network"]["default_gateway"] = nil
-            @ohai["network"]["default_interface"] = nil
-            @ohai["network"]["default_inet6_gateway"] = nil
-            @ohai["network"]["default_inet6_interface"] = nil
+            @plugin["network"]["default_gateway"] = nil
+            @plugin["network"]["default_interface"] = nil
+            @plugin["network"]["default_inet6_gateway"] = nil
+            @plugin["network"]["default_inet6_interface"] = nil
             # just changing scopes to lInK for eth0 addresses
-            @ohai["network"]["interfaces"]["eth0"]["addresses"].each{|k,v| v[:scope]="lInK" if %w[inet inet6].include? v["family"]}
+            @plugin["network"]["interfaces"]["eth0"]["addresses"].each{|k,v| v[:scope]="lInK" if %w[inet inet6].include? v["family"]}
           end
 
           it_does_not_fail
@@ -500,11 +624,11 @@ describe Ohai::System, "Network Plugin" do
           it "prefers global scope addressses to set {ip,mac,ip6}address" do
             Ohai::Log.should_receive(:debug).with(/^\[inet\] no default interface/).once
             Ohai::Log.should_receive(:debug).with(/^\[inet6\] no default interface/).once
-            Ohai::Log.should_receive(:debug).any_number_of_times
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.99.11"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:80"
-            @ohai["ip6address"].should == "3ffe:1111:3333::1"
+            Ohai::Log.stub(:debug)
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.99.11"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:80"
+            @plugin["ip6address"].should == "3ffe:1111:3333::1"
           end
         end
       end
@@ -512,36 +636,29 @@ describe Ohai::System, "Network Plugin" do
       describe "link level default route" do
         describe "simple setup" do
           before do
-            @ohai["network"]["default_gateway"] = "0.0.0.0"
-            @ohai["network"]["default_interface"] = "eth1"
-            @ohai["network"]["default_inet6_gateway"] = "::"
-            @ohai["network"]["default_inet6_interface"] = "eth1"
+            @plugin["network"]["default_gateway"] = "0.0.0.0"
+            @plugin["network"]["default_interface"] = "eth1"
+            @plugin["network"]["default_inet6_gateway"] = "::"
+            @plugin["network"]["default_inet6_interface"] = "eth1"
           end
 
           it_does_not_fail
 
-          it "displays debug messages" do
-            Ohai::Log.should_receive(:debug).with(/^Loading plugin network/).once
-            Ohai::Log.should_receive(:debug).with(/^link level default inet /).once
-            Ohai::Log.should_receive(:debug).with(/^link level default inet6 /).once
-            @ohai._require_plugin("network")
-          end
-
           it "picks {ip,mac,ip6}address from the default interface" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.99.11"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:80"
-            @ohai["ip6address"].should == "3ffe:1111:3333::1"
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.99.11"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:80"
+            @plugin["ip6address"].should == "3ffe:1111:3333::1"
           end
         end
 
         describe "can choose from addresses with different scopes" do
           before do
-            @ohai["network"]["default_gateway"] = "0.0.0.0"
-            @ohai["network"]["default_interface"] = "eth1"
-            @ohai["network"]["default_inet6_gateway"] = "::"
-            @ohai["network"]["default_inet6_interface"] = "eth1"
-            @ohai["network"]["interfaces"]["eth1"]["addresses"]["127.0.0.2"] = {
+            @plugin["network"]["default_gateway"] = "0.0.0.0"
+            @plugin["network"]["default_interface"] = "eth1"
+            @plugin["network"]["default_inet6_gateway"] = "::"
+            @plugin["network"]["default_inet6_interface"] = "eth1"
+            @plugin["network"]["interfaces"]["eth1"]["addresses"]["127.0.0.2"] = {
               "scope" => "host",
               "netmask" => "255.255.255.255",
               "prefixlen" => "32",
@@ -551,25 +668,18 @@ describe Ohai::System, "Network Plugin" do
 
           it_does_not_fail
 
-          it "displays debug messages" do
-            Ohai::Log.should_receive(:debug).with(/^Loading plugin network/).once
-            Ohai::Log.should_receive(:debug).with(/^link level default inet /).once
-            Ohai::Log.should_receive(:debug).with(/^link level default inet6 /).once
-            @ohai._require_plugin("network")
-          end
-
           it "picks {ip,mac,ip6}address from the default interface" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "192.168.99.11"
-            @ohai["macaddress"].should == "00:16:3E:2F:36:80"
-            @ohai["ip6address"].should == "3ffe:1111:3333::1"
+            @plugin.run
+            @plugin["ipaddress"].should == "192.168.99.11"
+            @plugin["macaddress"].should == "00:16:3E:2F:36:80"
+            @plugin["ip6address"].should == "3ffe:1111:3333::1"
           end
         end
       end
 
       describe "point to point address" do
         before do
-          @ohai["network"]["interfaces"]["eth2"] = {
+          @plugin["network"]["interfaces"]["eth2"] = {
             "flags" => ["POINTOPOINT", "BROADCAST", "MULTICAST", "UP"],
             "number" => "2",
             "addresses" => {
@@ -594,27 +704,27 @@ describe Ohai::System, "Network Plugin" do
               }
             }
           }
-          @ohai["network"]["default_gateway"] = "192.168.99.126"
-          @ohai["network"]["default_interface"] = "eth2"
-          @ohai["network"]["default_inet6_gateway"] = "3ffe:1111:2222:0:4444::2"
-          @ohai["network"]["default_inet6_interface"] = "eth2"
+          @plugin["network"]["default_gateway"] = "192.168.99.126"
+          @plugin["network"]["default_interface"] = "eth2"
+          @plugin["network"]["default_inet6_gateway"] = "3ffe:1111:2222:0:4444::2"
+          @plugin["network"]["default_inet6_interface"] = "eth2"
         end
 
         it_does_not_fail
 
         it "picks {ip,mac,ip6}address from the default interface" do
-          @ohai._require_plugin("network")
-          @ohai["ipaddress"].should == "192.168.66.99"
-          @ohai["macaddress"].should == "00:16:3E:2F:36:81"
-          @ohai["ip6address"].should == "3ffe:1111:2222:0:4444::1"
+          @plugin.run
+          @plugin["ipaddress"].should == "192.168.66.99"
+          @plugin["macaddress"].should == "00:16:3E:2F:36:81"
+          @plugin["ip6address"].should == "3ffe:1111:2222:0:4444::1"
         end
       end
 
       describe "ipv6 only node" do
         before do
-          @ohai["network"]["default_gateway"] = nil
-          @ohai["network"]["default_interface"] = nil
-          @ohai["network"]["interfaces"].each do |i,iv|
+          @plugin["network"]["default_gateway"] = nil
+          @plugin["network"]["default_interface"] = nil
+          @plugin["network"]["interfaces"].each do |i,iv|
             iv["addresses"].delete_if{|k,kv| kv["family"] == "inet" }
           end
         end
@@ -622,28 +732,28 @@ describe Ohai::System, "Network Plugin" do
         it_does_not_fail
 
         it "can't detect ipaddress" do
-          Ohai::Log.should_receive(:warn).any_number_of_times
-          @ohai._require_plugin("network")
-          @ohai["ipaddress"].should be_nil
+          Ohai::Log.stub(:warn)
+          @plugin.run
+          @plugin["ipaddress"].should be_nil
         end
 
         it "warns about not being able to set {ip,mac}address (ipv4)" do
           Ohai::Log.should_receive(:warn).with(/^unable to detect ipaddress/).once
           Ohai::Log.should_receive(:warn).with(/^unable to detect macaddress/).once
-          @ohai._require_plugin("network")
+          @plugin.run
         end
 
         it "sets {ip6,mac}address" do
-          Ohai::Log.should_receive(:warn).any_number_of_times
-          @ohai._require_plugin("network")
-          @ohai["ip6address"].should == "3ffe:1111:2222::33"
-          @ohai["macaddress"].should == "00:16:3E:2F:36:79"
+          Ohai::Log.stub(:warn)
+          @plugin.run
+          @plugin["ip6address"].should == "3ffe:1111:2222::33"
+          @plugin["macaddress"].should == "00:16:3E:2F:36:79"
         end
 
         it "informs about macaddress being set using the ipv6 setup" do
           Ohai::Log.should_receive(:debug).with(/^macaddress set to 00:16:3E:2F:36:79 from the ipv6 setup/).once
-          Ohai::Log.should_receive(:debug).any_number_of_times
-          @ohai._require_plugin("network")
+          Ohai::Log.stub(:debug)
+          @plugin.run
         end
       end
 
@@ -652,16 +762,17 @@ describe Ohai::System, "Network Plugin" do
     basic_data.keys.sort.each do |os|
       describe "the #{os}::network has already set some of the {ip,mac,ip6}address attributes" do
         before(:each) do
-          @ohai = Ohai::System.new
-          @ohai.stub!(:require_plugin).twice.and_return(true)
-          @ohai["network"] = basic_data[os]["network"]
+          @plugin["network"] = basic_data[os]["network"]
         end
 
         describe "{ip,mac}address are already set" do
           before do
-            @ohai["ipaddress"] = "10.11.12.13"
-            @ohai["macaddress"] = "00:AA:BB:CC:DD:EE"
+            @plugin["ipaddress"] = "10.11.12.13"
+            @plugin["macaddress"] = "00:AA:BB:CC:DD:EE"
             @expected_results = {
+              "freebsd" => {
+                "ip6address" => "::1"
+              },
               "linux" => {
                 "ip6address" => "3ffe:1111:2222::33"
               },
@@ -674,22 +785,26 @@ describe Ohai::System, "Network Plugin" do
           it_does_not_fail
 
           it "detects ip6address" do
-            @ohai._require_plugin("network")
-            @ohai["ip6address"].should == @expected_results[os]["ip6address"]
+            @plugin.run
+            @plugin["ip6address"].should == @expected_results[os]["ip6address"]
           end
 
           it "doesn't overwrite {ip,mac}address" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "10.11.12.13"
-            @ohai["macaddress"].should == "00:AA:BB:CC:DD:EE"
+            @plugin.run
+            @plugin["ipaddress"].should == "10.11.12.13"
+            @plugin["macaddress"].should == "00:AA:BB:CC:DD:EE"
           end
         end
 
         describe "ip6address is already set" do
           describe "node has ipv4 and ipv6" do
             before do
-              @ohai["ip6address"] = "3ffe:8888:9999::1"
+              @plugin["ip6address"] = "3ffe:8888:9999::1"
               @expected_results = {
+                "freebsd" => {
+                  "ipaddress" => "76.91.1.255",
+                  "macaddress" => "00:00:24:c9:5e:b8"
+                },
                 "linux" => {
                   "ipaddress" => "192.168.66.33",
                   "macaddress" => "00:16:3E:2F:36:79"
@@ -704,51 +819,53 @@ describe Ohai::System, "Network Plugin" do
             it_does_not_fail
 
             it "detects {ip,mac}address" do
-              @ohai._require_plugin("network")
-              @ohai["ipaddress"].should == @expected_results[os]["ipaddress"]
-              @ohai["macaddress"].should == @expected_results[os]["macaddress"]
+              @plugin.run
+              @plugin["ipaddress"].should == @expected_results[os]["ipaddress"]
+              @plugin["macaddress"].should == @expected_results[os]["macaddress"]
             end
 
             it "doesn't overwrite ip6address" do
-              @ohai._require_plugin("network")
-              @ohai["ip6address"].should == "3ffe:8888:9999::1"
+              @plugin.run
+              @plugin["ip6address"].should == "3ffe:8888:9999::1"
             end
           end
 
           describe "ipv6 only node" do
             before do
-              @ohai["network"]["default_gateway"] = nil
-              @ohai["network"]["default_interface"] = nil
-              @ohai["network"]["interfaces"].each do |i,iv|
-                iv["addresses"].delete_if{|k,kv| kv["family"] == "inet" }
+              @plugin["network"]["default_gateway"] = nil
+              @plugin["network"]["default_interface"] = nil
+              @plugin["network"]["interfaces"].each do |i,iv|
+                if iv.has_key? "addresses"
+                  iv["addresses"].delete_if{|k,kv| kv["family"] == "inet" }
+                end
               end
-              @ohai["ip6address"] = "3ffe:8888:9999::1"
+              @plugin["ip6address"] = "3ffe:8888:9999::1"
             end
 
             it_does_not_fail
 
             it "can't detect ipaddress (ipv4)" do
-              Ohai::Log.should_receive(:warn).any_number_of_times
-              @ohai._require_plugin("network")
-              @ohai["ipaddress"].should be_nil
+              Ohai::Log.stub(:warn)
+              @plugin.run
+              @plugin["ipaddress"].should be_nil
             end
 
             it "can't detect macaddress either" do
-              Ohai::Log.should_receive(:warn).any_number_of_times
-              @ohai._require_plugin("network")
-              @ohai["macaddress"].should be_nil
+              Ohai::Log.stub(:warn)
+              @plugin.run
+              @plugin["macaddress"].should be_nil
             end
 
             it "warns about not being able to set {ip,mac}address" do
               Ohai::Log.should_receive(:warn).with(/^unable to detect ipaddress/).once
               Ohai::Log.should_receive(:warn).with(/^unable to detect macaddress/).once
-              @ohai._require_plugin("network")
+              @plugin.run
             end
 
             it "doesn't overwrite ip6address" do
-              Ohai::Log.should_receive(:warn).any_number_of_times
-              @ohai._require_plugin("network")
-              @ohai["ip6address"].should == "3ffe:8888:9999::1"
+              Ohai::Log.stub(:warn)
+              @plugin.run
+              @plugin["ip6address"].should == "3ffe:8888:9999::1"
             end
           end
         end
@@ -756,9 +873,13 @@ describe Ohai::System, "Network Plugin" do
         describe "{mac,ip6}address are already set" do
           describe "valid ipv4 setup" do
             before do
-              @ohai["macaddress"] = "00:AA:BB:CC:DD:EE"
-              @ohai["ip6address"] = "3ffe:8888:9999::1"
+              @plugin["macaddress"] = "00:AA:BB:CC:DD:EE"
+              @plugin["ip6address"] = "3ffe:8888:9999::1"
               @expected_results = {
+                "freebsd" => {
+                  "ipaddress" => "76.91.1.255",
+                  "macaddress" => "00:00:24:c9:5e:b8"
+                },
                 "linux" => {
                   "ipaddress" => "192.168.66.33",
                   "macaddress" => "00:16:3E:2F:36:79"
@@ -773,75 +894,77 @@ describe Ohai::System, "Network Plugin" do
             it_does_not_fail
 
             it "detects ipaddress and overwrite macaddress" do
-              @ohai._require_plugin("network")
-              @ohai["ipaddress"].should == @expected_results[os]["ipaddress"]
-              @ohai["macaddress"].should == @expected_results[os]["macaddress"]
+              @plugin.run
+              @plugin["ipaddress"].should == @expected_results[os]["ipaddress"]
+              @plugin["macaddress"].should == @expected_results[os]["macaddress"]
             end
 
             it "doesn't overwrite ip6address" do
-              @ohai._require_plugin("network")
-              @ohai["ip6address"].should == "3ffe:8888:9999::1"
+              @plugin.run
+              @plugin["ip6address"].should == "3ffe:8888:9999::1"
             end
           end
 
           describe "ipv6 only node" do
             before do
-              @ohai["network"]["default_gateway"] = nil
-              @ohai["network"]["default_interface"] = nil
-              @ohai["network"]["interfaces"].each do |i,iv|
-                iv["addresses"].delete_if{|k,kv| kv["family"] == "inet" }
+              @plugin["network"]["default_gateway"] = nil
+              @plugin["network"]["default_interface"] = nil
+              @plugin["network"]["interfaces"].each do |i,iv|
+                if iv.has_key? "addresses"
+                  iv["addresses"].delete_if{|k,kv| kv["family"] == "inet" }
+                end
               end
-              @ohai["macaddress"] = "00:AA:BB:CC:DD:EE"
-              @ohai["ip6address"] = "3ffe:8888:9999::1"
+              @plugin["macaddress"] = "00:AA:BB:CC:DD:EE"
+              @plugin["ip6address"] = "3ffe:8888:9999::1"
             end
 
             it_does_not_fail
 
             it "can't set ipaddress" do
-              Ohai::Log.should_receive(:warn).any_number_of_times
-              @ohai._require_plugin("network")
-              @ohai["ipaddress"].should be_nil
+              Ohai::Log.stub(:warn)
+              @plugin.run
+              @plugin["ipaddress"].should be_nil
             end
 
             it "doesn't overwrite {ip6,mac}address" do
-              Ohai::Log.should_receive(:warn).any_number_of_times
-              @ohai._require_plugin("network")
-              @ohai["ip6address"].should == "3ffe:8888:9999::1"
-              @ohai["macaddress"].should == "00:AA:BB:CC:DD:EE"
+              Ohai::Log.stub(:warn)
+              @plugin.run
+              @plugin["ip6address"].should == "3ffe:8888:9999::1"
+              @plugin["macaddress"].should == "00:AA:BB:CC:DD:EE"
             end
           end
         end
 
         describe "{ip,mac,ip6}address are already set" do
           before do
-            @ohai["ipaddress"] = "10.11.12.13"
-            @ohai["macaddress"] = "00:AA:BB:CC:DD:EE"
-            @ohai["ip6address"] = "3ffe:8888:9999::1"
+            @plugin["ipaddress"] = "10.11.12.13"
+            @plugin["macaddress"] = "00:AA:BB:CC:DD:EE"
+            @plugin["ip6address"] = "3ffe:8888:9999::1"
           end
 
           it_does_not_fail
 
           it "doesn't overwrite {ip,mac,ip6}address" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "10.11.12.13"
-            @ohai["macaddress"].should == "00:AA:BB:CC:DD:EE"
-            @ohai["ip6address"].should == "3ffe:8888:9999::1"
+            @plugin.run
+            @plugin["ipaddress"].should == "10.11.12.13"
+            @plugin["macaddress"].should == "00:AA:BB:CC:DD:EE"
+            @plugin["ip6address"].should == "3ffe:8888:9999::1"
           end
         end
 
         describe "{ip,ip6}address are already set" do
           before do
-            @ohai["ipaddress"] = "10.11.12.13"
-            @ohai["ip6address"] = "3ffe:8888:9999::1"
+            @plugin["ipaddress"] = "10.11.12.13"
+            @plugin["ip6address"] = "3ffe:8888:9999::1"
           end
 
           it_does_not_fail
 
           it "doesn't overwrite {ip,mac,ip6}address" do
-            @ohai._require_plugin("network")
-            @ohai["ipaddress"].should == "10.11.12.13"
-            @ohai["macaddress"].should == nil
-            @ohai["ip6address"].should == "3ffe:8888:9999::1"
+            @plugin.run
+            @plugin["ipaddress"].should == "10.11.12.13"
+            @plugin["macaddress"].should == nil
+            @plugin["ip6address"].should == "3ffe:8888:9999::1"
           end
         end