diff options
| author | Prabhu Das <prabhu.das@clogeny.com> | 2013-08-09 15:14:38 +0530 |
|---|---|---|
| committer | adamedx <adamed@opscode.com> | 2013-08-19 11:52:45 -0700 |
| commit | cc910c3a7cf13485a3b55f0454035858c8bab859 (patch) | |
| tree | f9b4ad22120190a9ac6501bbe4d12802c075ff20 | |
| parent | 8891085e286755b95fd99a5825e15a1cc850a8de (diff) | |
| download | ohai-cc910c3a7cf13485a3b55f0454035858c8bab859.tar.gz | |
Fixed few bugs while unit testing.
| -rw-r--r-- | lib/ohai/plugins/aix/filesystem.rb | 3 | ||||
| -rw-r--r-- | lib/ohai/plugins/aix/network.rb | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/ohai/plugins/aix/filesystem.rb b/lib/ohai/plugins/aix/filesystem.rb index 544d53cc..d590a326 100644 --- a/lib/ohai/plugins/aix/filesystem.rb +++ b/lib/ohai/plugins/aix/filesystem.rb @@ -1,5 +1,6 @@ # # Author:: Deepali Jagtap (<deepali.jagtap@clogeny.com>) +# Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Copyright:: Copyright (c) 2013 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -61,7 +62,7 @@ popen4("mount") do |pid, stdin, stdout, stderr| filesystem = fields[0] + ":" + fields[1] fs[filesystem] = Mash.new unless fs.has_key?(filesystem) fs[filesystem][:mount] = fields[3] - fs[filesystem][:fs_type] = fields[3] + fs[filesystem][:fs_type] = fields[4] fs[filesystem][:mount_options] = fields[7] end end diff --git a/lib/ohai/plugins/aix/network.rb b/lib/ohai/plugins/aix/network.rb index 66a7f690..052d2504 100644 --- a/lib/ohai/plugins/aix/network.rb +++ b/lib/ohai/plugins/aix/network.rb @@ -1,5 +1,6 @@ # # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>) +# Author:: Prabhu Das (<prabhu.das@clogeny.com>) # Copyright:: Copyright (c) 2013 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -21,7 +22,7 @@ provides "network", "counters/network" # Loads following information. # :default_interface, :default_gateway - route -n get 0 -# :interfaces +# :interfaces # => routes(netstat -nr | grep en0) # => addresses (ifconfig en0 or lsattr -El en0), macaddress (entstat -d en0 = Hardware Address: be:42:80:00:b0:05) # => flags (ifconfig en0) @@ -78,7 +79,7 @@ popen4("lsdev -Cc if") do |pid, stdin, stdout, stderr| netmask = hex_to_dec_netmask($1) if line =~ /netmask\s(\S+)\s/ unless netmask tmp_prefix ||= "32" - IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s + netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s end else netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s @@ -91,7 +92,7 @@ popen4("lsdev -Cc if") do |pid, stdin, stdout, stderr| if line =~ /broadcast\s(\S+)\s/ iface[interface][:addresses][tmp_addr][:broadcast] = $1 end - elsif line =~ /inet6 ([a-f0-9\:]+)\/(\d+)/ + elsif line =~ /inet6 ([a-f0-9\:%]+)\/(\d+)/ # TODO do we have more properties on inet6 in aix? broadcast iface[interface][:addresses] = Mash.new unless iface[interface][:addresses] iface[interface][:addresses][$1] = { "family" => "inet6", "prefixlen" => $2 } @@ -99,8 +100,8 @@ popen4("lsdev -Cc if") do |pid, stdin, stdout, stderr| # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1" properties = line.split n = properties.length/2 - 1 - for i in 0..n - iface[interface][properties[i]] = properties[(i == 0 ? 1 : i*2)] + (0..n).each do |i| + iface[interface][properties[i*2]] = properties[(i*2+1)] end end end |