From 4d3e6683608176723a27053e929e69f9ab609541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne@iweb.com>
Date: Mon, 29 Sep 2014 16:47:24 -0400
Subject: [PATCH] Improve openstacklib::db::mysql test coverage

* Add tests for openstacklib::db::mysql::host_access
* Add tests for other overridable parameters in db::mysql
* Do not test implementation details of host_access from
  within openstacklib::db::mysql tests.

Change-Id: Ifcf3820a575f932313a62b9d294ebd92a5055cf5
---
 .../openstacklib_db_mysql_host_access_spec.rb | 50 ++++++++++++++++++
 spec/defines/openstacklib_db_mysql_spec.rb    | 51 +++++++++++++++----
 2 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 spec/defines/openstacklib_db_mysql_host_access_spec.rb

diff --git a/spec/defines/openstacklib_db_mysql_host_access_spec.rb b/spec/defines/openstacklib_db_mysql_host_access_spec.rb
new file mode 100644
index 00000000..8f47bfa1
--- /dev/null
+++ b/spec/defines/openstacklib_db_mysql_host_access_spec.rb
@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'openstacklib::db::mysql::host_access' do
+
+  let :pre_condition do
+    "include mysql::server\n" +
+    "openstacklib::db::mysql { 'nova':\n" +
+    "  password_hash => 'AA1420F182E88B9E5F874F6FBE7459291E8F4601'}"
+  end
+
+  shared_examples 'openstacklib::db::mysql::host_access examples' do
+
+    context 'with required parameters' do
+      let (:title) { 'nova_10.0.0.1' }
+      let :params do
+        { :user          => 'foobar',
+          :password_hash => 'AA1420F182E88B9E5F874F6FBE7459291E8F4601',
+          :database      => 'nova',
+          :privileges    => 'ALL' }
+      end
+
+      it { should contain_mysql_user("#{params[:user]}@10.0.0.1").with(
+        :password_hash => params[:password_hash]
+      )}
+
+      it { should contain_mysql_grant("#{params[:user]}@10.0.0.1/#{params[:database]}.*").with(
+        :user       => "#{params[:user]}@10.0.0.1",
+        :privileges => 'ALL',
+        :table      => "#{params[:database]}.*"
+      )}
+    end
+
+  end
+
+  context 'on a Debian osfamily' do
+    let :facts do
+      { :osfamily => "Debian" }
+    end
+
+    include_examples 'openstacklib::db::mysql::host_access examples'
+  end
+
+  context 'on a RedHat osfamily' do
+    let :facts do
+      { :osfamily => 'RedHat' }
+    end
+
+    include_examples 'openstacklib::db::mysql::host_access examples'
+  end
+end
diff --git a/spec/defines/openstacklib_db_mysql_spec.rb b/spec/defines/openstacklib_db_mysql_spec.rb
index 336b961b..91852a56 100644
--- a/spec/defines/openstacklib_db_mysql_spec.rb
+++ b/spec/defines/openstacklib_db_mysql_spec.rb
@@ -23,17 +23,46 @@ describe 'openstacklib::db::mysql' do
         :charset => 'utf8',
         :collate => 'utf8_unicode_ci'
       )}
-      it { should contain_mysql_user("#{title}@127.0.0.1").with(
-        :password_hash => params[:password_hash]
-      )}
-      it { should contain_mysql_grant("#{title}@127.0.0.1/#{title}.*").with(
-        :user       => "#{title}@127.0.0.1",
-        :privileges => 'ALL',
-        :table      => "#{title}.*"
+      it { should contain_openstacklib__db__mysql__host_access("#{title}_127.0.0.1").with(
+        :user       => title,
+        :database   => title,
+        :privileges => 'ALL'
       )}
     end
 
-    context 'when overriding charset' do
+    context 'with overriding dbname parameter' do
+      let :params do
+        { :dbname => 'foobar' }.merge(required_params)
+      end
+
+      it { should contain_mysql_database(params[:dbname]).with(
+        :charset => 'utf8',
+        :collate => 'utf8_unicode_ci'
+      )}
+      it { should contain_openstacklib__db__mysql__host_access("#{params[:dbname]}_127.0.0.1").with(
+        :user       => title,
+        :database   => params[:dbname],
+        :privileges => 'ALL'
+      )}
+    end
+
+    context 'with overriding user parameter' do
+      let :params do
+        { :user => 'foobar' }.merge(required_params)
+      end
+
+      it { should contain_mysql_database(title).with(
+        :charset => 'utf8',
+        :collate => 'utf8_unicode_ci'
+      )}
+      it { should contain_openstacklib__db__mysql__host_access("#{title}_127.0.0.1").with(
+        :user       => params[:user],
+        :database   => title,
+        :privileges => 'ALL'
+      )}
+    end
+
+    context 'when overriding charset parameter' do
       let :params do
         { :charset => 'latin1' }.merge(required_params)
       end
@@ -73,7 +102,7 @@ describe 'openstacklib::db::mysql' do
       it { should contain_service('keystone').that_requires("Openstacklib::Db::Mysql[keystone]") }
     end
 
-    context "overriding allowed_hosts param to array" do
+    context "overriding allowed_hosts parameter with array value" do
       let :params do
         { :allowed_hosts  => ['127.0.0.1','%'] }.merge(required_params)
       end
@@ -90,7 +119,7 @@ describe 'openstacklib::db::mysql' do
       )}
     end
 
-    context "overriding allowed_hosts param to string" do
+    context "overriding allowed_hosts parameter with string value" do
       let :params do
         { :allowed_hosts => '192.168.1.1' }.merge(required_params)
       end
@@ -102,7 +131,7 @@ describe 'openstacklib::db::mysql' do
       )}
     end
 
-    context "overriding allowed_hosts param equals to host param " do
+    context "overriding allowed_hosts parameter equals to host param " do
       let :params do
         { :allowed_hosts => '127.0.0.1' }.merge(required_params)
       end