Merge pull request #42 from eole/feature/test-platform-debian-9-2018.3-py2

Feature/test platform debian 9 2018.3 py2

Author: baby-gnu

.travis.yml

@@ -31,7 +31,7 @@ env:
     # - INSTANCE: default-centos-7-2019-2-py3
     # - INSTANCE: default-fedora-29-2019-2-py3
     # - INSTANCE: default-opensuse-leap-15-2019-2-py3
-    # - INSTANCE: default-debian-9-2018-3-py2
+    - INSTANCE: default-debian-9-2018-3-py2
     # - INSTANCE: default-ubuntu-1604-2018-3-py2
     - INSTANCE: default-centos-7-2018-3-py2
     # - INSTANCE: default-fedora-29-2018-3-py2
@@ -46,12 +46,11 @@ env:
     # - INSTANCE: default-fedora-28-2017-7-py2
     # - INSTANCE: default-opensuse-leap-42-2017-7-py2
 
+script:
+  - bundle exec kitchen verify ${INSTANCE}
+
 jobs:
   include:
-    # Define the test stage
-    - stage: test
-      name: "Kitchen tests"
-      script: bundle exec kitchen verify ${INSTANCE}
     # Define the commitlint stage
     - stage: commitlint
       language: node_js

pillar.example

@@ -1,8 +1,8 @@
 libvirt:
   #lookup:
   # - override map.jinja and defaults.yml
-  daemon_opts:
-    libvirtd_opts: '-d'
+  #daemon_opts:
+  #  libvirtd_opts: '-d'
 
   libvirtd:
     listen_tls: 0

test/integration/default/controls/config_spec.rb

@@ -22,7 +22,7 @@
 control 'Libvirt configuration' do
   title 'verify applied configuration'
 
-  describe file('/etc/sysconfig/libvirtd') do
+  describe libvirt.daemon_config_file do
     it { should exist }
     its('content') { should match %r{This\sfile\sis\smanaged\sby\sSalt} }
   end

test/integration/default/controls/pkgs_spec.rb

@@ -4,12 +4,7 @@
 # Author: Daniel Dehennin <[email protected]>
 # Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
 #
-packages = {
-  'libvirt' => ['libvirt'],
-  'qemu' => ['qemu-kvm'],
-  'extra' => ['libguestfs'],
-  'python' => ['libvirt-python'],
-}
+packages = libvirt.packages
 
 control 'Libvirt packages' do
   title 'verify installed packages'

test/integration/default/inspec.yml

@@ -4,4 +4,5 @@ maintainer: Daniel Dehennin
 license: Apache-2.0
 summary: Verify that the libvirt formula is setup and configured correctly
 supports:
+  - os-name: debian
   - os-name: centos

test/integration/default/libraries/libvirt.rb

@@ -0,0 +1,56 @@
+# coding: utf-8
+#
+# libvirt.rb -- Libvirt InSpec resources
+# Author: Daniel Dehennin <[email protected]>
+# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
+#
+class LibvirtResource < Inspec.resource(1)
+  name 'libvirt'
+
+  supports platform_name: 'debian'
+  supports platform_name: 'centos'
+
+  def initialize
+    @packages = get_packages
+  end
+
+  def daemon_config_dir
+    return case inspec.os[:family]
+           when 'debian'
+             '/etc/default/'
+           when 'redhat'
+             '/etc/sysconfig'
+           else
+             raise Inspec::Exceptions::ResourceSkipped,
+                   "OS family #{inspec.os[:family]} not supported"
+           end
+  end
+
+  def daemon_config_file
+    return inspec.file(File.join(daemon_config_dir, 'libvirtd'))
+  end
+
+  def packages
+    return @packages
+  end
+
+  def get_packages
+    # defaults.yaml
+    packages = {
+      'libvirt' => ['libvirt'],
+      'qemu' => ['qemu-kvm'],
+      'extra' => ['libguestfs'],
+      'python' => ['libvirt-python'],
+    }
+
+    # osfamily.yaml / osmap.yaml
+    case inspec.os[:family]
+    when 'debian'
+      packages['libvirt'] = ['libvirt-daemon-system']
+      packages['extra'] = ['libguestfs0', 'libguestfs-tools', 'gnutls-bin', 'virt-top']
+      packages['python'] = ['python-libvirt']
+    end
+
+    return packages
+  end
+end

test/integration/default/libraries/libvirt_socket_admin.rb

@@ -7,6 +7,7 @@
 class LibvirtSocketAdminResource < Inspec.resource(1)
   name 'libvirt_socket_admin'
 
+  supports platform_name: 'debian'
   supports platform_name: 'centos'
 
   def initialize

test/integration/default/libraries/libvirt_socket_ro.rb

@@ -7,6 +7,7 @@
 class LibvirtSocketRoResource < Inspec.resource(1)
   name 'libvirt_socket_ro'
 
+  supports platform_name: 'debian'
   supports platform_name: 'centos'
 
   def initialize

test/integration/default/libraries/libvirt_socket_rw.rb

@@ -7,6 +7,7 @@
 class LibvirtSocketRwResource < Inspec.resource(1)
   name 'libvirt_socket_rw'
 
+  supports platform_name: 'debian'
   supports platform_name: 'centos'
 
   def initialize