Fix unit tests

The unit tests were broken by a change to openstacklib
Id09c3358c5843510e6a2a8c0e2d4aeb3607e098b which renamed some of the
resources in the openstacklib classes. The problem is that our tests in
this module should not have been testing what occurs within openstacklib
so this fix updates the tests to only check what we are doing within
this module.

Change-Id: I331e99e05357d21f78dd7ee0346598473e5b9791
Depends-On: I9d535ab38afea852559df2b3073bd4b74a2a3947

diff --git a/spec/acceptance/nodesets/centos-libvirt-x64.yml b/spec/acceptance/nodesets/centos-libvirt-x64.yml
new file mode 100644 (file)
index 0000000..5ffe864
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-libvirt-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  centos-libvirt-7-x64:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box: centos/7
+    box_url: https://vagrantcloud.com/centos/7
+    hypervisor: vagrant
+CONFIG:
+  log_level: debug
+  type: foss

diff --git a/spec/classes/ceilometer_wsgi_apache_spec.rb b/spec/classes/ceilometer_wsgi_apache_spec.rb
index b76ec65c4f046fa9fdccaa32e8f0815bc7417582..5f7f202e76e1caa8ca45bfbbe8528e97ef7ffd70 100644 (file)
--- a/spec/classes/ceilometer_wsgi_apache_spec.rb
+++ b/spec/classes/ceilometer_wsgi_apache_spec.rb
@@ -1,69 +1,35 @@
 require 'spec_helper'
 
 describe 'ceilometer::wsgi::apache' do
-
-  let :global_facts do
-    {
-      :os_workers => 8,
-      :concat_basedir => '/var/lib/puppet/concat',
-      :fqdn           => 'some.host.tld'
-    }
-  end
-
   let :pre_condition do
     "class { 'ceilometer': telemetry_secret => 's3cr3t' }"
   end
 
   shared_examples_for 'apache serving ceilometer with mod_wsgi' do
-    it { is_expected.to contain_service('httpd').with_name(platform_parameters[:httpd_service_name]) }
-    it { is_expected.to contain_class('ceilometer::params') }
-    it { is_expected.to contain_class('apache') }
-    it { is_expected.to contain_class('apache::mod::wsgi') }
-
-    describe 'with default parameters' do
-
-      it { is_expected.to contain_file("#{platform_parameters[:wsgi_script_path]}").with(
-        'ensure'  => 'directory',
-        'owner'   => 'ceilometer',
-        'group'   => 'ceilometer',
-        'require' => 'Package[httpd]'
-      )}
-
-
-      it { is_expected.to contain_file('ceilometer_wsgi').with(
-        'ensure'  => 'file',
-        'path'    => "#{platform_parameters[:wsgi_script_path]}/app",
-        'source'  => platform_parameters[:wsgi_script_source],
-        'owner'   => 'ceilometer',
-        'group'   => 'ceilometer',
-        'mode'    => '0644'
-      )}
-      it { is_expected.to contain_file('ceilometer_wsgi').that_requires("File[#{platform_parameters[:wsgi_script_path]}]") }
-
-      it { is_expected.to contain_apache__vhost('ceilometer_wsgi').with(
-        'servername'                  => 'some.host.tld',
-        'ip'                          => nil,
-        'port'                        => '8777',
-        'docroot'                     => "#{platform_parameters[:wsgi_script_path]}",
-        'docroot_owner'               => 'ceilometer',
-        'docroot_group'               => 'ceilometer',
-        'ssl'                         => 'true',
-        'wsgi_daemon_process'         => 'ceilometer',
-        'wsgi_daemon_process_options' => {
-          'user'         => 'ceilometer',
-          'group'        => 'ceilometer',
-          'processes'    => 1,
-          'threads'      => "#{global_facts[:os_workers]}",
-          'display-name' => 'ceilometer_wsgi',
-        },
-        'wsgi_process_group'          => 'ceilometer',
-        'wsgi_script_aliases'         => { '/' => "#{platform_parameters[:wsgi_script_path]}/app" },
-        'require'                     => 'File[ceilometer_wsgi]'
+    context 'with default parameters' do
+      it { is_expected.to contain_class('ceilometer::deps') }
+      it { is_expected.to contain_class('ceilometer::params') }
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::mod::wsgi') }
+      it { is_expected.to contain_class('apache::mod::ssl') }
+      it { is_expected.to contain_openstacklib__wsgi__apache('ceilometer_wsgi').with(
+        :bind_port           => 8777,
+        :group               => 'ceilometer',
+        :path                => '/',
+        :servername          => facts[:fqdn],
+        :ssl                 => true,
+        :threads             => facts[:os_workers],
+        :user                => 'ceilometer',
+        :workers             => 1,
+        :wsgi_daemon_process => 'ceilometer',
+        :wsgi_process_group  => 'ceilometer',
+        :wsgi_script_dir     => platform_params[:wsgi_script_path],
+        :wsgi_script_file    => 'app',
+        :wsgi_script_source  => platform_params[:wsgi_script_source],
       )}
-      it { is_expected.to contain_concat("#{platform_parameters[:httpd_ports_file]}") }
     end
 
-    describe 'when overriding parameters using different ports' do
+    context 'when overriding parameters using different ports' do
       let :params do
         {
           :servername                => 'dummy.host',
@@ -74,29 +40,28 @@ describe 'ceilometer::wsgi::apache' do
           :workers                   => 37,
         }
       end
-
-      it { is_expected.to contain_apache__vhost('ceilometer_wsgi').with(
-        'servername'                  => 'dummy.host',
-        'ip'                          => '10.42.51.1',
-        'port'                        => '12345',
-        'docroot'                     => "#{platform_parameters[:wsgi_script_path]}",
-        'docroot_owner'               => 'ceilometer',
-        'docroot_group'               => 'ceilometer',
-        'ssl'                         => 'false',
-        'wsgi_daemon_process'         => 'ceilometer',
-        'wsgi_daemon_process_options' => {
-            'user'         => 'ceilometer',
-            'group'        => 'ceilometer',
-            'processes'    => '37',
-            'threads'      => "#{global_facts[:os_workers]}",
-            'display-name' => 'ceilometer',
-        },
-        'wsgi_process_group'          => 'ceilometer',
-        'wsgi_script_aliases'         => { '/' => "#{platform_parameters[:wsgi_script_path]}/app" },
-        'require'                     => 'File[ceilometer_wsgi]'
+      it { is_expected.to contain_class('ceilometer::deps') }
+      it { is_expected.to contain_class('ceilometer::params') }
+      it { is_expected.to contain_class('apache') }
+      it { is_expected.to contain_class('apache::mod::wsgi') }
+      it { is_expected.to_not contain_class('apache::mod::ssl') }
+      it { is_expected.to contain_openstacklib__wsgi__apache('ceilometer_wsgi').with(
+        :bind_host                 => '10.42.51.1',
+        :bind_port                 => 12345,
+        :group                     => 'ceilometer',
+        :path                      => '/',
+        :servername                => 'dummy.host',
+        :ssl                       => false,
+        :threads                   => facts[:os_workers],
+        :user                      => 'ceilometer',
+        :workers                   => 37,
+        :wsgi_daemon_process       => 'ceilometer',
+        :wsgi_process_display_name => 'ceilometer',
+        :wsgi_process_group        => 'ceilometer',
+        :wsgi_script_dir           => platform_params[:wsgi_script_path],
+        :wsgi_script_file          => 'app',
+        :wsgi_script_source        => platform_params[:wsgi_script_source],
       )}
-
-      it { is_expected.to contain_concat("#{platform_parameters[:httpd_ports_file]}") }
     end
   end
 
@@ -112,7 +77,7 @@ describe 'ceilometer::wsgi::apache' do
         }))
       end
 
-      let :platform_parameters do
+      let :platform_params do
         case facts[:osfamily]
         when 'Debian'
          {