Merge "Update tests to leverage rspec-puppet-facts"

spec/classes/cinder_api_spec.rb

@@ -2,15 +2,10 @@ require 'spec_helper'
 
 describe 'cinder::api' do
 
+  shared_examples_for 'cinder api' do
     let :req_params do
       {:keystone_password => 'foo'}
     end
-  let :facts do
-    @default_facts.merge({
-     :osfamily       => 'Debian',
-     :processorcount => 8
-    })
-  end
 
     describe 'with only required params' do
       let :params do
@@ -288,5 +283,17 @@ describe 'cinder::api' do
         is_expected.to contain_cinder_config('keystone_authtoken/auth_uri').with_value("https://localhost:5000/")
       end
     end
+  end
 
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
+      end
+
+      it_configures 'cinder api'
+    end
+  end
 end

spec/classes/cinder_backends_spec.rb

@@ -62,20 +62,16 @@ describe 'cinder::backends' do
 
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      { :osfamily => 'Debian' }
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts)
       end
 
       it_configures 'cinder backends'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      { :osfamily => 'RedHat' }
-    end
-
-    it_configures 'cinder backends'
   end
 
 end

spec/classes/cinder_backup_ceph_spec.rb

@@ -70,20 +70,15 @@ describe 'cinder::backup::ceph' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      { :osfamily => 'Debian' }
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({}))
       end
 
       it_configures 'cinder backup with ceph'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      { :osfamily => 'RedHat' }
   end
-
-    it_configures 'cinder backup with ceph'
-  end
-
 end

spec/classes/cinder_backup_nfs_spec.rb

@@ -67,19 +67,15 @@ describe 'cinder::backup::nfs' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({:osfamily => 'Debian'})
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'cinder backup with nfs'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({:osfamily => 'RedHat'})
-    end
-
-    it_configures 'cinder backup with nfs'
   end
 end

spec/classes/cinder_backup_spec.rb

@@ -76,29 +76,24 @@ describe 'cinder::backup' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge!({ :osfamily => 'Debian' })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       let :platform_params do
+        if facts[:osfamily] == 'Debian'
           { :backup_package => 'cinder-backup',
             :backup_service => 'cinder-backup' }
-    end
-
-    it_configures 'cinder backup'
-  end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge!({ :osfamily => 'RedHat' })
-    end
-
-    let :platform_params do
+        else
           { :backup_service => 'opentack-cinder-backup' }
         end
+      end
 
       it_configures 'cinder backup'
     end
-
+  end
 end

spec/classes/cinder_backup_swift_spec.rb

@@ -74,20 +74,16 @@ describe 'cinder::backup::swift' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'cinder backup with swift'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-
-    it_configures 'cinder backup with swift'
   end
 
 end

spec/classes/cinder_client_spec.rb

@@ -27,19 +27,15 @@ describe 'cinder::client' do
 
   end
 
-  context 'on Debian platform' do
-    let :facts do
-      { :osfamily => 'Debian' }
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'cinder client'
     end
-
-  context 'on RedHat platform' do
-    let :facts do
-      { :osfamily => 'RedHat' }
-    end
-
-    it_configures 'cinder client'
   end
 end

spec/classes/cinder_db_spec.rb

@@ -69,10 +69,10 @@ describe 'cinder::db' do
 
   context 'on Debian platforms' do
     let :facts do
-    @default_facts.merge({
+      OSDefaults.get_facts({
         :osfamily => 'Debian',
         :operatingsystem => 'Debian',
-      :operatingsystemrelease => 'jessie',
+        :operatingsystemrelease => 'jessie'
       })
     end
 
@@ -95,7 +95,7 @@ describe 'cinder::db' do
 
   context 'on Redhat platforms' do
     let :facts do
-    @default_facts.merge({
+      OSDefaults.get_facts({
         :osfamily => 'RedHat',
         :operatingsystemrelease => '7.1',
       })

spec/classes/cinder_db_sync_spec.rb

@@ -34,30 +34,19 @@ describe 'cinder::db::sync' do
 
   end
 
-
-  context 'on a RedHat osfamily' do
-    let :facts do
-      {
-        :osfamily                 => 'RedHat',
-        :operatingsystemrelease   => '7.0',
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({
+          :processorcount => 8,
           :concat_basedir => '/var/lib/puppet/concat'
-      }
+        }))
       end
 
       it_configures 'cinder-dbsync'
     end
-
-  context 'on a Debian osfamily' do
-    let :facts do
-      {
-        :operatingsystemrelease => '7.8',
-        :operatingsystem        => 'Debian',
-        :osfamily               => 'Debian',
-        :concat_basedir => '/var/lib/puppet/concat'
-      }
-    end
-
-    it_configures 'cinder-dbsync'
   end
 
 end

spec/classes/cinder_glance_spec.rb

@@ -66,20 +66,16 @@ describe 'cinder::glance' do
      end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'cinder with glance'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-
-    it_configures 'cinder with glance'
   end
 
 end

spec/classes/cinder_logging_spec.rb

@@ -109,20 +109,16 @@ describe 'cinder::logging' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'cinder-logging'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-
-    it_configures 'cinder-logging'
   end
 
 end

spec/classes/cinder_policy_spec.rb

@@ -23,19 +23,16 @@ describe 'cinder::policy' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      { :osfamily => 'Debian' }
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'cinder policies'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      { :osfamily => 'RedHat' }
   end
 
-    it_configures 'cinder policies'
-  end
 end

spec/classes/cinder_quota_spec.rb

@@ -41,20 +41,16 @@ describe 'cinder::quota' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'cinder quota'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-
-    it_configures 'cinder quota'
   end
 
 end

spec/classes/cinder_scheduler_filter_spec.rb

@@ -46,20 +46,16 @@ describe 'cinder::scheduler::filter' do
 
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'cinder scheduler filter'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-
-    it_configures 'cinder scheduler filter'
   end
 
 end

spec/classes/cinder_scheduler_spec.rb

@@ -5,7 +5,7 @@ describe 'cinder::scheduler' do
   describe 'on debian platforms' do
 
     let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
+      OSDefaults.get_facts({ :osfamily => 'Debian' })
     end
 
     describe 'with default parameters' do
@@ -57,7 +57,7 @@ describe 'cinder::scheduler' do
   describe 'on rhel platforms' do
 
     let :facts do
-      { :osfamily => 'RedHat' }
+      OSDefaults.get_facts({ :osfamily => 'RedHat' })
     end
 
     describe 'with default parameters' do

spec/classes/cinder_spec.rb

@@ -9,7 +9,7 @@ describe 'cinder' do
   end
 
   let :facts do
-    @default_facts.merge({
+    OSDefaults.get_facts({
       :osfamily => 'Debian',
       :operatingsystem => 'Debian',
       :operatingsystemrelease => 'jessie',

spec/classes/cinder_volume_dellsc_iscsi_spec.rb

@@ -23,7 +23,7 @@ describe 'cinder::volume::dellsc_iscsi' do
   end
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
    shared_examples_for 'dellsc_iscsi volume driver' do

spec/classes/cinder_volume_eqlx_spec.rb

@@ -18,7 +18,7 @@ describe 'cinder::volume::eqlx' do
   end
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
   describe 'eqlx volume driver' do

spec/classes/cinder_volume_glusterfs_spec.rb

@@ -40,20 +40,16 @@ describe 'cinder::volume::glusterfs' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'glusterfs volume driver'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-
-    it_configures 'glusterfs volume driver'
   end
 
 end

spec/classes/cinder_volume_gpfs_spec.rb

@@ -9,7 +9,7 @@ describe 'cinder::volume::gpfs' do
   end
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
   context 'gpfs volume driver' do
 

spec/classes/cinder_volume_iscsi_spec.rb

@@ -7,7 +7,7 @@ describe 'cinder::volume::iscsi' do
   end
 
   let :facts do
-    @default_facts.merge({:osfamily => 'Debian'})
+    OSDefaults.get_facts({:osfamily => 'Debian'})
   end
 
   describe 'with default params' do

spec/classes/cinder_volume_netapp_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'cinder::volume::netapp' do
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
   let :params do

spec/classes/cinder_volume_nfs_spec.rb

@@ -16,7 +16,7 @@ describe 'cinder::volume::nfs' do
   end
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
   describe 'nfs volume driver' do

spec/classes/cinder_volume_quobyte_spec.rb

@@ -24,20 +24,16 @@ describe 'cinder::volume::quobyte' do
 
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      { :osfamily => 'Debian' }
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'quobyte volume driver'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      { :osfamily => 'RedHat' }
-    end
-
-    it_configures 'quobyte volume driver'
   end
 
 end

spec/classes/cinder_volume_rbd_spec.rb

@@ -25,7 +25,7 @@ describe 'cinder::volume::rbd' do
   end
 
   let :facts do
-    @default_facts.merge({:osfamily => 'Debian'})
+    OSDefaults.get_facts({:osfamily => 'Debian'})
   end
 
   describe 'rbd volume driver' do

spec/classes/cinder_volume_spec.rb

@@ -7,7 +7,7 @@ describe 'cinder::volume' do
   end
 
   let :facts do
-    @default_facts.merge({:osfamily => 'Debian'})
+    OSDefaults.get_facts({:osfamily => 'Debian'})
   end
 
   it { is_expected.to contain_package('cinder-volume').with_ensure('present') }

spec/classes/cinder_volume_vmdk_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'cinder::volume::vmdk' do
 
   let :facts do
-    @default_facts.merge({:osfamily => 'Debian'})
+    OSDefaults.get_facts({:osfamily => 'Debian'})
   end
 
   let :params do

spec/defines/cinder_backend_dellsc_iscsi_spec.rb

@@ -27,7 +27,7 @@ describe 'cinder::backend::dellsc_iscsi' do
   end
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
   shared_examples_for 'dellsc_iscsi volume driver' do

spec/defines/cinder_backend_glusterfs_spec.rb

@@ -6,7 +6,7 @@ describe 'cinder::backend::glusterfs' do
     let(:title) {'mygluster'}
 
     let :facts do
-      @default_facts.merge({})
+      OSDefaults.get_facts({})
     end
 
     let :params do
@@ -52,20 +52,15 @@ describe 'cinder::backend::glusterfs' do
     end
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      { :osfamily => 'Debian' }
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'glusterfs volume driver'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      { :osfamily => 'RedHat' }
   end
-
-    it_configures 'glusterfs volume driver'
-  end
-
 end

spec/defines/cinder_backend_gpfs_spec.rb

@@ -29,7 +29,7 @@ describe 'cinder::backend::gpfs' do
   end
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
   shared_examples_for 'gpfs volume driver' do

spec/defines/cinder_backend_iscsi_spec.rb

@@ -11,7 +11,7 @@ describe 'cinder::backend::iscsi' do
   end
 
   let :facts do
-    @default_facts.merge({:osfamily => 'Debian'})
+    OSDefaults.get_facts({:osfamily => 'Debian'})
   end
 
   let :params do

spec/defines/cinder_backend_netapp_spec.rb

@@ -5,7 +5,7 @@ describe 'cinder::backend::netapp' do
   let(:title) {'netapp'}
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
   let :params do

spec/defines/cinder_backend_quobyte_spec.rb

@@ -26,20 +26,16 @@ describe 'cinder::backend::quobyte' do
 
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      { :osfamily => 'Debian' }
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({:processorcount => 8}))
       end
 
       it_configures 'quobyte volume driver'
     end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      { :osfamily => 'RedHat' }
-    end
-
-    it_configures 'quobyte volume driver'
   end
 
 end

spec/defines/cinder_backend_rbd_spec.rb

@@ -5,7 +5,7 @@ describe 'cinder::backend::rbd' do
   let(:title) {'rbd-ssd'}
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
   let :req_params do

spec/defines/cinder_backend_vmdk_spec.rb

@@ -5,7 +5,7 @@ describe 'cinder::backend::vmdk' do
   let(:title) { 'hippo' }
 
   let :facts do
-    @default_facts.merge({})
+    OSDefaults.get_facts({})
   end
 
   let :params do