diff options
author | sersut <serdar@opscode.com> | 2014-01-14 16:21:08 -0800 |
---|---|---|
committer | sersut <serdar@opscode.com> | 2014-01-14 16:21:08 -0800 |
commit | d887bb350da5c8832849fe24ae194dc40463e698 (patch) | |
tree | 539074dc85cfc170386b414d3f20858f57f81db2 | |
parent | 1424f8ffed1493ede4ea4cf7c0e36a6ac883aea4 (diff) | |
download | ohai-d887bb350da5c8832849fe24ae194dc40463e698.tar.gz |
Fix network plugin specs.
-rw-r--r-- | lib/ohai/plugins/network.rb | 9 | ||||
-rw-r--r-- | lib/ohai/plugins/sigar/network.rb | 6 | ||||
-rw-r--r-- | lib/ohai/plugins/sigar/network_route.rb | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/lib/ohai/plugins/network.rb b/lib/ohai/plugins/network.rb index 1827d6f9..7e09308f 100644 --- a/lib/ohai/plugins/network.rb +++ b/lib/ohai/plugins/network.rb @@ -17,8 +17,11 @@ # require 'ipaddress' +require 'ohai/mixin/network_constants' Ohai.plugin(:NetworkAddresses) do + include Ohai::Mixin::NetworkConstants + provides "ipaddress", "ip6address", "macaddress" depends "network/interfaces" @@ -60,8 +63,8 @@ Ohai.plugin(:NetworkAddresses) do return [ nil, nil ] if ips.empty? # shortcuts to access default #{family} interface and gateway - int_attr = Ohai::Mixin::NetworkConstants.FAMILIES[family] +"_interface" - gw_attr = Ohai::Mixin::NetworkConstants.FAMILIES[family] + "_gateway" + int_attr = Ohai::Mixin::NetworkConstants::FAMILIES[family] +"_interface" + gw_attr = Ohai::Mixin::NetworkConstants::FAMILIES[family] + "_gateway" # If we have a default interface that has addresses, # populate the short-cut attributes ipaddress, ip6address and macaddress @@ -136,7 +139,7 @@ Ohai.plugin(:NetworkAddresses) do counters[:network] = Mash.new unless counters[:network] # inet family is treated before inet6 - Ohai::Mixin::NetworkConstants.FAMILIES.keys.sort.each do |family| + Ohai::Mixin::NetworkConstants::FAMILIES.keys.sort.each do |family| r = {} ( r["ip"], r["iface"] ) = find_ip(family) r["mac"] = find_mac_from_iface(r["iface"]) unless r["iface"].nil? diff --git a/lib/ohai/plugins/sigar/network.rb b/lib/ohai/plugins/sigar/network.rb index 7115e531..0fb09cf0 100644 --- a/lib/ohai/plugins/sigar/network.rb +++ b/lib/ohai/plugins/sigar/network.rb @@ -16,9 +16,11 @@ # limitations under the License. # -#http://github.com/mdkent/ohai/commit/92f51aa18b6add9682510a87dcf94835ea72b04d +require 'ohai/mixin/network_constants' Ohai.plugin(:Network) do + include Ohai::Mixin::NetworkConstants + provides "network", "network/interfaces" provides "counters/network", "counters/network/interfaces" @@ -153,7 +155,7 @@ Ohai.plugin(:Network) do # should never happen network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route] route_data={} - Ohai::Mixin::NetworkConstants.SIGAR_ROUTE_METHODS.each do |m| + Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m| if(m == :flags) route_data[m]=flags(route.send(m)) else diff --git a/lib/ohai/plugins/sigar/network_route.rb b/lib/ohai/plugins/sigar/network_route.rb index a493e19c..34dbe3ab 100644 --- a/lib/ohai/plugins/sigar/network_route.rb +++ b/lib/ohai/plugins/sigar/network_route.rb @@ -16,7 +16,11 @@ # limitations under the License. # +require 'ohai/mixin/network_constants' + Ohai.plugin(:NetworkRoutes) do + include Ohai::Mixin::NetworkConstants + provides "network/interfaces/adapters/route" depends "network/interfaces" @@ -42,7 +46,7 @@ Ohai.plugin(:NetworkRoutes) do next unless network[:interfaces][route.ifname] # this should never happen network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route] route_data={} - Ohai::Mixin::NetworkConstants.SIGAR_ROUTE_METHODS.each do |m| + Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m| if(m == :flags) route_data[m]=flags(route.send(m)) else |