PowerMax: Support new API timeout options

Depends-on: https://review.opendev.org/907768
Change-Id: I4feb7f4ff1dd874e5e288a475db9dea2743bdac8

manifests/backend/dellemc_powermax.pp

@@ -61,6 +61,14 @@
 #   provisionig is involved.
 #   Defaults to $facts['os_service_default'].
 #
+# [*rest_api_connect_timeout*]
+#   (Optional) Connection timeout value (in seconds) for rest call.
+#   Defaults to $facts['os_service_default'].
+#
+# [*rest_api_read_timeout*]
+#   (Optional) Read timeout value (in seconds) for rest call.
+#   Defaults to $facts['os_service_default'].
+#
 # [*manage_volume_type*]
 #   (Optional) Whether or not manage Cinder Volume type.
 #   If set to true, a Cinder Volume type will be created
@@ -88,6 +96,8 @@ define cinder::backend::dellemc_powermax (
   $image_volume_cache_max_count                  = $facts['os_service_default'],
   $reserved_percentage                           = $facts['os_service_default'],
   $max_over_subscription_ratio                   = $facts['os_service_default'],
+  $rest_api_connect_timeout                      = $facts['os_service_default'],
+  $rest_api_read_timeout                         = $facts['os_service_default'],
   Hash $extra_options                            = {},
   Boolean $manage_volume_type                    = false,
 ) {
@@ -121,6 +131,8 @@ define cinder::backend::dellemc_powermax (
     "${name}/powermax_array":                 value => $powermax_array;
     "${name}/powermax_srp":                   value => $powermax_srp;
     "${name}/powermax_port_groups":           value => $powermax_port_groups_real;
+    "${name}/rest_api_connect_timeout":       value => $rest_api_connect_timeout;
+    "${name}/rest_api_read_timeout":          value => $rest_api_read_timeout;
   }
 
   if $manage_volume_type {

releasenotes/notes/powermax-timeout-options-99e0c13f0b71b2e2.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    The following parameters have been added to
+    the ``cinder::backend::dellemc_powermax`` defined resource type.
+
+    - ``rest_api_connect_timeout``
+    - ``rest_api_read_timeout``

spec/defines/cinder_backend_dellemc_powermax_spec.rb

@@ -35,6 +35,8 @@ describe 'cinder::backend::dellemc_powermax' do
         is_expected.to contain_cinder_config("#{title}/image_volume_cache_enabled").with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cinder_config("#{title}/image_volume_cache_max_size_gb").with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cinder_config("#{title}/image_volume_cache_max_count").with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_cinder_config("#{title}/rest_api_connect_timeout").with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_cinder_config("#{title}/rest_api_read_timeout").with_value('<SERVICE DEFAULT>')
 
         is_expected.to contain_package('pywbem').with(
           :ensure => 'installed',
@@ -90,6 +92,8 @@ describe 'cinder::backend::dellemc_powermax' do
           :backend_availability_zone   => 'my_zone',
           :reserved_percentage         => 10,
           :max_over_subscription_ratio => 1.5,
+          :rest_api_connect_timeout    => 30,
+          :rest_api_read_timeout       => 31,
         })
       end
 
@@ -97,6 +101,8 @@ describe 'cinder::backend::dellemc_powermax' do
         is_expected.to contain_cinder_config("#{title}/backend_availability_zone").with_value('my_zone')
         is_expected.to contain_cinder_config("#{title}/reserved_percentage").with_value(10)
         is_expected.to contain_cinder_config("#{title}/max_over_subscription_ratio").with_value(1.5)
+        is_expected.to contain_cinder_config("#{title}/rest_api_connect_timeout").with_value(30)
+        is_expected.to contain_cinder_config("#{title}/rest_api_read_timeout").with_value(31)
       end
     end