From 0c9bd2eb864f437290e7e073858409c49b7d12cd Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 1 Jul 2021 17:39:45 +0900
Subject: [PATCH] Do not test detail of oslo::cors

This change makes unit test cases for nova::cors, so that these tests
do not test behavir of oslo::cors but how oslo::cors resource type is
called by nova::cors.

Change-Id: I0973d9fb86066c08f5f88c59f3914f7e963c3812
---
 spec/classes/nova_cors_spec.rb | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/spec/classes/nova_cors_spec.rb b/spec/classes/nova_cors_spec.rb
index 0cb20c0b1..c0514bfd0 100644
--- a/spec/classes/nova_cors_spec.rb
+++ b/spec/classes/nova_cors_spec.rb
@@ -2,14 +2,16 @@ require 'spec_helper'
 
 describe 'nova::cors' do
 
-  shared_examples_for 'nova cors' do
+  shared_examples_for 'nova::cors' do
     it 'configure cors default params' do
-      is_expected.to contain_nova_config('cors/allowed_origin').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_nova_config('cors/allow_credentials').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_nova_config('cors/expose_headers').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_nova_config('cors/max_age').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_nova_config('cors/allow_methods').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_nova_config('cors/allow_headers').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_oslo__cors('nova_config').with(
+        :allowed_origin    => '<SERVICE DEFAULT>',
+        :allow_credentials => '<SERVICE DEFAULT>',
+        :expose_headers    => '<SERVICE DEFAULT>',
+        :max_age           => '<SERVICE DEFAULT>',
+        :allow_methods     => '<SERVICE DEFAULT>',
+        :allow_headers     => '<SERVICE DEFAULT>',
+      )
     end
 
     context 'with specific parameters' do
@@ -24,12 +26,14 @@ describe 'nova::cors' do
       end
 
       it 'configure cors params' do
-        is_expected.to contain_nova_config('cors/allowed_origin').with_value('*')
-        is_expected.to contain_nova_config('cors/allow_credentials').with_value(true)
-        is_expected.to contain_nova_config('cors/expose_headers').with_value('Content-Language,Expires')
-        is_expected.to contain_nova_config('cors/max_age').with_value(3600)
-        is_expected.to contain_nova_config('cors/allow_methods').with_value('GET,POST,PUT,DELETE,OPTIONS')
-        is_expected.to contain_nova_config('cors/allow_headers').with_value('Content-Type,Cache-Control')
+        is_expected.to contain_oslo__cors('nova_config').with(
+          :allowed_origin    => '*',
+          :allow_credentials => true,
+          :expose_headers    => 'Content-Language,Expires',
+          :max_age           => 3600,
+          :allow_methods     => 'GET,POST,PUT,DELETE,OPTIONS',
+          :allow_headers     => 'Content-Type,Cache-Control',
+        )
       end
     end
   end
@@ -42,7 +46,7 @@ describe 'nova::cors' do
         facts.merge!(OSDefaults.get_facts())
       end
 
-      it_behaves_like 'nova cors'
+      it_behaves_like 'nova::cors'
     end
   end