From 18b75c43fc8c30b715cecf8cd46607dea8cdbbb4 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Sat, 8 Apr 2017 10:48:10 +0800
Subject: [PATCH] oslo db: check puppet resource instead of actual config in
 spec

Change-Id: Ia35109a32bd642408aab8c5069dd9cf7d08fb102
---
 spec/classes/aodh_db_spec.rb | 47 ++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 21 deletions(-)

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