From f0abdefed74635ea0074e9d3060c8939fa815515 Mon Sep 17 00:00:00 2001
From: Ivan Pchelintsev <Ivan.Pchelintsev@dell.com>
Date: Mon, 22 Mar 2021 12:10:14 +0300
Subject: [PATCH] Fix PowerStore iSCSI targets filtering

If PowerStore ports are configured for multiple purposes
(iSCSI, Replication, etc.) driver will report that no accessible
iSCSI targets found because of the wrong REST filter.

Closes-Bug: #1920729
Change-Id: I1175d68466ac069e90ecaeef51ec6adb444241d3
---
 cinder/volume/drivers/dell_emc/powerstore/client.py       | 2 +-
 cinder/volume/drivers/dell_emc/powerstore/driver.py       | 5 ++++-
 ...werstore-iscsi-targets-filtering-9623ac03da5c6721.yaml | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/bug-1920729-powerstore-iscsi-targets-filtering-9623ac03da5c6721.yaml

diff --git a/cinder/volume/drivers/dell_emc/powerstore/client.py b/cinder/volume/drivers/dell_emc/powerstore/client.py
index 5b830f42fe2..d307c94f859 100644
--- a/cinder/volume/drivers/dell_emc/powerstore/client.py
+++ b/cinder/volume/drivers/dell_emc/powerstore/client.py
@@ -390,7 +390,7 @@ class PowerStoreClient(object):
         r, response = self._send_get_request(
             "/ip_pool_address",
             params={
-                "purposes": "eq.{Storage_Iscsi_Target}",
+                "purposes": "cs.{Storage_Iscsi_Target}",
                 "select": "address,ip_port(target_iqn)"
 
             }
diff --git a/cinder/volume/drivers/dell_emc/powerstore/driver.py b/cinder/volume/drivers/dell_emc/powerstore/driver.py
index cf787351b24..56eb18314a8 100644
--- a/cinder/volume/drivers/dell_emc/powerstore/driver.py
+++ b/cinder/volume/drivers/dell_emc/powerstore/driver.py
@@ -47,9 +47,12 @@ class PowerStoreDriver(driver.VolumeDriver):
         1.0.1 - Add CHAP support
         1.1.0 - Add volume replication v2.1 support
         1.1.1 - Add Consistency Groups support
+        1.1.2 - Fix iSCSI targets not being returned from the REST API call if
+                targets are used for multiple purposes
+                (iSCSI target, Replication target, etc.)
     """
 
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
     VENDOR = "Dell EMC"
 
     # ThirdPartySystems wiki page
diff --git a/releasenotes/notes/bug-1920729-powerstore-iscsi-targets-filtering-9623ac03da5c6721.yaml b/releasenotes/notes/bug-1920729-powerstore-iscsi-targets-filtering-9623ac03da5c6721.yaml
new file mode 100644
index 00000000000..a0e9af5db44
--- /dev/null
+++ b/releasenotes/notes/bug-1920729-powerstore-iscsi-targets-filtering-9623ac03da5c6721.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    PowerStore driver `Bug #1920729
+    <https://bugs.launchpad.net/cinder/+bug/1920729>`_: Fix
+    iSCSI targets not being returned from the REST API call if
+    targets are used for multiple purposes
+    (iSCSI target, Replication target, etc.).