ohai 8.19.2 → 8.20.0

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

@@ -25,6 +25,34 @@ Ohai.plugin(:Network) do
     encap
   end
 
+  def mac_addresses(iface)
+    prop = iface[:configuration][:mac_address] || iface[:instance][:network_addresses]
+    [prop].flatten.map { |addr| addr.include?(":") ? addr : addr.scan(/.{1,2}/).join(":") }
+  end
+
+  def network_data
+    @network_data ||= begin
+      data = {}
+      wmi = WmiLite::Wmi.new
+      data[:addresses] = wmi.instances_of("Win32_NetworkAdapterConfiguration")
+
+      # If we are running on windows nano or anothe roperating system from the future
+      # that does not populate the deprecated win32_* WMI classes, then we should
+      # grab data from the newer MSFT_* classes
+      return msft_adapter_data if data[:addresses].count.zero?
+      data[:adapters] = wmi.instances_of("Win32_NetworkAdapter")
+      data
+    end
+  end
+
+  def msft_adapter_data
+    data = {}
+    wmi = WmiLite::Wmi.new("ROOT/StandardCimv2")
+    data[:addresses] = wmi.instances_of("MSFT_NetIPAddress")
+    data[:adapters] = wmi.instances_of("MSFT_NetAdapter")
+    data
+  end
+
   collect_data(:windows) do
 
     require "wmi-lite/wmi"
@@ -37,26 +65,20 @@ Ohai.plugin(:Network) do
     counters Mash.new unless counters
     counters[:network] = Mash.new unless counters[:network]
 
-    # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394217%28v=vs.85%29.aspx
-    wmi = WmiLite::Wmi.new
-
-    adapters = wmi.instances_of("Win32_NetworkAdapterConfiguration")
-
-    adapters.each do |adapter|
-
-      i = adapter["index"]
-      iface_config[i] = Mash.new
+    network_data[:addresses].each do |adapter|
+      i = adapter["index"] || adapter["InterfaceIndex"]
+      iface_config[i] = Mash.new unless iface_config[i]
+      iface_config[i][:ip_address] ||= []
+      iface_config[i][:ip_address] << adapter["IPAddress"]
       adapter.wmi_ole_object.properties_.each do |p|
-        iface_config[i][p.name.wmi_underscore.to_sym] = adapter[p.name.downcase]
+        if iface_config[i][p.name.wmi_underscore.to_sym].nil?
+          iface_config[i][p.name.wmi_underscore.to_sym] = adapter[p.name.downcase]
+        end
       end
     end
 
-    # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
-
-    adapters = wmi.instances_of("Win32_NetworkAdapter")
-
-    adapters.each do |adapter|
-      i = adapter["index"]
+    network_data[:adapters].each do |adapter|
+      i = adapter["index"] || adapter["InterfaceIndex"]
       iface_instance[i] = Mash.new
       adapter.wmi_ole_object.properties_.each do |p|
         iface_instance[i][p.name.wmi_underscore.to_sym] = adapter[p.name.downcase]
@@ -64,45 +86,45 @@ Ohai.plugin(:Network) do
     end
 
     iface_instance.keys.each do |i|
-      if iface_config[i][:ip_enabled] && iface_instance[i][:net_connection_id]
-        cint = sprintf("0x%x", iface_instance[i][:interface_index] ? iface_instance[i][:interface_index] : iface_instance[i][:index] ).downcase
+      if iface_instance[i][:name] && iface_config[i] && iface_config[i][:ip_address][0]
+        cint = sprintf("0x%x", (iface_instance[i][:interface_index] || iface_instance[i][:index]) ).downcase
         iface[cint] = Mash.new
         iface[cint][:configuration] = iface_config[i]
         iface[cint][:instance] = iface_instance[i]
 
         iface[cint][:counters] = Mash.new
         iface[cint][:addresses] = Mash.new
-        iface[cint][:configuration][:ip_address].each_index do |i|
-          ip = iface[cint][:configuration][:ip_address][i]
-          _ip = IPAddress("#{ip}/#{iface[cint][:configuration][:ip_subnet][i]}")
-          iface[cint][:addresses][ip] = Mash.new(
-                                                 :prefixlen => _ip.prefix
-                                                 )
-          if _ip.ipv6?
-            # inet6 address
+        iface[cint][:configuration][:ip_address] = iface[cint][:configuration][:ip_address].flatten
+        iface[cint][:configuration][:ip_address].each_index do |ip_index|
+          ip = iface[cint][:configuration][:ip_address][ip_index]
+          ip_and_subnet = ip.dup
+          ip_and_subnet << "/#{iface[cint][:configuration][:ip_subnet][ip_index]}" if iface[cint][:configuration][:ip_subnet]
+          ip2 = IPAddress(ip_and_subnet)
+          iface[cint][:addresses][ip] = Mash.new(:prefixlen => ip2.prefix)
+          if ip2.ipv6?
             iface[cint][:addresses][ip][:family] = "inet6"
             iface[cint][:addresses][ip][:scope] = "Link" if ip =~ /^fe80/i
           else
-            # should be an inet4 address
-            iface[cint][:addresses][ip][:netmask] = _ip.netmask.to_s
-            if iface[cint][:configuration][:ip_use_zero_broadcast]
-              iface[cint][:addresses][ip][:broadcast] = _ip.network.to_s
-            else
-              iface[cint][:addresses][ip][:broadcast] = _ip.broadcast.to_s
+            if iface[cint][:configuration][:ip_subnet]
+              iface[cint][:addresses][ip][:netmask] = ip2.netmask.to_s
+              if iface[cint][:configuration][:ip_use_zero_broadcast]
+                iface[cint][:addresses][ip][:broadcast] = ip2.network.to_s
+              else
+                iface[cint][:addresses][ip][:broadcast] = ip2.broadcast.to_s
+              end
             end
             iface[cint][:addresses][ip][:family] = "inet"
           end
         end
-        # Apparently you can have more than one mac_address? Odd.
-        [iface[cint][:configuration][:mac_address]].flatten.each do |mac_addr|
+        mac_addresses(iface[cint]).each do |mac_addr|
           iface[cint][:addresses][mac_addr] = {
             "family" => "lladdr",
           }
         end
-        iface[cint][:mtu] = iface[cint][:configuration][:mtu]
-        iface[cint][:type] = iface[cint][:instance][:adapter_type]
+        iface[cint][:mtu] = iface[cint][:configuration][:mtu] if iface[cint][:configuration].has_key?(:mtu)
+        iface[cint][:type] = iface[cint][:instance][:adapter_type] if iface[cint][:instance][:adapter_type]
         iface[cint][:arp] = {}
-        iface[cint][:encapsulation] = windows_encaps_lookup(iface[cint][:instance][:adapter_type])
+        iface[cint][:encapsulation] = windows_encaps_lookup(iface[cint][:instance][:adapter_type]) if iface[cint][:instance][:adapter_type]
         if iface[cint][:configuration][:default_ip_gateway] != nil && iface[cint][:configuration][:default_ip_gateway].size > 0
           network[:default_gateway] = iface[cint][:configuration][:default_ip_gateway].first
           network[:default_interface] = cint

data/lib/ohai/runner.rb

@@ -76,9 +76,9 @@ module Ohai
 
         # Remove the already ran plugins from dependencies if force is not set
         # Also remove the plugin that we are about to run from dependencies as well.
-        dependency_providers.delete_if { |dep_plugin|
+        dependency_providers.delete_if do |dep_plugin|
           dep_plugin.has_run? || dep_plugin.eql?(next_plugin)
-        }
+        end
 
         if dependency_providers.empty?
           @safe_run ? next_plugin.safe_run : next_plugin.run

data/lib/ohai/system.rb

@@ -94,9 +94,9 @@ module Ohai
 
       # Then run all the version 7 plugins
       begin
-        @provides_map.all_plugins(attribute_filter).each { |plugin|
+        @provides_map.all_plugins(attribute_filter).each do |plugin|
           @runner.run_plugin(plugin)
-        }
+        end
       rescue Ohai::Exceptions::AttributeNotFound, Ohai::Exceptions::DependencyCycle => e
         Ohai::Log.error("Encountered error while running plugins: #{e.inspect}")
         raise

data/lib/ohai/version.rb

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

data/spec/functional/application_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe "Ohai::Application" do
     ARGV.replace(@original_argv)
   end
 
-  describe '#configure_ohai' do
+  describe "#configure_ohai" do
 
     let(:config_content) { "" }
     let(:config_dir) { Dir.mktmpdir(".chef") }

data/spec/support/integration_helper.rb

@@ -18,7 +18,7 @@ module IntegrationSupport
         end
       end
 
-      def with_plugin(plugin_path, contents)
+      def with_plugin(plugin_path, contents) # rubocop:disable Lint/NestedMethodDefinition
         filename = path_to(plugin_path)
         dir = File.dirname(filename)
         FileUtils.mkdir_p(dir) unless dir == "."
@@ -27,11 +27,11 @@ module IntegrationSupport
         end
       end
 
-      def path_to(plugin_path)
+      def path_to(plugin_path) # rubocop:disable Lint/NestedMethodDefinition
         File.expand_path(plugin_path, @plugins_directory)
       end
 
-      def self.with_plugin(plugin_path, contents)
+      def self.with_plugin(plugin_path, contents) # rubocop:disable Lint/NestedMethodDefinition
         before :each do
           with_plugin(plugin_path, contents)
         end

data/spec/unit/application_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe "Ohai::Application" do
     ARGV.replace(@original_argv)
   end
 
-  describe '#configure_ohai' do
+  describe "#configure_ohai" do
     describe "loading configuration from a file" do
       let(:config_file) { "/local/workstation/config" }
       let(:config_loader) { instance_double("ChefConfig::WorkstationConfigLoader") }

data/spec/unit/dsl/plugin_spec.rb

@@ -170,10 +170,10 @@ shared_examples "Ohai::DSL::Plugin" do
 
             describe "and an intermediate key is not a hash" do
               it "raises a TypeError" do
-                expect {
+                expect do
                   plugin.get_attribute("the_monarch", "arch_rival",
                                        "dr_venture", "since")
-                }.to raise_error(TypeError,
+                end.to raise_error(TypeError,
                                  "Expected Hash but got String.")
               end
             end
@@ -204,10 +204,10 @@ shared_examples "Ohai::DSL::Plugin" do
 
             describe "and an intermediate key is not a hash" do
               it "raises a TypeError" do
-                expect {
+                expect do
                   plugin.get_attribute(:the_monarch, :arch_rival,
                                        :dr_venture, :since)
-                }.to raise_error(TypeError,
+                end.to raise_error(TypeError,
                                  "Expected Hash but got String.")
               end
             end
@@ -277,10 +277,10 @@ shared_examples "Ohai::DSL::Plugin" do
 
             describe "and an intermediate key is not a hash" do
               it "raises a TypeError" do
-                expect {
+                expect do
                   plugin.attribute?("the_monarch", "arch_rival",
                                     "dr_venture", "since")
-                }.to raise_error(TypeError,
+                end.to raise_error(TypeError,
                                  "Expected Hash but got String.")
               end
             end
@@ -310,10 +310,10 @@ shared_examples "Ohai::DSL::Plugin" do
 
             describe "and an intermediate key is not a hash" do
               it "raises a TypeError" do
-                expect {
+                expect do
                   plugin.attribute?(:the_monarch, :arch_rival,
                                     :dr_venture, :since)
-                }.to raise_error(TypeError,
+                end.to raise_error(TypeError,
                                  "Expected Hash but got String.")
               end
             end
@@ -369,11 +369,11 @@ describe Ohai::DSL::Plugin::VersionVII do
     end
 
     it "collects from multiple provides statements" do
-      plugin = Ohai.plugin(:Test) {
+      plugin = Ohai.plugin(:Test) do
         provides("one")
         provides("two", "three")
         provides("four")
-      }
+      end
       expect(plugin.provides_attrs).to eql(%w{one two three four})
     end
 
@@ -402,11 +402,11 @@ describe Ohai::DSL::Plugin::VersionVII do
     end
 
     it "collects from multiple depends statements" do
-      plugin = Ohai.plugin(:Test) {
+      plugin = Ohai.plugin(:Test) do
         depends("one")
         depends("two", "three")
         depends("four")
-      }
+      end
       expect(plugin.depends_attrs).to eql(%w{one two three four})
     end
 
@@ -442,11 +442,11 @@ describe Ohai::DSL::Plugin::VersionVII do
     end
 
     it "saves multiple collect_data blocks" do
-      plugin = Ohai.plugin(:Test) {
+      plugin = Ohai.plugin(:Test) do
         collect_data {}
         collect_data(:windows) {}
         collect_data(:darwin) {}
-      }
+      end
       [:darwin, :default, :windows].each do |platform|
         expect(plugin.data_collector).to have_key(platform)
       end
@@ -461,21 +461,21 @@ describe Ohai::DSL::Plugin::VersionVII do
     end
 
     it "fails a platform has already been defined in the same plugin" do
-      expect {
-        Ohai.plugin(:Test) {
+      expect do
+        Ohai.plugin(:Test) do
           collect_data {}
           collect_data {}
-        }
-      }.to raise_error(Ohai::Exceptions::IllegalPluginDefinition, /collect_data already defined/)
+        end
+      end.to raise_error(Ohai::Exceptions::IllegalPluginDefinition, /collect_data already defined/)
     end
 
     it "fails if a platform has already been defined in another plugin file" do
       Ohai.plugin(:Test) { collect_data {} }
-      expect {
-        Ohai.plugin(:Test) {
+      expect do
+        Ohai.plugin(:Test) do
           collect_data {}
-        }
-      }.to raise_error(Ohai::Exceptions::IllegalPluginDefinition, /collect_data already defined/)
+        end
+      end.to raise_error(Ohai::Exceptions::IllegalPluginDefinition, /collect_data already defined/)
     end
   end
 

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -20,13 +20,13 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 require "ohai/mixin/ec2_metadata"
 
 describe Ohai::Mixin::Ec2Metadata do
-  let(:mixin) {
+  let(:mixin) do
     metadata_object = Object.new.extend(Ohai::Mixin::Ec2Metadata)
     http_client = double("Net::HTTP client")
     allow(http_client).to receive(:get).and_return(response)
     allow(metadata_object).to receive(:http_client).and_return(http_client)
     metadata_object
-  }
+  end
 
   context "#best_api_version" do
     context "with a sorted list of metadata versions" do

data/spec/unit/mixin/softlayer_metadata_spec.rb

@@ -22,10 +22,10 @@ require "ohai/mixin/softlayer_metadata"
 
 describe ::Ohai::Mixin::SoftlayerMetadata do
 
-  let(:mixin) {
+  let(:mixin) do
     mixin = Object.new.extend(::Ohai::Mixin::SoftlayerMetadata)
     mixin
-  }
+  end
 
   def make_request(item)
     "/rest/v3.1/SoftLayer_Resource_Metadata/#{item}"

data/spec/unit/plugin_config_spec.rb

@@ -52,13 +52,13 @@ describe "Ohai::PluginConfig" do
 
         describe "when all Hash keys are symbols" do
 
-          let(:value) {
+          let(:value) do
             {
               :bar0 => true,
               :bar1 => [ :baz0, :baz1, :baz2 ],
               :bar2 => { :qux0 => true, :qux1 => false },
             }
-          }
+          end
 
           include_examples "success"
 
@@ -66,13 +66,13 @@ describe "Ohai::PluginConfig" do
 
         describe "when some top-level Hash key is not a symbol" do
 
-          let(:value) {
+          let(:value) do
             {
               :bar0 => true,
               "bar1" => [ :baz0, :baz1, :baz2 ],
               :bar2 => { :qux0 => true, :qux1 => false },
             }
-          }
+          end
 
           include_examples "failure"
 
@@ -80,13 +80,13 @@ describe "Ohai::PluginConfig" do
 
         describe "when some nested Hash key is not a symbol" do
 
-          let(:value) {
+          let(:value) do
             {
               :bar0 => true,
               :bar1 => [ :baz0, :baz1, :baz2 ],
               :bar2 => { :qux0 => true, "qux1" => false },
             }
-          }
+          end
 
           include_examples "failure"
 

data/spec/unit/plugins/aix/cpu_spec.rb

@@ -20,12 +20,12 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "AIX cpu plugin" do
   before(:each) do
-    @lsdev_Cc_processor = <<-LSDEV_CC_PROCESSOR
+    @lsdev_cc_processor = <<-LSDEV_CC_PROCESSOR
 proc0 Available 00-00 Processor
 proc4 Defined   00-04 Processor
 LSDEV_CC_PROCESSOR
 
-    @lsattr_El_proc0 = <<-LSATTR_EL
+    @lsattr_el_proc0 = <<-LSATTR_EL
 frequency   1654344000     Processor Speed       False
 smt_enabled true           Processor SMT enabled False
 smt_threads 2              Processor SMT threads False
@@ -43,8 +43,8 @@ PMCYCLES_M
     @plugin = get_plugin("aix/cpu")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
 
-    allow(@plugin).to receive(:shell_out).with("lsdev -Cc processor").and_return(mock_shell_out(0, @lsdev_Cc_processor, nil))
-    allow(@plugin).to receive(:shell_out).with("lsattr -El proc0").and_return(mock_shell_out(0, @lsattr_El_proc0, nil))
+    allow(@plugin).to receive(:shell_out).with("lsdev -Cc processor").and_return(mock_shell_out(0, @lsdev_cc_processor, nil))
+    allow(@plugin).to receive(:shell_out).with("lsattr -El proc0").and_return(mock_shell_out(0, @lsattr_el_proc0, nil))
     allow(@plugin).to receive(:shell_out).with("pmcycles -m").and_return(mock_shell_out(0, @pmcycles_m, nil))
   end
 
@@ -119,9 +119,9 @@ PMCYCLES_M
 
     it "doesn't set mhz of a processor it can't see" do
       # I'm so sorry
-      expect {
+      expect do
         expect(@plugin[:cpu]["0"][:mhz]).to eq(1654)
-      }.to raise_error(NoMethodError)
+      end.to raise_error(NoMethodError)
     end
   end
 end