From ef75fc0705f9c48fd9f437b8ecd61975bee45dad Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 4 May 2024 18:29:03 +0900
Subject: [PATCH] Assert more [ipmi] options

Make sure all [ipmi] options managed are checked by unit tests.

Change-Id: I480cfc3874e11cc6f7f9c6a7352b57786dcb14b4
---
 spec/classes/ironic_drivers_ipmi_spec.rb | 48 ++++++++++++------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/spec/classes/ironic_drivers_ipmi_spec.rb b/spec/classes/ironic_drivers_ipmi_spec.rb
index 8a4ba0bd..a8976ff2 100644
--- a/spec/classes/ironic_drivers_ipmi_spec.rb
+++ b/spec/classes/ironic_drivers_ipmi_spec.rb
@@ -22,36 +22,36 @@ require 'spec_helper'
 
 describe 'ironic::drivers::ipmi' do
 
-  let :default_params do
-    {}
-  end
-
-  let :params do
-    {}
-  end
-
   shared_examples_for 'ironic ipmi driver' do
-    let :p do
-      default_params.merge(params)
-    end
-
-    it 'configures ironic.conf' do
-      is_expected.to contain_ironic_config('ipmi/command_retry_timeout').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('ipmi/min_command_interval').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('ipmi/debug').with_value('<SERVICE DEFAULT>')
+    context 'with defaults' do
+      it 'configures defaults' do
+        is_expected.to contain_ironic_config('ipmi/command_retry_timeout').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_ironic_config('ipmi/min_command_interval').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_ironic_config('ipmi/use_ipmitool_retries').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_ironic_config('ipmi/kill_on_timeout').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_ironic_config('ipmi/disable_boot_timeout').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_ironic_config('ipmi/debug').with_value('<SERVICE DEFAULT>')
+      end
     end
 
     context 'when overriding parameters' do
-      before do
-        params.merge!(
-          :command_retry_timeout => '50',
-          :min_command_interval  => '5',
+      let :params do
+        {
+          :command_retry_timeout => 50,
+          :min_command_interval  => 5,
+          :use_ipmitool_retries  => false,
+          :kill_on_timeout       => true,
+          :disable_boot_timeout  => true,
           :debug                 => true,
-        )
+        }
       end
-      it 'should replace default parameter with new value' do
-        is_expected.to contain_ironic_config('ipmi/command_retry_timeout').with_value('50')
-        is_expected.to contain_ironic_config('ipmi/min_command_interval').with_value('5')
+
+      it 'configures the given values' do
+        is_expected.to contain_ironic_config('ipmi/command_retry_timeout').with_value(50)
+        is_expected.to contain_ironic_config('ipmi/min_command_interval').with_value(5)
+        is_expected.to contain_ironic_config('ipmi/use_ipmitool_retries').with_value(false)
+        is_expected.to contain_ironic_config('ipmi/kill_on_timeout').with_value(true)
+        is_expected.to contain_ironic_config('ipmi/disable_boot_timeout').with_value(true)
         is_expected.to contain_ironic_config('ipmi/debug').with_value(true)
       end
     end