Merge pull request #639 from ndpgroup/rhev_virt_detect

Add detection for RHEV (on Linux guests) to virtualization plugin

3 files changed, 22 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d2c9d67..53b63b2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Ohai Changelog
 
 ## Unreleased
+* [**James Flemer, NDP LLC**](https://github.com/jflemer-ndp):
+  - Add detection for RHEV (on Linux guests) to virtualization plugin
 * [**Shahul Khajamohideen**](https://github.com/sh9189):
   - Fixes Windows :CPU plugin inconsistencies with other platforms: modifies
   `cpu[:total]` to return total number of logical processors, adds `cpu[:cores]`
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb
index 6f7dad5d..fb433824 100644
--- a/lib/ohai/plugins/linux/virtualization.rb
+++ b/lib/ohai/plugins/linux/virtualization.rb
@@ -146,7 +146,7 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = "openstack"
         virtualization[:role] = "guest"
         virtualization[:systems][:openstack] = "guest"
-      when /Manufacturer: QEMU|Product Name: KVM/
+      when /Manufacturer: QEMU|Product Name: (KVM|RHEV)/
         virtualization[:system] = "kvm"
         virtualization[:role] = "guest"
         virtualization[:systems][:kvm] = "guest"
diff --git a/spec/unit/plugins/linux/virtualization_spec.rb b/spec/unit/plugins/linux/virtualization_spec.rb
index 8692fb7a..ab7bf274 100644
--- a/spec/unit/plugins/linux/virtualization_spec.rb
+++ b/spec/unit/plugins/linux/virtualization_spec.rb
@@ -246,6 +246,25 @@ KVM
       expect(plugin[:virtualization][:systems][:kvm]).to eq("guest")
     end
 
+    it "sets kvm guest if dmidecode detects RHEV" do
+      kvm_dmidecode=<<-RHEV
+System Information
+  Manufacturer: Red Hat
+  Product Name: RHEV Hypervisor
+  Version: 6.7-20150911.0.el6ev
+  Serial Number: 00000000-0000-0000-0000-000000000000
+  UUID: E7F1DC93-3DA1-4EC3-A6AB-F6904BA87985
+  Wake-up Type: Power Switch
+  SKU Number: Not Specified
+  Family: Red Hat Enterprise Linux
+RHEV
+      allow(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, kvm_dmidecode, ""))
+      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
+
     it "should run dmidecode and not set virtualization if nothing is detected" do
       allow(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, "", ""))
       plugin.run