openstack
/
puppet-aodh
Code Issues Proposed changes

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

Change-Id: Ia35109a32bd642408aab8c5069dd9cf7d08fb102
This commit is contained in:
ZhongShengping 2017-04-08 10:48:10 +08:00
parent ecdafce418
commit 18b75c43fc
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
spec/classes/aodh_db_spec.rb
View File

@ -5,12 +5,14 @@ describe 'aodh::db' do
shared_examples 'aodh::db' do shared_examples 'aodh::db' do
context 'with default parameters' do context 'with default parameters' do
it { is_expected.to contain_aodh_config('database/db_max_retries').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_oslo__db('aodh_config').with(
it { is_expected.to contain_aodh_config('database/connection').with_value('sqlite:////var/lib/aodh/aodh.sqlite') } :db_max_retries => '<SERVICE DEFAULT>',
it { is_expected.to contain_aodh_config('database/idle_timeout').with_value('<SERVICE DEFAULT>') } :connection => 'sqlite:////var/lib/aodh/aodh.sqlite',
it { is_expected.to contain_aodh_config('database/min_pool_size').with_value('<SERVICE DEFAULT>') } :idle_timeout => '<SERVICE DEFAULT>',
it { is_expected.to contain_aodh_config('database/max_retries').with_value('<SERVICE DEFAULT>') } :min_pool_size => '<SERVICE DEFAULT>',
it { is_expected.to contain_aodh_config('database/retry_interval').with_value('<SERVICE DEFAULT>') } :max_retries => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
)}
end end
@ -24,18 +26,20 @@ describe 'aodh::db' do
:database_retry_interval => '11', :database_retry_interval => '11',
} }
end end
it { is_expected.to contain_aodh_config('database/db_max_retries').with_value('-1') } it { is_expected.to contain_oslo__db('aodh_config').with(
it { is_expected.to contain_aodh_config('database/connection').with_value('mysql+pymysql://aodh:aodh@localhost/aodh').with_secret(true) } :db_max_retries => '-1',
it { is_expected.to contain_aodh_config('database/idle_timeout').with_value('3601') } :connection => 'mysql+pymysql://aodh:aodh@localhost/aodh',
it { is_expected.to contain_aodh_config('database/min_pool_size').with_value('2') } :idle_timeout => '3601',
it { is_expected.to contain_aodh_config('database/max_retries').with_value('11') } :min_pool_size => '2',
it { is_expected.to contain_aodh_config('database/retry_interval').with_value('11') } :max_retries => '11',
:retry_interval => '11',
)}
end end
context 'with postgresql backend' do context 'with postgresql backend' do
let :params do let :params do
{ :database_connection => 'postgresql://localhost:1234/aodh', } { :database_connection => 'postgresql://localhost:1234/aodh', }
end end
it 'install the proper backend package' do it 'install the proper backend package' do
@ -46,7 +50,7 @@ describe 'aodh::db' do
context 'with MySQL-python library as backend package' do context 'with MySQL-python library as backend package' do
let :params do let :params do
{ :database_connection => 'mysql://aodh:aodh@localhost/aodh', } { :database_connection => 'mysql://aodh:aodh@localhost/aodh', }
end end
it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') } it { is_expected.to contain_package('python-mysqldb').with(:ensure => 'present') }
@ -63,15 +67,16 @@ describe 'aodh::db' do
:name => 'python-pymongo', :name => 'python-pymongo',
:tag => 'openstack' :tag => 'openstack'
) )
is_expected.to contain_aodh_config('database/connection').with_value('mongodb://localhost:1234/aodh') is_expected.to contain_oslo__db('aodh_config').with(
is_expected.to contain_aodh_config('database/connection').with_value( params[:database_connection] ).with_secret(true) :connection => 'mongodb://localhost:1234/aodh',
)
end end
end end
context 'with incorrect database_connection string' do context 'with incorrect database_connection string' do
let :params do let :params do
{ :database_connection => 'redis://aodh:aodh@localhost/aodh', } { :database_connection => 'redis://aodh:aodh@localhost/aodh', }
end end
it_raises 'a Puppet::Error', /validate_re/ it_raises 'a Puppet::Error', /validate_re/
@ -79,7 +84,7 @@ describe 'aodh::db' do
context 'with incorrect pymysql database_connection string' do context 'with incorrect pymysql database_connection string' do
let :params do let :params do
{ :database_connection => 'foo+pymysql://aodh:aodh@localhost/aodh', } { :database_connection => 'foo+pymysql://aodh:aodh@localhost/aodh', }
end end
it_raises 'a Puppet::Error', /validate_re/ it_raises 'a Puppet::Error', /validate_re/
@ -89,7 +94,7 @@ describe 'aodh::db' do
shared_examples_for 'aodh::db on Debian' do shared_examples_for 'aodh::db on Debian' do
context 'with sqlite backend' do context 'with sqlite backend' do
let :params do let :params do
{ :database_connection => 'sqlite:///var/lib/aodh/aodh.sqlite', } { :database_connection => 'sqlite:///var/lib/aodh/aodh.sqlite', }
end end
it 'install the proper backend package' do it 'install the proper backend package' do
@ -103,7 +108,7 @@ describe 'aodh::db' do
context 'using pymysql driver' do context 'using pymysql driver' do
let :params do let :params do
{ :database_connection => 'mysql+pymysql://aodh:aodh@localhost/aodh', } { :database_connection => 'mysql+pymysql://aodh:aodh@localhost/aodh', }
end end
it 'install the proper backend package' do it 'install the proper backend package' do
@ -119,7 +124,7 @@ describe 'aodh::db' do
shared_examples_for 'aodh::db on RedHat' do shared_examples_for 'aodh::db on RedHat' do
context 'using pymysql driver' do context 'using pymysql driver' do
let :params do let :params do
{ :database_connection => 'mysql+pymysql://aodh:aodh@localhost/aodh', } { :database_connection => 'mysql+pymysql://aodh:aodh@localhost/aodh', }
end end
it { is_expected.not_to contain_package('db_backend_package') } it { is_expected.not_to contain_package('db_backend_package') }