ohai 14.6.2 → 14.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c27302cdf32368fc8014db58963f0e743021c347761701b714e6221013b417
-  data.tar.gz: 9e904244a04b14fb93f604de5a911efc087dd9c6a037e5b995363b9ade746e32
+  metadata.gz: 524e88334ac80fdc8ae183847f9eab6ef4cab298f39e15bc1e9eeb256a268794
+  data.tar.gz: dbdcd571211fed208f544f2a68b4499d9f0a7d45f8712ef8d7a9987a43abfeb4
 SHA512:
-  metadata.gz: 3639681908ec02d8c06900c886ad41a91303084920e476ce5c83d11b62fe27040ccd5dcd33af444f481bd6738a8e47ad01c6613235d339b46dd0a638ccabb8b5
-  data.tar.gz: 6cdc5bc33fea99cade6973bb778a3101f6b4bb2eccee9db83b37a4b1bcfe2fb88e86189377500cb0aae280305891becca4dbf589cf2519b52d99194cf07ba064
+  metadata.gz: 0dc03263ccbc0fec35bde6fe7d60d184850a81832c35141232d5169dcf6fad84ade7f4d81b504923057526d403440da3cb91732e93447896c10f960981d22c32
+  data.tar.gz: 66c6a59004a0ab93466b8b66d09086801220ad28fce64dd3f549ac9865595c15b24c0a2bd70ddc0fda39a7e171bf022c377cbdee3565a3ba962c23a853b1b042

data/lib/ohai/mixin/gce_metadata.rb

@@ -28,7 +28,11 @@ module Ohai
       def http_get(uri)
         conn = Net::HTTP.start(GCE_METADATA_ADDR)
         conn.read_timeout = 6
-        conn.get(uri, { "Metadata-Flavor" => "Google" })
+        conn.get(uri, {
+                        "Metadata-Flavor" => "Google",
+                        "User-Agent" => "chef-ohai/#{Ohai::VERSION}",
+                      }
+                )
       end
 
       def fetch_metadata(id = "")

data/lib/ohai/plugins/bsd/virtualization.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
-# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -76,7 +76,7 @@ Ohai.plugin(:Virtualization) do
     # Detect KVM/QEMU paravirt guests from cpu, report as KVM
     # hw.model: QEMU Virtual CPU version 0.9.1
     so = shell_out("sysctl -n hw.model")
-    if so.stdout.split($/)[0] =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
+    if so.stdout =~ /QEMU Virtual CPU|KVM processor/
       virtualization[:system] = "kvm"
       virtualization[:role] = "guest"
       virtualization[:systems][:kvm] = "guest"
@@ -87,27 +87,25 @@ Ohai.plugin(:Virtualization) do
     # there are a limited number of hypervisors detected here, BUT it doesn't
     # require dmidecode to be installed and dmidecode isn't in freebsd out of the box
     so = shell_out("sysctl -n kern.vm_guest")
-    case so.stdout
-    when /vmware/
-      virtualization[:system] = "vmware"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:vmware] = "guest"
-      logger.trace("Plugin Virtualization: Guest running on VMware detected")
-    when /hv/
-      virtualization[:system] = "hyperv"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:hyperv] = "guest"
-      logger.trace("Plugin Virtualization: Guest running on Hyper-V detected")
-    when /xen/
-      virtualization[:system] = "xen"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:xen] = "guest"
-      logger.trace("Plugin Virtualization: Guest running on Xen detected")
-    when /bhyve/
-      virtualization[:system] = "bhyve"
+    hypervisor = case so.stdout
+                 when /vmware/
+                   "vmware"
+                 when /hv/
+                   "hyperv"
+                 when /xen/
+                   "xen"
+                 when /kvm/
+                   so = shell_out("sysctl -n kern.hostuuid")
+                   so.stdout =~ /^ec2/ ? "amazonec2" : "kvm"
+                 when /bhyve/
+                   "bhyve"
+                 end
+
+    if hypervisor
+      virtualization[:system] = hypervisor
       virtualization[:role] = "guest"
-      virtualization[:systems][:bhyve] = "guest"
-      logger.trace("Plugin Virtualization: Guest running on bhyve detected")
+      virtualization[:systems][hypervisor.to_sym] = "guest"
+      logger.trace("Plugin Virtualization: Guest running on #{hypervisor} detected")
     end
 
     # parse dmidecode to discover various virtualization guests

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

@@ -127,7 +127,7 @@ Ohai.plugin(:Platform) do
     when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/
       # apt-get+dpkg almost certainly goes here
       "debian"
-    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
+    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
       # NOTE: "rhel" should be reserved exclusively for recompiled rhel versions that are nearly perfectly compatible down to the platform_version.
       # The operating systems that are "rhel" should all be as compatible as rhel7 = centos7 = oracle7 = scientific7 (98%-ish core RPM version compatibility
       # and the version numbers MUST track the upstream). The appropriate EPEL version repo should work nearly perfectly.  Some variation like the
@@ -137,7 +137,7 @@ Ohai.plugin(:Platform) do
       "rhel"
     when /amazon/
       "amazon"
-    when /suse/, /sles/, /opensuse/
+    when /suse/, /sles/, /opensuse/, /opensuseleap/, /sled/
       "suse"
     when /fedora/, /pidora/, /arista_eos/
       # In the broadest sense:  RPM-based, fedora-derived distributions which are not strictly re-compiled RHEL (if it uses RPMs, and smells more like redhat and less like
@@ -149,7 +149,7 @@ Ohai.plugin(:Platform) do
       "gentoo"
     when /slackware/
       "slackware"
-    when /arch/
+    when /arch/, /manjaro/, /antergos/
       "arch"
     when /exherbo/
       "exherbo"
@@ -157,6 +157,8 @@ Ohai.plugin(:Platform) do
       "alpine"
     when /clearlinux/
       "clearlinux"
+    when /mangeia/
+      "mandriva"
     end
   end
 
@@ -196,6 +198,9 @@ Ohai.plugin(:Platform) do
       contents = File.read("/etc/parallels-release").chomp
       platform get_redhatish_platform(contents)
       platform_version contents.match(/(\d\.\d\.\d)/)[0]
+    elsif File.exist?("/etc/Eos-release")
+      platform "arista_eos"
+      platform_version File.read("/etc/Eos-release").strip.split[-1]
     elsif File.exist?("/etc/redhat-release")
       if os_release_file_is_cisco? # Cisco guestshell
         platform "nexus_centos"
@@ -224,10 +229,6 @@ Ohai.plugin(:Platform) do
       else
         platform "suse"
       end
-    elsif File.exist?("/etc/Eos-release")
-      platform "arista_eos"
-      platform_version File.read("/etc/Eos-release").strip.split[-1]
-      platform_family "fedora"
     elsif os_release_file_is_cisco?
       raise "unknown Cisco /etc/os-release or /etc/cisco-release ID_LIKE field" if
         os_release_info["ID_LIKE"].nil? || ! os_release_info["ID_LIKE"].include?("wrlinux")
@@ -283,6 +284,9 @@ Ohai.plugin(:Platform) do
     elsif lsb[:id] =~ /XenServer/i
       platform "xenserver"
       platform_version lsb[:release]
+    elsif lsb[:id] =~ /XCP/i
+      platform "xcp"
+      platform_version lsb[:release]
     elsif lsb[:id] # LSB can provide odd data that changes between releases, so we currently fall back on it rather than dealing with its subtleties
       platform lsb[:id].downcase
       platform_version lsb[:release]
@@ -291,7 +295,14 @@ Ohai.plugin(:Platform) do
     # We have to do this for compatibility reasons, or older OS releases might get different
     # "platform" or "platform_version" attributes (e.g. SLES12, RHEL7).
     elsif File.exist?("/etc/os-release")
-      platform os_release_info["ID"] == "sles" ? "suse" : os_release_info["ID"] # SLES is wrong. We call it SUSE
+      case os_release_info["ID"]
+      when "sles"
+        platform "suse" # SLES is wrong. We call it SUSE
+      when "opensuse-leap"
+        platform "opensuseleap"
+      else
+        platform os_release_info["ID"]
+      end
       platform_version os_release_info["VERSION_ID"]
       # platform_family also does not need to be hardcoded anymore.
       # This would be the correct way, but we stick with "determine_platform_family" for compatibility reasons.

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

@@ -150,6 +150,17 @@ Ohai.plugin(:Virtualization) do
       end
     end
 
+    # Detect Hyper-V guest and the hostname of the host
+    if File.exist?("/var/lib/hyperv/.kvp_pool_3")
+      logger.trace("Plugin Virtualization: /var/lib/hyperv/.kvp_pool_3 contains string indicating Hyper-V guest")
+      data = File.read("/var/lib/hyperv/.kvp_pool_3")
+      hyperv_host = data[/\HostName(.*?)HostingSystemEditionId/, 1].scan(/[[:print:]]/).join.downcase
+      virtualization[:system] = "hyperv"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:hyperv] = "guest"
+      virtualization[:hypervisor_host] = hyperv_host
+    end
+
     # Detect Linux-VServer
     if File.exist?("/proc/self/status")
       proc_self_status = File.read("/proc/self/status")
@@ -212,6 +223,7 @@ Ohai.plugin(:Virtualization) do
           logger.trace("Plugin Virtualization: /proc/self/cgroup and lxc-version command exist. Detecting as lxc host")
           virtualization[:system] = "lxc"
           virtualization[:role] = "host"
+          virtualization[:systems][:lxc] = "host"
         end
         # In general, the 'systems' framework from OHAI-182 is less susceptible to conflicts
         # But, this could overwrite virtualization[:systems][:lxc] = "guest"
@@ -231,6 +243,7 @@ Ohai.plugin(:Virtualization) do
       logger.trace("Plugin Virtualization: /dev/lxd/sock exists. Detecting as lxd guest")
       virtualization[:system] = "lxd"
       virtualization[:role] = "guest"
+      virtualization[:systems][:lxd] = "guest"
     else
       # 'How' LXD is installed dictates the runtime data location
       #
@@ -245,6 +258,7 @@ Ohai.plugin(:Virtualization) do
           logger.trace("Plugin Virtualization: #{devlxd} exists. Detecting as lxd host")
           virtualization[:system] = "lxd"
           virtualization[:role] = "host"
+          virtualization[:systems][:lxd] = "host"
           break
         end
       end

data/lib/ohai/version.rb

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

data/ohai.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.license = "Apache-2.0"
   s.author = "Adam Jacob"
   s.email = "adam@chef.io"
-  s.homepage = "https://docs.chef.io/ohai.html"
+  s.homepage = "https://github.com/chef/ohai/"
 
   s.required_ruby_version = ">= 2.4"
 
@@ -34,5 +34,5 @@ Gem::Specification.new do |s|
   s.executables = %w{ohai}
 
   s.require_path = "lib"
-  s.files = %w{LICENSE README.md Gemfile Rakefile} + Dir.glob("*.gemspec") + Dir.glob("{docs,lib,spec}/**/*")
+  s.files = %w{LICENSE Gemfile Rakefile} + Dir.glob("*.gemspec") + Dir.glob("{docs,lib,spec}/**/*")
 end

data/spec/unit/plugins/bsd/virtualization_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@chef.io>
-# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2012-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,54 +19,56 @@
 require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "BSD virtualization plugin" do
+  let(:plugin) { get_plugin("bsd/virtualization") }
+
   before(:each) do
-    @plugin = get_plugin("bsd/virtualization")
-    allow(@plugin).to receive(:collect_os).and_return(:freebsd)
-    allow(@plugin).to receive(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "0", ""))
-    allow(@plugin).to receive(:shell_out).with((Ohai.abs_path( "/sbin/kldstat" )).to_s).and_return(mock_shell_out(0, "", ""))
-    allow(@plugin).to receive(:shell_out).with("jls -nd").and_return(mock_shell_out(0, "", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, "", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "", ""))
+    allow(plugin).to receive(:collect_os).and_return(:freebsd)
+    allow(plugin).to receive(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "0", ""))
+    allow(plugin).to receive(:shell_out).with((Ohai.abs_path( "/sbin/kldstat" )).to_s).and_return(mock_shell_out(0, "", ""))
+    allow(plugin).to receive(:shell_out).with("jls -nd").and_return(mock_shell_out(0, "", ""))
+    allow(plugin).to receive(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, "", ""))
+    allow(plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "", ""))
+    allow(plugin).to receive(:shell_out).with("sysctl -n kern.hostuuid").and_return(mock_shell_out(0, "", ""))
     allow(File).to receive(:exist?).and_return false
   end
 
   context "when on a bhyve host" do
     it "detects we are a host" do
       allow(File).to receive(:exist?).with("/dev/vmm").and_return true
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("bhyve")
-      expect(@plugin[:virtualization][:role]).to eq("host")
-      expect(@plugin[:virtualization][:systems][:bhyve]).to eq("host")
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("bhyve")
+      expect(plugin[:virtualization][:role]).to eq("host")
+      expect(plugin[:virtualization][:systems][:bhyve]).to eq("host")
     end
   end
 
   context "when on a bhyve guest" do
     it "detects we are a guest" do
-      allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "bhyve", ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("bhyve")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-      expect(@plugin[:virtualization][:systems][:bhyve]).to eq("guest")
+      allow(plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "bhyve", ""))
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("bhyve")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:bhyve]).to eq("guest")
     end
   end
 
   context "jails" do
     it "detects we are in a jail" do
-      allow(@plugin).to receive(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "1", ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("jail")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-      expect(@plugin[:virtualization][:systems][:jail]).to eq("guest")
+      allow(plugin).to receive(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "1", ""))
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("jail")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:jail]).to eq("guest")
     end
 
     it "detects we are hosting jails" do
       # from http://www.freebsd.org/doc/handbook/jails-application.html
       @jails = "JID  IP Address      Hostname                      Path\n     3  192.168.3.17    ns.example.org                /home/j/ns\n     2  192.168.3.18    mail.example.org              /home/j/mail\n     1  62.123.43.14    www.example.org               /home/j/www"
-      allow(@plugin).to receive(:shell_out).with("jls -nd").and_return(mock_shell_out(0, @jails, ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("jail")
-      expect(@plugin[:virtualization][:role]).to eq("host")
-      expect(@plugin[:virtualization][:systems][:jail]).to eq("host")
+      allow(plugin).to receive(:shell_out).with("jls -nd").and_return(mock_shell_out(0, @jails, ""))
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("jail")
+      expect(plugin[:virtualization][:role]).to eq("host")
+      expect(plugin[:virtualization][:systems][:jail]).to eq("host")
     end
   end
 
@@ -77,14 +79,14 @@ describe Ohai::System, "BSD virtualization plugin" do
         1 40 0xffffffff80100000 d20428 kernel
         7 3 0xffffffff81055000 41e88 vboxguest.ko
 OUT
-      allow(@plugin).to receive(:shell_out).with((Ohai.abs_path("/sbin/kldstat")).to_s).and_return(mock_shell_out(0, @vbox_guest, ""))
+      allow(plugin).to receive(:shell_out).with((Ohai.abs_path("/sbin/kldstat")).to_s).and_return(mock_shell_out(0, @vbox_guest, ""))
     end
 
     it "detects we are a guest" do
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("vbox")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-      expect(@plugin[:virtualization][:systems][:vbox]).to eq("guest")
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("vbox")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:vbox]).to eq("guest")
     end
   end
 
@@ -95,56 +97,49 @@ OUT
         1 40 0xffffffff80100000 d20428 kernel
         7 3 0xffffffff81055000 41e88 vboxdrv.ko
 OUT
-      allow(@plugin).to receive(:shell_out).with("/sbin/kldstat").and_return(mock_shell_out(0, @stdout, ""))
+      allow(plugin).to receive(:shell_out).with("/sbin/kldstat").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "detects we are a host" do
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("vbox")
-      expect(@plugin[:virtualization][:role]).to eq("host")
-      expect(@plugin[:virtualization][:systems][:vbox]).to eq("host")
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("vbox")
+      expect(plugin[:virtualization][:role]).to eq("host")
+      expect(plugin[:virtualization][:systems][:vbox]).to eq("host")
     end
   end
 
   context "when on a QEMU guest" do
     it "detects we are a guest" do
       [ "Common KVM processor", 'QEMU Virtual CPU version (cpu64-rhel6) ("GenuineIntel" 686-class)', "Common 32-bit KVM processor"].each do |kvm_string|
-        allow(@plugin).to receive(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, kvm_string, ""))
-        @plugin.run
-        expect(@plugin[:virtualization][:system]).to eq("kvm")
-        expect(@plugin[:virtualization][:role]).to eq("guest")
-        expect(@plugin[:virtualization][:systems][:kvm]).to eq("guest")
+        allow(plugin).to receive(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, kvm_string, ""))
+        plugin.run
+        expect(plugin[:virtualization][:system]).to eq("kvm")
+        expect(plugin[:virtualization][:role]).to eq("guest")
+        expect(plugin[:virtualization][:systems][:kvm]).to eq("guest")
       end
     end
   end
 
-  context "when on a xen guest" do
-    it "detects we are a guest" do
-      allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "xen", ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("xen")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-      expect(@plugin[:virtualization][:systems][:xen]).to eq("guest")
-    end
-  end
-
-  context "when on a vmware guest" do
-    it "detects we are a guest" do
-      allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "vmware", ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("vmware")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-      expect(@plugin[:virtualization][:systems][:vmware]).to eq("guest")
+  { xen: "xen", vmware: "vmware", hyperv: "hv", kvm: "kvm", bhyve: "bhyve" }.each_pair do |hypervisor, val|
+    context "when on a #{hypervisor} guest" do
+      it "detects we are a guest" do
+        allow(plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, val, ""))
+        plugin.run
+        expect(plugin[:virtualization][:system]).to eq(hypervisor.to_s)
+        expect(plugin[:virtualization][:role]).to eq("guest")
+        expect(plugin[:virtualization][:systems][hypervisor]).to eq("guest")
+      end
     end
   end
 
-  context "when on a hyper-v guest" do
+  context "when on an amazonec2 guest" do
     it "detects we are a guest" do
-      allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "hv", ""))
-      @plugin.run
-      expect(@plugin[:virtualization][:system]).to eq("hyperv")
-      expect(@plugin[:virtualization][:role]).to eq("guest")
-      expect(@plugin[:virtualization][:systems][:hyperv]).to eq("guest")
+      allow(plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "kvm", ""))
+      allow(plugin).to receive(:shell_out).with("sysctl -n kern.hostuuid").and_return(mock_shell_out(0, "ec2fb75c-7a36-7938-4efa-8e40b4ac634b", ""))
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("amazonec2")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:amazonec2]).to eq("guest")
     end
   end
 end

data/spec/unit/plugins/linux/platform_spec.rb

@@ -296,6 +296,8 @@ OS_RELEASE
 
   describe "on arista eos" do
 
+    let(:have_system_release) { true }
+    let(:have_redhat_release) { true }
     let(:have_eos_release) { true }
 
     before(:each) do
@@ -303,11 +305,11 @@ OS_RELEASE
     end
 
     it "should set platform to arista_eos" do
-      expect(File).to receive(:read).with("/etc/Eos-release").and_return("Arista Networks EOS 4.16.7M")
+      expect(File).to receive(:read).with("/etc/Eos-release").and_return("Arista Networks EOS 4.21.1.1F")
       @plugin.run
       expect(@plugin[:platform]).to eq("arista_eos")
       expect(@plugin[:platform_family]).to eq("fedora")
-      expect(@plugin[:platform_version]).to eq("4.16.7M")
+      expect(@plugin[:platform_version]).to eq("4.21.1.1F")
     end
   end
 
@@ -701,8 +703,39 @@ CISCO_RELEASE
   end
 
   describe "on suse" do
+    context "on openSUSE 15+" do
+
+      let(:have_suse_release) { false }
+      let(:have_os_release) { true }
+
+      let(:os_release_content) do
+        <<~OS_RELEASE
+          NAME="openSUSE Leap"
+          VERSION="15.0"
+          ID="opensuse-leap"
+          ID_LIKE="suse opensuse"
+          VERSION_ID="15.0"
+          PRETTY_NAME="openSUSE Leap 15.0"
+          ANSI_COLOR="0;32"
+          CPE_NAME="cpe:/o:opensuse:leap:15.0"
+OS_RELEASE
+      end
+
+      before do
+        expect(File).to_not receive(:read).with("/etc/SuSE-release")
+        expect(File).to receive(:read).with("/etc/os-release").and_return(os_release_content)
+      end
 
-    context "on versions that have /etc/os-release and no /etc/SuSE-release (e.g. SLES15)" do
+      it "correctly detects opensuseleap 15" do
+        @plugin.run
+        expect(@plugin[:platform]).to eq("opensuseleap")
+        expect(@plugin[:platform_version]).to eq("15.0")
+        expect(@plugin[:platform_family]).to eq("suse")
+      end
+
+    end
+
+    context "on SLES 15+" do
 
       let(:have_suse_release) { false }
       let(:have_os_release) { true }
@@ -732,7 +765,6 @@ OS_RELEASE
         expect(@plugin[:platform_version]).to eq("15")
         expect(@plugin[:platform_family]).to eq("suse")
       end
-
     end
 
     context "on versions that have both /etc/os-release and /etc/SuSE-release (e.g. SLES12)" do