From f363602ba075141a87296bf83c828cdb8919b439 Mon Sep 17 00:00:00 2001
From: Ivan Pchelintsev <Ivan.Pchelintsev@dell.com>
Date: Wed, 17 Feb 2021 23:06:54 +0300
Subject: [PATCH] Add ports filtering support to XtremIO Cinder driver

If there are some iSCSI or FC targets (ESXi for example) that
are not connected to the OpenStack host,
attach volume operation waits until timeout.
The XtremIO Cinder driver needs a new option to support ports
filtering.

Depends-On: https://review.opendev.org/#/c/779000
Related-Bug: #1915800
Change-Id: I29e3e8b5dab256816ea108d23ccb1f0558e43e82
(cherry picked from commit 4c981b570210a10eac3f88c44570629d04eded64)
---
 manifests/profile/base/cinder/volume/dellemc_xtremio.pp      | 2 ++
 .../profile/base/cinder/volume/dellemc_xtremio_iscsi.pp      | 1 +
 .../notes/xtremio-add-ports-option-b1e60a97ba56f21e.yaml     | 5 +++++
 3 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/xtremio-add-ports-option-b1e60a97ba56f21e.yaml

diff --git a/manifests/profile/base/cinder/volume/dellemc_xtremio.pp b/manifests/profile/base/cinder/volume/dellemc_xtremio.pp
index 7e8e0612e..1f798283e 100644
--- a/manifests/profile/base/cinder/volume/dellemc_xtremio.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_xtremio.pp
@@ -50,6 +50,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio (
       'CinderXtremioArrayBusyRetryCount'   => hiera('cinder::backend::dellemc_xtremio::xtremio_array_busy_retry_count', undef),
       'CinderXtremioArrayBusyRetryInterval'=> hiera('cinder::backend::dellemc_xtremio::xtremio_array_busy_retry_interval', undef),
       'CinderXtremioVolumesPerGlanceCache' => hiera('cinder::backend::dellemc_xtremio::xtremio_volumes_per_glance_cache', undef),
+      'CinderXtremioPorts'                 => hiera('cinder::backend::dellemc_xtremio::xtremio_ports', undef),
     }
 
     any2array($backend_name).each |String $backend| {
@@ -65,6 +66,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio (
         xtremio_array_busy_retry_count    => $backend_config['CinderXtremioArrayBusyRetryCount'],
         xtremio_array_busy_retry_interval => $backend_config['CinderXtremioArrayBusyRetryInterval'],
         xtremio_volumes_per_glance_cache  => $backend_config['CinderXtremioVolumesPerGlanceCache'],
+        xtremio_ports                     => $backend_config['CinderXtremioPorts'],
       }
     }
   }
diff --git a/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp b/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp
index 7d7c48f7b..e00da9ec0 100644
--- a/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp
+++ b/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp
@@ -46,6 +46,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi (
       xtremio_array_busy_retry_count    => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_count', undef),
       xtremio_array_busy_retry_interval => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_interval', undef),
       xtremio_volumes_per_glance_cache  => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_volumes_per_glance_cache', undef),
+      xtremio_ports                     => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_ports', undef),
     }
   }
 
diff --git a/releasenotes/notes/xtremio-add-ports-option-b1e60a97ba56f21e.yaml b/releasenotes/notes/xtremio-add-ports-option-b1e60a97ba56f21e.yaml
new file mode 100644
index 000000000..004cdb58b
--- /dev/null
+++ b/releasenotes/notes/xtremio-add-ports-option-b1e60a97ba56f21e.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    `Bug #1915800 <https://bugs.launchpad.net/cinder/+bug/1915800>`_:
+    Add support for ports filtering in XtremIO driver.
\ No newline at end of file