openstack/puppet-ironic
Code Issues Proposed changes

oslo db: check puppet resource instead of actual config in spec

Browse Source 
Change-Id: I79acb4b4d8aabe0a7dd83093a29e62716a84abe8
This commit is contained in:
ZhongShengping 2017-04-10 19:24:37 +08:00
parent 8eda27f410
commit f3ec8361fc
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
spec/classes/ironic_db_spec.rb
View File

@ -6,14 +6,16 @@ describe 'ironic::db' do
context 'with default parameters' do
it { is_expected.to contain_ironic_config('database/connection').with_value('sqlite:////var/lib/ironic/ovs.sqlite').with_secret(true) }
it { is_expected.to contain_ironic_config('database/idle_timeout').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_ironic_config('database/min_pool_size').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_ironic_config('database/max_pool_size').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_ironic_config('database/max_overflow').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_ironic_config('database/max_retries').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_ironic_config('database/retry_interval').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_ironic_config('database/db_max_retries').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_oslo__db('ironic_config').with(
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'sqlite:////var/lib/ironic/ovs.sqlite',
:idle_timeout => '<SERVICE DEFAULT>',
:min_pool_size => '<SERVICE DEFAULT>',
:max_pool_size => '<SERVICE DEFAULT>',
:max_retries => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
:max_overflow => '<SERVICE DEFAULT>',
)}
end
@ -30,14 +32,16 @@ describe 'ironic::db' do
}
end
it { is_expected.to contain_ironic_config('database/connection').with_value('mysql+pymysql://ironic:ironic@localhost/ironic').with_secret(true) }
it { is_expected.to contain_ironic_config('database/idle_timeout').with_value('3601') }
it { is_expected.to contain_ironic_config('database/min_pool_size').with_value('2') }
it { is_expected.to contain_ironic_config('database/max_retries').with_value('11') }
it { is_expected.to contain_ironic_config('database/max_pool_size').with_value('21') }
it { is_expected.to contain_ironic_config('database/max_overflow').with_value('21') }
it { is_expected.to contain_ironic_config('database/retry_interval').with_value('11') }
it { is_expected.to contain_ironic_config('database/db_max_retries').with_value('-1') }
it { is_expected.to contain_oslo__db('ironic_config').with(
:db_max_retries => '-1',
:connection => 'mysql+pymysql://ironic:ironic@localhost/ironic',
:idle_timeout => '3601',
:min_pool_size => '2',
:max_pool_size => '21',
:max_retries => '11',
:retry_interval => '11',
:max_overflow => '21',
)}
end
@ -46,12 +50,14 @@ describe 'ironic::db' do
{ :database_connection => 'mysql://ironic:ironic@localhost/ironic' }
end
it { is_expected.to contain_ironic_config('database/connection').with_value('mysql://ironic:ironic@localhost/ironic').with_secret(true) }
it { is_expected.to contain_oslo__db('ironic_config').with(
:connection => 'mysql://ironic:ironic@localhost/ironic',
)}
end
context 'with postgresql backend' do
let :params do
{ :database_connection => 'postgresql://ironic:ironic@localhost/ironic', }
{ :database_connection => 'postgresql://ironic:ironic@localhost/ironic', }
end
it 'install the proper backend package' do
@ -62,7 +68,7 @@ describe 'ironic::db' do
context 'with incorrect database_connection string' do
let :params do
{ :database_connection => 'redis://ironic:ironic@localhost/ironic', }
{ :database_connection => 'redis://ironic:ironic@localhost/ironic', }
end
it_raises 'a Puppet::Error', /validate_re/
@ -70,7 +76,7 @@ describe 'ironic::db' do
context 'with incorrect database_connection string' do
let :params do
{ :database_connection => 'foo+pymysql://ironic:ironic@localhost/ironic', }
{ :database_connection => 'foo+pymysql://ironic:ironic@localhost/ironic', }
end
it_raises 'a Puppet::Error', /validate_re/
@ -82,7 +88,7 @@ describe 'ironic::db' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://ironic:ironic@localhost/ironic' }
{ :database_connection => 'mysql+pymysql://ironic:ironic@localhost/ironic' }
end
it 'install the proper backend package' do
@ -96,7 +102,7 @@ describe 'ironic::db' do
context 'with sqlite backend' do
let :params do
{ :database_connection => 'sqlite:///var/lib/nova/nova.sqlite', }
{ :database_connection => 'sqlite:///var/lib/nova/nova.sqlite', }
end
it 'install the proper backend package' do
@ -114,7 +120,7 @@ describe 'ironic::db' do
context 'using pymysql driver' do
let :params do
{ :database_connection => 'mysql+pymysql://ironic:ironic@localhost/ironic' }
{ :database_connection => 'mysql+pymysql://ironic:ironic@localhost/ironic' }
end
it { is_expected.not_to contain_package('db_backend_package') }
@ -127,8 +133,8 @@ describe 'ironic::db' do
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld',
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld',
}))
end