Merge pull request #67 from baby-gnu/feature/support-centos-8

Feature/support centos 8

Author: myii

libvirt/osfingermap.yaml

@@ -30,3 +30,8 @@ Ubuntu-14.04:
 Ubuntu-16.04:
   libvirt_pkg: libvirt-bin
   libvirt_service: libvirt-bin
+
+## os: CentOS
+CentOS Linux-7:
+  python2_pkg: libvirt-python
+  python3_pkg: ~

libvirt/osmap.yaml

@@ -15,4 +15,5 @@ Fedora:
   python3_pkg: python3-libvirt
 
 CentOS:
-  python3_pkg: ~
+  python2_pkg: ~
+  python3_pkg: python3-libvirt

test/integration/share/libraries/libvirt.rb

@@ -16,7 +16,7 @@ class LibvirtResource < Inspec.resource(1)
   attr_reader :packages
 
   def initialize
-    @packages = build_packages
+    @packages = inspec.libvirt_packages.packages
   end
 
   def daemon_config_dir
@@ -34,75 +34,4 @@ def daemon_config_dir
   def daemon_config_file
     inspec.file(File.join(daemon_config_dir, 'libvirtd'))
   end
-
-  def build_packages
-    # defaults.yaml
-    packages = build_default_packages
-
-    packages.merge!(build_overwrite_packages)
-  end
-
-  def build_overwrite_packages
-    # osfamily.yaml / osmap.yaml
-    case inspec.os[:family]
-    when 'debian'
-      build_debian_packages
-
-    when 'fedora'
-      build_fedora_packages
-
-    when 'suse'
-      build_suse_packages
-
-    else
-      {}
-    end
-  end
-
-  def build_default_packages
-    {
-      'libvirt' => ['libvirt'],
-      'qemu' => ['qemu-kvm'],
-      'extra' => ['libguestfs'],
-      'python' => if inspec.salt_minion.python3?
-                    ['libvirt-python3']
-                  else
-                    ['libvirt-python']
-                  end
-    }
-  end
-
-  def build_debian_packages
-    {
-      'libvirt' => ['libvirt-daemon-system'],
-      'extra' => %w[libguestfs0 libguestfs-tools gnutls-bin virt-top],
-      'python' => if inspec.salt_minion.python3?
-                    ['python3-libvirt']
-                  else
-                    ['python-libvirt']
-                  end
-    }
-  end
-
-  def build_fedora_packages
-    {
-      'python' => if inspec.salt_minion.python3?
-                    ['python3-libvirt']
-                  else
-                    ['python2-libvirt']
-                  end
-    }
-  end
-
-  def build_suse_packages
-    {
-      'libvirt' => ['libvirt-daemon-qemu'],
-      'extra' => ['libguestfs0'],
-      'python' => if inspec.salt_minion.python3?
-                    ['python3-libvirt-python']
-                  else
-                    ['python2-libvirt-python']
-                  end
-    }
-  end
 end

test/integration/share/libraries/libvirt_packages.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+# libvirt.rb -- Libvirt InSpec resources
+# Author: Daniel Dehennin <[email protected]>
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
+
+class LibvirtPackagesResource < Inspec.resource(1)
+  name 'libvirt_packages'
+
+  supports platform_name: 'debian'
+  supports platform_name: 'ubuntu'
+  supports platform_name: 'centos'
+  supports platform_name: 'fedora'
+  supports platform_name: 'opensuse'
+
+  attr_reader :packages
+
+  def initialize
+    @packages = build_packages
+  end
+
+  def build_packages
+    # defaults.yaml
+    packages = build_default_packages
+
+    packages.merge!(build_os_family_packages)
+    packages.merge!(build_os_name_packages)
+  end
+
+  def build_os_family_packages
+    # osfamily.yaml / osmap.yaml
+    case inspec.os[:family]
+    when 'debian'
+      build_debian_packages
+
+    when 'fedora'
+      build_fedora_packages
+
+    when 'suse'
+      build_suse_packages
+
+    else
+      {}
+    end
+  end
+
+  def build_os_name_packages
+    # osfamily.yaml / osmap.yaml
+    case inspec.os[:name]
+    when 'centos'
+      build_centos_packages
+
+    else
+      {}
+    end
+  end
+
+  def build_default_packages
+    {
+      'libvirt' => ['libvirt'],
+      'qemu' => ['qemu-kvm'],
+      'extra' => ['libguestfs'],
+      'python' => if inspec.salt_minion.python3?
+                    ['libvirt-python3']
+                  else
+                    ['libvirt-python']
+                  end
+    }
+  end
+
+  def build_debian_packages
+    {
+      'libvirt' => ['libvirt-daemon-system'],
+      'extra' => %w[libguestfs0 libguestfs-tools gnutls-bin virt-top],
+      'python' => if inspec.salt_minion.python3?
+                    ['python3-libvirt']
+                  else
+                    ['python-libvirt']
+                  end
+    }
+  end
+
+  def build_fedora_packages
+    {
+      'python' => if inspec.salt_minion.python3?
+                    ['python3-libvirt']
+                  else
+                    ['python2-libvirt']
+                  end
+    }
+  end
+
+  def build_suse_packages
+    {
+      'libvirt' => ['libvirt-daemon-qemu'],
+      'extra' => ['libguestfs0'],
+      'python' => if inspec.salt_minion.python3?
+                    ['python3-libvirt-python']
+                  else
+                    ['python2-libvirt-python']
+                  end
+    }
+  end
+
+  def build_centos_packages
+    case inspec.os[:release]
+    when /^7/
+      if inspec.salt_minion.python3?
+        { 'python' => [] }
+      else
+        { 'python' => ['libvirt-python'] }
+      end
+    else
+      # Only python3 since CentOS 8
+      { 'python' => ['python3-libvirt'] }
+    end
+  end
+end