summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <clairemcquin@seamcquin100loaner.local>2014-01-07 13:14:42 -0800
committerClaire McQuin <clairemcquin@seamcquin100loaner.local>2014-01-07 13:14:42 -0800
commitd005979edf18459efb6944851fa5bd22f9d4d10f (patch)
treeb58b78bbdbe89c589ac6726fae1a17c5ebebb68b
parent12e4a5b607ad45c91cc488f6a0308268648eb7c4 (diff)
downloadohai-linux-network.tar.gz
make linux/network.rb define collect_data(:linux)linux-network
-rw-r--r--lib/ohai/plugins/linux/network.rb2
-rw-r--r--spec/unit/plugins/linux/network_spec.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/ohai/plugins/linux/network.rb b/lib/ohai/plugins/linux/network.rb
index c25e4986..8183cdf7 100644
--- a/lib/ohai/plugins/linux/network.rb
+++ b/lib/ohai/plugins/linux/network.rb
@@ -32,7 +32,7 @@ Ohai.plugin(:Network) do
encap
end
- collect_data do
+ collect_data(:linux) do
require 'ipaddr'
iface = Mash.new
diff --git a/spec/unit/plugins/linux/network_spec.rb b/spec/unit/plugins/linux/network_spec.rb
index a3ae46a2..b92d5626 100644
--- a/spec/unit/plugins/linux/network_spec.rb
+++ b/spec/unit/plugins/linux/network_spec.rb
@@ -26,6 +26,7 @@ rescue LoadError => e
end
def do_stubs
+ @plugin.stub(:collect_os).and_return(:linux)
@plugin.stub(:shell_out).with("ip addr").and_return(mock_shell_out(0, @linux_ip_addr, ""))
@plugin.stub(:shell_out).with("ip -d -s link").and_return(mock_shell_out(0, @linux_ip_link_s_d, ""))
@plugin.stub(:shell_out).with("ip -f inet neigh show").and_return(mock_shell_out(0, @linux_ip_neighbor_show, ""))