openstack/puppet-neutron
Code Issues Proposed changes

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

Browse Source 
Change-Id: I627d0d9807088f792616a6c2ea47bcb8b7e317b7
This commit is contained in:
ZhongShengping
2017-04-10 19:57:06 +08:00
parent ae726e9d32
commit 166f65f5ad
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
spec/classes/neutron_db_spec.rb
View File

@@ -6,12 +6,14 @@ describe 'neutron::db' do
context 'with default parameters' do context 'with default parameters' do
it { is_expected.to contain_neutron_config('database/connection').with_value('sqlite:////var/lib/neutron/ovs.sqlite').with_secret(true) } it { is_expected.to contain_oslo__db('neutron_config').with(
it { is_expected.to contain_neutron_config('database/idle_timeout').with_value('<SERVICE DEFAULT>') } :db_max_retries => '<SERVICE DEFAULT>',
it { is_expected.to contain_neutron_config('database/min_pool_size').with_value('<SERVICE DEFAULT>') } :connection => 'sqlite:////var/lib/neutron/ovs.sqlite',
it { is_expected.to contain_neutron_config('database/max_retries').with_value('<SERVICE DEFAULT>') } :idle_timeout => '<SERVICE DEFAULT>',
it { is_expected.to contain_neutron_config('database/retry_interval').with_value('<SERVICE DEFAULT>') } :min_pool_size => '<SERVICE DEFAULT>',
it { is_expected.to contain_neutron_config('database/db_max_retries').with_value('<SERVICE DEFAULT>') } :max_retries => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
)}
end end
@@ -25,12 +27,14 @@ describe 'neutron::db' do
:database_db_max_retries => '-1', } :database_db_max_retries => '-1', }
end end
it { is_expected.to contain_neutron_config('database/connection').with_value('mysql+pymysql://neutron:neutron@localhost/neutron').with_secret(true) } it { is_expected.to contain_oslo__db('neutron_config').with(
it { is_expected.to contain_neutron_config('database/idle_timeout').with_value('3601') } :db_max_retries => '-1',
it { is_expected.to contain_neutron_config('database/min_pool_size').with_value('2') } :connection => 'mysql+pymysql://neutron:neutron@localhost/neutron',
it { is_expected.to contain_neutron_config('database/max_retries').with_value('11') } :idle_timeout => '3601',
it { is_expected.to contain_neutron_config('database/retry_interval').with_value('11') } :min_pool_size => '2',
it { is_expected.to contain_neutron_config('database/db_max_retries').with_value('-1') } :max_retries => '11',
:retry_interval => '11',
)}
end end
@@ -39,12 +43,14 @@ describe 'neutron::db' do
{ :database_connection => 'mysql://neutron:neutron@localhost/neutron' } { :database_connection => 'mysql://neutron:neutron@localhost/neutron' }
end end
it { is_expected.to contain_neutron_config('database/connection').with_value('mysql://neutron:neutron@localhost/neutron').with_secret(true) } it { is_expected.to contain_oslo__db('neutron_config').with(
:connection => 'mysql://neutron:neutron@localhost/neutron',
)}
end end
context 'with postgresql backend' do context 'with postgresql backend' do
let :params do let :params do
{ :database_connection => 'postgresql://neutron:neutron@localhost/neutron', } { :database_connection => 'postgresql://neutron:neutron@localhost/neutron', }
end end
it 'install the proper backend package' do it 'install the proper backend package' do
@@ -55,7 +61,7 @@ describe 'neutron::db' do
context 'with incorrect database_connection string' do context 'with incorrect database_connection string' do
let :params do let :params do
{ :database_connection => 'redis://neutron:neutron@localhost/neutron', } { :database_connection => 'redis://neutron:neutron@localhost/neutron', }
end end
it_raises 'a Puppet::Error', /validate_re/ it_raises 'a Puppet::Error', /validate_re/
@@ -63,7 +69,7 @@ describe 'neutron::db' do
context 'with incorrect database_connection string' do context 'with incorrect database_connection string' do
let :params do let :params do
{ :database_connection => 'foo+pymysql://neutron:neutron@localhost/neutron', } { :database_connection => 'foo+pymysql://neutron:neutron@localhost/neutron', }
end end
it_raises 'a Puppet::Error', /validate_re/ it_raises 'a Puppet::Error', /validate_re/
@@ -84,7 +90,7 @@ describe 'neutron::db' do
context 'using pymysql driver' do context 'using pymysql driver' do
let :params do let :params do
{ :database_connection => 'mysql+pymysql://neutron:neutron@localhost/neutron' } { :database_connection => 'mysql+pymysql://neutron:neutron@localhost/neutron' }
end end
it { is_expected.to contain_package('db_backend_package').with({ :ensure => 'present', :name => 'python-pymysql' }) } it { is_expected.to contain_package('db_backend_package').with({ :ensure => 'present', :name => 'python-pymysql' }) }
@@ -104,7 +110,7 @@ describe 'neutron::db' do
context 'using pymysql driver' do context 'using pymysql driver' do
let :params do let :params do
{ :database_connection => 'mysql+pymysql://neutron:neutron@localhost/neutron' } { :database_connection => 'mysql+pymysql://neutron:neutron@localhost/neutron' }
end end
it { is_expected.not_to contain_package('db_backend_package') } it { is_expected.not_to contain_package('db_backend_package') }