openstack/puppet-trove
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2016-11-12 01:32:21 +00:00
committed by Gerrit Code Review
parent 287ef4dfe2 e8be948eb7
commit 29c19ff637
14 changed files with 378 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spec/classes/trove_api_spec.rb
View File

@@ -290,36 +290,26 @@ describe 'trove::api' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:os_workers => 8,
})
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({ :os_workers => 8 }))
end
let :platform_params do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :api_package_name => 'trove-api',
:api_service_name => 'trove-api' }
end
it_configures 'trove-api'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'RedHat',
:os_workers => 8,
})
end
let :platform_params do
when 'RedHat'
{ :api_package_name => 'openstack-trove-api',
:api_service_name => 'openstack-trove-api' }
end
end
it_configures 'trove-api'
end
end
end

15
spec/classes/trove_client_spec.rb
View File

@@ -37,19 +37,16 @@ describe 'trove::client' 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())
end
it_configures 'trove client'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'trove client'
end
end

34
spec/classes/trove_conductor_spec.rb
View File

@@ -194,36 +194,26 @@ describe 'trove::conductor' do
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:os_workers => 8,
})
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({ :os_workers => 8 }))
end
let :platform_params do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :conductor_package_name => 'trove-conductor',
:conductor_service_name => 'trove-conductor' }
end
it_configures 'trove-conductor'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'RedHat',
:os_workers => 8,
})
end
let :platform_params do
when 'RedHat'
{ :conductor_package_name => 'openstack-trove-conductor',
:conductor_service_name => 'openstack-trove-conductor' }
end
end
it_configures 'trove-conductor'
end
end
end

15
spec/classes/trove_config_spec.rb
View File

@@ -2,6 +2,7 @@ require 'spec_helper'
describe 'trove::config' do
shared_examples_for 'trove::config' do
let :params do
{ :trove_config => {
'DEFAULT/foo' => { 'value' => 'fooValue' },
@@ -60,4 +61,18 @@ describe 'trove::config' do
is_expected.to contain_trove_api_paste_ini('DEFAULT/bar2').with_value('barValue')
is_expected.to contain_trove_api_paste_ini('DEFAULT/baz2').with_ensure('absent')
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())
end
it_configures 'trove::config'
end
end
end

15
spec/classes/trove_db_mysql_spec.rb
View File

@@ -91,19 +91,16 @@ describe 'trove::db::mysql' 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())
end
it_configures 'trove mysql database'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'trove mysql database'
end
end

5
spec/classes/trove_db_postgresql_spec.rb
View File

@@ -29,10 +29,7 @@ describe 'trove::db::postgresql' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({
:os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat'
}))
facts.merge(OSDefaults.get_facts())
end
it_configures 'trove::db::postgresql'

36
spec/classes/trove_db_spec.rb
View File

@@ -73,17 +73,7 @@ describe 'trove::db' do
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => 'jessie',
})
end
it_configures 'trove::db'
shared_examples_for 'trove::db on Debian platforms' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://trove:trove@localhost/trove', }
@@ -99,16 +89,7 @@ describe 'trove::db' do
end
end
context 'on Redhat platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'RedHat',
:operatingsystemrelease => '7.1',
})
end
it_configures 'trove::db'
shared_examples_for 'trove::db on RedHat platforms' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://trove:trove@localhost/trove', }
@@ -118,4 +99,17 @@ describe 'trove::db' do
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())
end
it_configures 'trove::db'
it_configures "trove::db on #{facts[:osfamily]} platforms"
end
end
end

17
spec/classes/trove_deps_spec.rb
View File

@@ -2,6 +2,8 @@ require 'spec_helper'
describe 'trove::deps' do
shared_examples_for 'trove::deps' do
context 'defaults' do
it 'set up the anchors' do
is_expected.to contain_anchor('trove::install::begin')
is_expected.to contain_anchor('trove::install::end')
@@ -14,4 +16,19 @@ describe 'trove::deps' do
is_expected.to contain_anchor('trove::service::begin')
is_expected.to contain_anchor('trove::service::end')
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())
end
it_configures 'trove::deps'
end
end
end

34
spec/classes/trove_guestagent_spec.rb
View File

@@ -217,36 +217,26 @@ describe 'trove::guestagent' do
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:os_workers => 8
})
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
let :platform_params do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :guestagent_package_name => 'trove-guestagent',
:guestagent_service_name => 'trove-guestagent' }
end
it_configures 'trove-guestagent'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'RedHat',
:os_workers => 8
})
end
let :platform_params do
when 'RedHat'
{ :guestagent_package_name => 'openstack-trove-guestagent',
:guestagent_service_name => 'openstack-trove-guestagent' }
end
end
it_configures 'trove-guestagent'
end
end
end

37
spec/classes/trove_init_spec.rb
View File

@@ -41,30 +41,35 @@ describe 'trove' do
is_expected.to contain_trove_config('DEFAULT/swift_url').with_value('http://localhost:8080/v1/AUTH_')
is_expected.to contain_trove_config('DEFAULT/neutron_url').with_value('http://localhost:9696/')
}
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
end
it_configures 'trove'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it 'installs common package' do
is_expected.to contain_package('trove').with(
:name => 'openstack-trove',
:name => platform_params[:package_name],
:ensure => 'present',
:tag => ['openstack', 'trove-package'],
)
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())
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :package_name => 'trove-common', }
when 'RedHat'
{ :package_name => 'openstack-trove', }
end
end
it_configures 'trove'
end
end
end

33
spec/classes/trove_keystone_auth_spec.rb
View File

@@ -22,11 +22,8 @@ require 'spec_helper'
describe 'trove::keystone::auth' do
let :facts do
@default_facts.merge({ :osfamily => 'Debian' })
end
describe 'with default class parameters' do
shared_examples_for 'trove::keystone::auth' do
context 'with default class parameters' do
let :params do
{ :password => 'trove_password',
:tenant => 'foobar' }
@@ -55,7 +52,7 @@ describe 'trove::keystone::auth' do
) }
end
describe 'when configuring trove-server' do
context 'when configuring trove-server' do
let :pre_condition do
"class { 'trove::server': auth_password => 'test' }"
end
@@ -66,7 +63,7 @@ describe 'trove::keystone::auth' do
end
end
describe 'when overriding endpoint URLs' do
context 'when overriding endpoint URLs' do
let :params do
{ :password => 'passw0rd',
:public_url => 'https://10.10.10.10:80/v1.0/%(tenant_id)s',
@@ -82,7 +79,7 @@ describe 'trove::keystone::auth' do
) }
end
describe 'when overriding auth name' do
context 'when overriding auth name' do
let :params do
{ :password => 'foo',
:auth_name => 'trovey' }
@@ -94,7 +91,7 @@ describe 'trove::keystone::auth' do
it { is_expected.to contain_keystone_endpoint('RegionOne/trove::database') }
end
describe 'when overriding service name' do
context 'when overriding service name' do
let :params do
{ :service_name => 'trove_service',
:auth_name => 'trove',
@@ -107,7 +104,7 @@ describe 'trove::keystone::auth' do
it { is_expected.to contain_keystone_endpoint('RegionOne/trove_service::database') }
end
describe 'when disabling endpoint configuration' do
context 'when disabling endpoint configuration' do
let :params do
{ :configure_endpoint => false,
:password => 'trove_password' }
@@ -116,7 +113,7 @@ describe 'trove::keystone::auth' do
it { is_expected.to_not contain_keystone_endpoint('RegionOne/neutron::database') }
end
describe 'when disabling user and user_role configuration' do
context 'when disabling user and user_role configuration' do
let :params do
{ :configure_user => false,
:configure_user_role => false,
@@ -129,4 +126,18 @@ describe 'trove::keystone::auth' do
it { is_expected.to contain_keystone_service('trove::database') }
it { is_expected.to contain_keystone_endpoint('RegionOne/trove::database') }
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())
end
it_configures 'trove::keystone::auth'
end
end
end

16
spec/classes/trove_logging_spec.rb
View File

@@ -124,20 +124,16 @@ describe 'trove::logging' 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())
end
it_configures 'trove-logging'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
end
it_configures 'trove-logging'
end
end

19
spec/classes/trove_quota_spec.rb
View File

@@ -2,7 +2,8 @@ require 'spec_helper'
describe 'trove::quota' do
describe 'with default parameters' do
shared_examples_for 'trove::quota' do
context 'with default parameters' do
it 'contains default values' do
is_expected.to contain_trove_config('DEFAULT/max_instances_per_tenant').with(
:value => 5)
@@ -17,7 +18,7 @@ describe 'trove::quota' do
end
end
describe 'with overridden parameters' do
context 'with overridden parameters' do
let :params do
{ :max_instances_per_tenant => 10,
:max_accepted_volume_size => 10,
@@ -36,4 +37,18 @@ describe 'trove::quota' do
:value => 100)
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())
end
it_configures 'trove::quota'
end
end
end

34
spec/classes/trove_taskmanager_spec.rb
View File

@@ -303,36 +303,26 @@ describe 'trove::taskmanager' do
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'Debian',
:os_workers => 8
})
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
let :platform_params do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :taskmanager_package_name => 'trove-taskmanager',
:taskmanager_service_name => 'trove-taskmanager' }
end
it_configures 'trove-taskmanager'
end
context 'on RedHat platforms' do
let :facts do
@default_facts.merge({
:osfamily => 'RedHat',
:os_workers => 8
})
end
let :platform_params do
when 'RedHat'
{ :taskmanager_package_name => 'openstack-trove-taskmanager',
:taskmanager_service_name => 'openstack-trove-taskmanager' }
end
end
it_configures 'trove-taskmanager'
end
end
end