ohai 14.4.1 → 14.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58700e6a6ab915d4ec1351041bc74a4f2312ff07d9db58fb225eeaf78a9046fc
-  data.tar.gz: 8c5c2b886c709bee3f3e20979181c424805fbf28e7da3db004d4d5b40b3edc6d
+  metadata.gz: aa2998db0ed97fe69f873899ea65c666badc17e7365c34592f539ee628299d7e
+  data.tar.gz: 26d01af9bf5ba6d2e874ed050b4a54ae167d4d7fcfeb5262eb6a9fa8438cff9a
 SHA512:
-  metadata.gz: 449a50927ade9ebbf3f52899952cf1e9c98670ed99ec6797d4a7d92240772f421dbcb45a2641efc2994c2291d72d502aaab1e4de04f776eb356151d8090908bb
-  data.tar.gz: d98210bde7491883d659dcd0bf40e1179f2340e18f63ed2324e12949e51f41003213578f0895d1e18a961ec32f6c621fdf1440463023ca6a3eeb5f423cf021a8
+  metadata.gz: 6b9c7a7d84321fcc138c270d6bc06055d2bc3f2cbb49043e1462261d9fe44a5c07049d0bc2c304d47808d383b99ae78c21b01ab2b8a34ad6094678d9cd0e2ebd
+  data.tar.gz: 3eef3a40fbae42dd73cde34434ecfaef6798873655a228465d86c6ec98c1607feb58baea8f7b16037ae7a04100b9b374cb0d58a4bc52bdf4f1bff8ff4937dbbe

data/lib/ohai/plugins/linux/network.rb

@@ -424,7 +424,7 @@ Ohai.plugin(:Network) do
   # ipv4/ipv6 routes are different enough that having a single algorithm to select the favored route for both creates unnecessary complexity
   # this method attempts to deduce the route that is most important to the user, which is later used to deduce the favored values for {ip,mac,ip6}address
   # we only consider routes that are default routes, or those routes that get us to the gateway for a default route
-  def favored_default_route(routes, iface, default_route, family)
+  def favored_default_route_linux(routes, iface, default_route, family)
     routes.select do |r|
       if family[:name] == "inet"
         # the route must have a source address
@@ -543,7 +543,7 @@ Ohai.plugin(:Network) do
           logger.trace("Plugin Network: #{default_prefix}_gateway set to #{network["#{default_prefix}_gateway"]}")
 
           # deduce the default route the user most likely cares about to pick {ip,mac,ip6}address below
-          favored_route = favored_default_route(routes, iface, default_route, family)
+          favored_route = favored_default_route_linux(routes, iface, default_route, family)
 
           # FIXME: This entire block should go away, and the network plugin should be the sole source of {ip,ip6,mac}address
 

data/lib/ohai/plugins/windows/network.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:Network) do
   end
 
   # Returns interface code for an interface
-  # 
+  #
   # Interface Index (if present, Index otherwise) will be converted in hexadecimal format
   #
   # @param int_idx [String or nil] the interface index of interface
@@ -72,7 +72,7 @@ Ohai.plugin(:Network) do
   end
 
   # Returns IPV4 address from list of addresses containing IPV4 and IPV6 formats
-  # 
+  #
   # @param addresses [Array<String>] List of addresses
   #
   # @return [String]
@@ -97,7 +97,7 @@ Ohai.plugin(:Network) do
   #
   # @return [Hash<:index, :interface_index, :default_ip_gateway, :ip_connection_metric>]
   #
-  def favored_default_route(configuration)
+  def favored_default_route_windows(configuration)
     return nil unless configuration.is_a?(Hash)
     config = configuration.dup
 
@@ -191,7 +191,7 @@ Ohai.plugin(:Network) do
       end
     end
 
-    if (route = favored_default_route(iface_config))
+    if (route = favored_default_route_windows(iface_config))
       network[:default_gateway] = route[:default_ip_gateway]
       network[:default_interface] = interface_code(route[:interface_index], route[:index])
     end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "14.4.1".freeze
+  VERSION = "14.4.2".freeze
 end

data/spec/unit/plugins/windows/network_spec.rb

@@ -80,7 +80,7 @@ describe Ohai::System, "Windows Network Plugin" do
     end
   end
 
-  describe "#favored_default_route" do
+  describe "#favored_default_route_windows" do
     let(:interface1) do
       { "index" => 1,
         "interface_index" => 1,
@@ -90,28 +90,28 @@ describe Ohai::System, "Windows Network Plugin" do
     let(:iface_config) { { 1 => interface1 } }
     context "When a hash is not passed" do
       it "Returns nil" do
-        expect(plugin.favored_default_route("Invalid")).to be_nil
+        expect(plugin.favored_default_route_windows("Invalid")).to be_nil
       end
     end
     context "When no interface is passed in Hash" do
       it "Returns nil" do
-        expect(plugin.favored_default_route({})).to be_nil
+        expect(plugin.favored_default_route_windows({})).to be_nil
       end
     end
     context "When an interface configuration is passed" do
       context "without default_ip_gateway" do
         it "Returns nil" do
           interface1["default_ip_gateway"] = nil
-          expect(plugin.favored_default_route(iface_config)).to be_nil
+          expect(plugin.favored_default_route_windows(iface_config)).to be_nil
         end
       end
       context "with default_ip_gateway" do
         it "Returns a hash with details" do
-          expect(plugin.favored_default_route(iface_config)).to be_a(Hash)
-          expect(plugin.favored_default_route(iface_config)).not_to be_empty
+          expect(plugin.favored_default_route_windows(iface_config)).to be_a(Hash)
+          expect(plugin.favored_default_route_windows(iface_config)).not_to be_empty
         end
         it "Returns the default_gateway in IPV4 format" do
-          expect(plugin.favored_default_route(iface_config)).to include(default_ip_gateway: "192.168.1.1")
+          expect(plugin.favored_default_route_windows(iface_config)).to include(default_ip_gateway: "192.168.1.1")
         end
       end
     end
@@ -127,10 +127,10 @@ describe Ohai::System, "Windows Network Plugin" do
           2 => interface2 }
       end
       it "Returns the default route as least metric interface" do
-        expect(plugin.favored_default_route(iface_config)).to include(interface_index: 1)
+        expect(plugin.favored_default_route_windows(iface_config)).to include(interface_index: 1)
       end
       it "Returns its default_gateway in IPV4 format" do
-        expect(plugin.favored_default_route(iface_config)).to include(default_ip_gateway: "192.168.1.1")
+        expect(plugin.favored_default_route_windows(iface_config)).to include(default_ip_gateway: "192.168.1.1")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 14.4.1
+  version: 14.4.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu