Merge pull request #600 from acaiafa/fix_aix_interface_check

Only run ifconfig against active interfaces
chef · Aug 14, 2015 · 5e5481c · 5e5481c
2 parents f17beb1 + 6dce1a3
commit 5e5481c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ohai/plugins/aix/network.rb b/lib/ohai/plugins/aix/network.rb
@@ -56,7 +56,7 @@ def hex_to_dec_netmask(netmask)
     end
 
     # List the interfaces in system.
-    so = shell_out("lsdev -Cc if")
+    so = shell_out("lsdev -Cc if | grep Available")
     so.stdout.lines.each do |line|
       if line =~ /(\S+) (\S+)\s+(.+)/
         interface = $1

diff --git a/spec/unit/plugins/aix/network_spec.rb b/spec/unit/plugins/aix/network_spec.rb
@@ -67,7 +67,7 @@
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     @plugin[:network] = Mash.new
     allow(@plugin).to receive(:shell_out).with("netstat -rn |grep default").and_return(mock_shell_out(0, @netstat_rn_grep_default, nil))
-    allow(@plugin).to receive(:shell_out).with("lsdev -Cc if").and_return(mock_shell_out(0, @lsdev_Cc_if, nil))
+    allow(@plugin).to receive(:shell_out).with("lsdev -Cc if | grep Available").and_return(mock_shell_out(0, @lsdev_Cc_if, nil))
     allow(@plugin).to receive(:shell_out).with("ifconfig en0").and_return(mock_shell_out(0, @ifconfig_en0, nil))
     allow(@plugin).to receive(:shell_out).with("entstat -d en0 | grep \"Hardware Address\"").and_return(mock_shell_out(0, "Hardware Address: be:42:80:00:b0:05", nil))
     allow(@plugin).to receive(:shell_out).with("netstat -nrf inet").and_return(mock_shell_out(0, @netstat_nrf_inet, nil))