Fix rspec 3.x syntax

- Convert 'should' keyword to 'is_expected.to'

Change-Id: I6183a18223407c92350f8452c48fcbd1e16c5559
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>

spec/classes/cinder_keystone_auth_spec.rb

@@ -168,12 +168,12 @@ describe 'cinder::keystone::auth' do
       )
     end
 
-    it { should contain_keystone_user('cinder') }
-    it { should contain_keystone_user_role('cinder@services') }
-    it { should contain_keystone_service('cinder_service') }
-    it { should contain_keystone_service('cinder_service_v2') }
-    it { should contain_keystone_endpoint('RegionOne/cinder_service') }
-    it { should contain_keystone_endpoint('RegionOne/cinder_service_v2') }
+    it { is_expected.to contain_keystone_user('cinder') }
+    it { is_expected.to contain_keystone_user_role('cinder@services') }
+    it { is_expected.to contain_keystone_service('cinder_service') }
+    it { is_expected.to contain_keystone_service('cinder_service_v2') }
+    it { is_expected.to contain_keystone_endpoint('RegionOne/cinder_service') }
+    it { is_expected.to contain_keystone_endpoint('RegionOne/cinder_service_v2') }
 
   end
 

spec/classes/cinder_spec.rb

@@ -327,8 +327,8 @@ describe 'cinder' do
       }
     end
 
-    it { should contain_cinder_config('DEFAULT/enable_v1_api').with_value(false) }
-    it { should contain_cinder_config('DEFAULT/enable_v2_api').with_value(true) }
+    it { is_expected.to contain_cinder_config('DEFAULT/enable_v1_api').with_value(false) }
+    it { is_expected.to contain_cinder_config('DEFAULT/enable_v2_api').with_value(true) }
 
   end
 end

spec/classes/cinder_volume_dellsc_iscsi_spec.rb

@@ -48,7 +48,7 @@ describe 'cinder::volume::dellsc_iscsi' do
     end
 
     it 'configure dellsc_iscsi volume with additional configuration' do
-      should contain_cinder__backend__dellsc_iscsi('DEFAULT').with({
+      is_expected.to contain_cinder__backend__dellsc_iscsi('DEFAULT').with({
         :extra_options => {'dellsc_iscsi_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_emc_vnx_spec.rb

@@ -36,7 +36,7 @@ describe 'cinder::volume::emc_vnx' do
     end
 
     it 'configure emc vnx volume with additional configuration' do
-      should contain_cinder__backend__emc_vnx('DEFAULT').with({
+      is_expected.to contain_cinder__backend__emc_vnx('DEFAULT').with({
         :extra_options => {'emc_vnx_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_eqlx_spec.rb

@@ -39,7 +39,7 @@ describe 'cinder::volume::eqlx' do
     end
 
     it 'configure eqlx volume with additional configuration' do
-      should contain_cinder__backend__eqlx('DEFAULT').with({
+      is_expected.to contain_cinder__backend__eqlx('DEFAULT').with({
         :extra_options => {'eqlx_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_glusterfs_spec.rb

@@ -39,7 +39,7 @@ describe 'cinder::volume::glusterfs' do
       end
 
       it 'configure glusterfs volume with additional configuration' do
-        should contain_cinder__backend__glusterfs('DEFAULT').with({
+        is_expected.to contain_cinder__backend__glusterfs('DEFAULT').with({
           :extra_options => {'glusterfs_backend/param1' => {'value' => 'value1'}}
         })
       end

spec/classes/cinder_volume_hp3par_iscsi_spec.rb

@@ -19,14 +19,14 @@ describe 'cinder::volume::hp3par_iscsi' do
 
   describe 'hp3par_iscsi volume driver' do
     it 'configure hp3par_iscsi volume driver' do
-      should contain_cinder_config('DEFAULT/volume_driver').with_value('cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver')
-      should contain_cinder_config('DEFAULT/hp3par_api_url').with_value('https://172.0.0.2:8080/api/v1')
-      should contain_cinder_config('DEFAULT/hp3par_username').with_value('3paradm')
-      should contain_cinder_config('DEFAULT/hp3par_password').with_value('password')
-      should contain_cinder_config('DEFAULT/hp3par_iscsi_ips').with_value('172.0.0.3')
-      should contain_cinder_config('DEFAULT/san_ip').with_value('172.0.0.2')
-      should contain_cinder_config('DEFAULT/san_login').with_value('3paradm')
-      should contain_cinder_config('DEFAULT/san_password').with_value('password')
+      is_expected.to contain_cinder_config('DEFAULT/volume_driver').with_value('cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver')
+      is_expected.to contain_cinder_config('DEFAULT/hp3par_api_url').with_value('https://172.0.0.2:8080/api/v1')
+      is_expected.to contain_cinder_config('DEFAULT/hp3par_username').with_value('3paradm')
+      is_expected.to contain_cinder_config('DEFAULT/hp3par_password').with_value('password')
+      is_expected.to contain_cinder_config('DEFAULT/hp3par_iscsi_ips').with_value('172.0.0.3')
+      is_expected.to contain_cinder_config('DEFAULT/san_ip').with_value('172.0.0.2')
+      is_expected.to contain_cinder_config('DEFAULT/san_login').with_value('3paradm')
+      is_expected.to contain_cinder_config('DEFAULT/san_password').with_value('password')
     end
   end
 
@@ -36,7 +36,7 @@ describe 'cinder::volume::hp3par_iscsi' do
     end
 
     it 'configure hp3par_iscsi volume with additional configuration' do
-      should contain_cinder__backend__hp3par_iscsi('DEFAULT').with({
+      is_expected.to contain_cinder__backend__hp3par_iscsi('DEFAULT').with({
         :extra_options => {'hp3par_iscsi_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_iscsi_spec.rb

@@ -91,7 +91,7 @@ describe 'cinder::volume::iscsi' do
     let(:params) { req_params.merge({:extra_options => {'iscsi_backend/param1' => {'value' => 'value1'}}}) }
 
     it 'configure iscsi volume with additional configuration' do
-      should contain_cinder__backend__iscsi('DEFAULT').with({
+      is_expected.to contain_cinder__backend__iscsi('DEFAULT').with({
         :extra_options => {'iscsi_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_netapp_spec.rb

@@ -89,7 +89,7 @@ describe 'cinder::volume::netapp' do
     end
 
     it 'configure netapp volume with additional configuration' do
-      should contain_cinder__backend__netapp('DEFAULT').with({
+      is_expected.to contain_cinder__backend__netapp('DEFAULT').with({
         :extra_options => {'netapp_backend/param1' => {'value' => 'value1'}}
       })  
     end

spec/classes/cinder_volume_nexenta_spec.rb

@@ -49,7 +49,7 @@ describe 'cinder::volume::nexenta' do
     end
 
     it 'configure nexenta volume with additional configuration' do
-      should contain_cinder__backend__nexenta('DEFAULT').with({
+      is_expected.to contain_cinder__backend__nexenta('DEFAULT').with({
         :extra_options => {'nexenta_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_nfs_spec.rb

@@ -47,7 +47,7 @@ describe 'cinder::volume::nfs' do
     end
 
     it 'configure nfs volume with additional configuration' do
-      should contain_cinder__backend__nfs('DEFAULT').with({
+      is_expected.to contain_cinder__backend__nfs('DEFAULT').with({
         :extra_options => {'nfs_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_quobyte_spec.rb

@@ -12,13 +12,13 @@ describe 'cinder::volume::quobyte' do
     end
 
     it 'configures quobyte volume driver' do
-      should contain_cinder_config('DEFAULT/volume_driver').with_value(
+      is_expected.to contain_cinder_config('DEFAULT/volume_driver').with_value(
         'cinder.volume.drivers.quobyte.QuobyteDriver')
-      should contain_cinder_config('DEFAULT/quobyte_volume_url').with_value(
+      is_expected.to contain_cinder_config('DEFAULT/quobyte_volume_url').with_value(
         'quobyte://quobyte.cluster.example.com/volume-name')
-      should contain_cinder_config('DEFAULT/quobyte_qcow2_volumes').with_value(
+      is_expected.to contain_cinder_config('DEFAULT/quobyte_qcow2_volumes').with_value(
         false)
-      should contain_cinder_config('DEFAULT/quobyte_sparsed_volumes').with_value(
+      is_expected.to contain_cinder_config('DEFAULT/quobyte_sparsed_volumes').with_value(
         true)
     end
 

spec/classes/cinder_volume_rbd_spec.rb

@@ -58,7 +58,7 @@ describe 'cinder::volume::rbd' do
       params.merge!({:extra_options => {'rbd_backend/param1' => {'value' => 'value1'}}})
     end
     it 'configure rbd volume with additional configuration' do
-      should contain_cinder__backend__rbd('DEFAULT').with({
+      is_expected.to contain_cinder__backend__rbd('DEFAULT').with({
         :extra_options => {'rbd_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_san_spec.rb

@@ -49,7 +49,7 @@ describe 'cinder::volume::san' do
     end
 
     it 'configure san volume with additional configuration' do
-      should contain_cinder__backend__san('DEFAULT').with({
+      is_expected.to contain_cinder__backend__san('DEFAULT').with({
         :extra_options => {'san_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_solidfire_spec.rb

@@ -33,7 +33,7 @@ describe 'cinder::volume::solidfire' do
     end
 
     it 'configure solidfire volume with additional configuration' do
-      should contain_cinder__backend__solidfire('DEFAULT').with({
+      is_expected.to contain_cinder__backend__solidfire('DEFAULT').with({
         :extra_options => {'solidfire_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/classes/cinder_volume_vmdk_spec.rb

@@ -66,7 +66,7 @@ describe 'cinder::volume::vmdk' do
     end
 
     it 'configure vmdk volume with additional configuration' do
-      should contain_cinder__backend__vmdk('DEFAULT').with({
+      is_expected.to contain_cinder__backend__vmdk('DEFAULT').with({
         :extra_options => {'vmdk_backend/param1' => {'value' => 'value1'}}
       })
     end

spec/defines/cinder_backend_dellsc_iscsi_spec.rb

@@ -48,7 +48,7 @@ describe 'cinder::backend::dellsc_iscsi' do
     end
 
     it 'configure dellsc_iscsi backend with additional configuration' do
-      should contain_cinder_config('dellsc_iscsi/param1').with({
+      is_expected.to contain_cinder_config('dellsc_iscsi/param1').with({
         :value => 'value1'
       })
     end

spec/defines/cinder_backend_emc_vnx_spec.rb

@@ -38,7 +38,7 @@ describe 'cinder::backend::emc_vnx' do
     end
 
     it 'configure emc vnx backend with additional configuration' do
-      should contain_cinder_config('emc/param1').with({
+      is_expected.to contain_cinder_config('emc/param1').with({
         :value => 'value1',
       })
     end

spec/defines/cinder_backend_eqlx_spec.rb

@@ -40,7 +40,7 @@ describe 'cinder::backend::eqlx' do
     end
 
     it 'configure eqlx backend with additional configuration' do
-      should contain_cinder_config('eqlx-1/param1').with({
+      is_expected.to contain_cinder_config('eqlx-1/param1').with({
         :value => 'value1',
       })
     end

spec/defines/cinder_backend_glusterfs_spec.rb

@@ -45,7 +45,7 @@ describe 'cinder::backend::glusterfs' do
       end
 
       it 'configure glusterfs backend with additional configuration' do
-        should contain_cinder_config('mygluster/param1').with({
+        is_expected.to contain_cinder_config('mygluster/param1').with({
           :value => 'value1'
         })
       end

spec/defines/cinder_backend_hp3par_iscsi_spec.rb

@@ -21,14 +21,14 @@ describe 'cinder::backend::hp3par_iscsi' do
 
   describe 'hp3par_iscsi volume driver' do
     it 'configure hp3par_iscsi volume driver' do
-      should contain_cinder_config('hp3par_iscsi/volume_driver').with_value('cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver')
-      should contain_cinder_config('hp3par_iscsi/hp3par_api_url').with_value('https://172.0.0.2:8080/api/v1')
-      should contain_cinder_config('hp3par_iscsi/hp3par_username').with_value('3paradm')
-      should contain_cinder_config('hp3par_iscsi/hp3par_password').with_value('password')
-      should contain_cinder_config('hp3par_iscsi/hp3par_iscsi_ips').with_value('172.0.0.3')
-      should contain_cinder_config('hp3par_iscsi/san_ip').with_value('172.0.0.2')
-      should contain_cinder_config('hp3par_iscsi/san_login').with_value('3paradm')
-      should contain_cinder_config('hp3par_iscsi/san_password').with_value('password')
+      is_expected.to contain_cinder_config('hp3par_iscsi/volume_driver').with_value('cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver')
+      is_expected.to contain_cinder_config('hp3par_iscsi/hp3par_api_url').with_value('https://172.0.0.2:8080/api/v1')
+      is_expected.to contain_cinder_config('hp3par_iscsi/hp3par_username').with_value('3paradm')
+      is_expected.to contain_cinder_config('hp3par_iscsi/hp3par_password').with_value('password')
+      is_expected.to contain_cinder_config('hp3par_iscsi/hp3par_iscsi_ips').with_value('172.0.0.3')
+      is_expected.to contain_cinder_config('hp3par_iscsi/san_ip').with_value('172.0.0.2')
+      is_expected.to contain_cinder_config('hp3par_iscsi/san_login').with_value('3paradm')
+      is_expected.to contain_cinder_config('hp3par_iscsi/san_password').with_value('password')
     end
   end
 
@@ -38,7 +38,7 @@ describe 'cinder::backend::hp3par_iscsi' do
     end
 
     it 'configure hp3par_iscsi backend with additional configuration' do
-      should contain_cinder_config('hp3par_iscsi/param1').with({
+      is_expected.to contain_cinder_config('hp3par_iscsi/param1').with({
         :value => 'value1',
       })
     end

spec/defines/cinder_backend_iscsi_spec.rb

@@ -75,7 +75,7 @@ describe 'cinder::backend::iscsi' do
     end
 
     it 'configure iscsi backend with additional configuration' do
-      should contain_cinder_config('hippo/param1').with({
+      is_expected.to contain_cinder_config('hippo/param1').with({
         :value => 'value1',
       })
     end

spec/defines/cinder_backend_netapp_spec.rb

@@ -78,7 +78,7 @@ describe 'cinder::backend::netapp' do
     end
 
     it 'sets use_multipath_for_image_xfer to true' do
-      should contain_cinder_config('netapp/use_multipath_for_image_xfer').with({
+      is_expected.to contain_cinder_config('netapp/use_multipath_for_image_xfer').with({
         :value => 'true'
       })
     end
@@ -90,7 +90,7 @@ describe 'cinder::backend::netapp' do
     end
 
     it 'sets the nfs mount options' do
-      should contain_cinder_config('netapp/nfs_mount_options').with({
+      is_expected.to contain_cinder_config('netapp/nfs_mount_options').with({
         :value => 'rw,proto=tcp,sec=sys'
       })
     end
@@ -102,7 +102,7 @@ describe 'cinder::backend::netapp' do
     end
 
     it 'configure netapp backend with additional configuration' do
-      should contain_cinder_config('netapp/param1').with({
+      is_expected.to contain_cinder_config('netapp/param1').with({
         :value => 'value1'
       })
     end

spec/defines/cinder_backend_nexenta_spec.rb

@@ -43,7 +43,7 @@ describe 'cinder::backend::nexenta' do
     end
 
     it 'configure nexenta backend with additional configuration' do
-      should contain_cinder_config('nexenta/param1').with({
+      is_expected.to contain_cinder_config('nexenta/param1').with({
         :value => 'value1'
       })
     end

spec/defines/cinder_backend_nfs_spec.rb

@@ -52,7 +52,7 @@ describe 'cinder::backend::nfs' do
     end
 
     it 'configure nfs backend with additional configuration' do
-      should contain_cinder_config('hippo/param1').with({
+      is_expected.to contain_cinder_config('hippo/param1').with({
         :value => 'value1',
       })
     end

spec/defines/cinder_backend_quobyte_spec.rb

@@ -14,13 +14,13 @@ describe 'cinder::backend::quobyte' do
     end
 
     it 'configures quobyte volume driver' do
-      should contain_cinder_config('myquobyte/volume_driver').with_value(
+      is_expected.to contain_cinder_config('myquobyte/volume_driver').with_value(
         'cinder.volume.drivers.quobyte.QuobyteDriver')
-      should contain_cinder_config('myquobyte/quobyte_volume_url').with_value(
+      is_expected.to contain_cinder_config('myquobyte/quobyte_volume_url').with_value(
         'quobyte://quobyte.cluster.example.com/volume-name')
-      should contain_cinder_config('myquobyte/quobyte_qcow2_volumes').with_value(
+      is_expected.to contain_cinder_config('myquobyte/quobyte_qcow2_volumes').with_value(
         false)
-      should contain_cinder_config('myquobyte/quobyte_sparsed_volumes').with_value(
+      is_expected.to contain_cinder_config('myquobyte/quobyte_sparsed_volumes').with_value(
         true)
     end
 

spec/defines/cinder_backend_rbd_spec.rb

@@ -76,7 +76,7 @@ describe 'cinder::backend::rbd' do
       end
 
       it 'configure rbd backend with additional configuration' do
-        should contain_cinder_config('rbd-ssd/param1').with({
+        is_expected.to contain_cinder_config('rbd-ssd/param1').with({
           :value => 'value1'
         })
       end

spec/defines/cinder_backend_san_spec.rb

@@ -44,7 +44,7 @@ describe 'cinder::backend::san' do
     end
 
     it 'configure san backend with additional configuration' do
-      should contain_cinder_config('mysan/param1').with({
+      is_expected.to contain_cinder_config('mysan/param1').with({
         :value => 'value1'
       })
     end

spec/defines/cinder_backend_solidfire_spec.rb

@@ -34,7 +34,7 @@ describe 'cinder::backend::solidfire' do
     end
 
     it 'configure solidfire backend with additional configuration' do
-      should contain_cinder_config('solidfire/param1').with({
+      is_expected.to contain_cinder_config('solidfire/param1').with({
         :value => 'value1',
       })
     end

spec/defines/cinder_backend_vmdk_spec.rb

@@ -63,7 +63,7 @@ describe 'cinder::backend::vmdk' do
     end
 
     it 'configure vmdk backend with additional configuration' do
-      should contain_cinder_config('hippo/param1').with({
+      is_expected.to contain_cinder_config('hippo/param1').with({
         :value => 'value1'
       })
     end