From 374efd15798beefbf95754d7950e782a53f88553 Mon Sep 17 00:00:00 2001
From: haailani <haailani@in.ibm.com>
Date: Tue, 19 Jul 2022 09:51:13 +0000
Subject: [PATCH] [SVf]: Incorrect portset value during driver intialization

[Spectrum Virtualize family] During initialization
by default taking the portset value is set to portset0,
even when a different portset is defined in the cinder.conf

During initialization, if the portset is not defined in cinder.conf,
only then it should pick portset0. Otherwise it should pick the value
from cinder.conf

Closes-Bug: #1982078
Change-Id: I1519b23a44ca8e86c2a969353f275a711d51454f
---
 .../volume/drivers/ibm/storwize_svc/storwize_svc_common.py | 4 +++-
 ...ation_error_w.r.t_default_portset-3992a060cca2adcb.yaml | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/bug-1982078-Driver_initialization_error_w.r.t_default_portset-3992a060cca2adcb.yaml

diff --git a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
index e4153521308..11369584943 100644
--- a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
@@ -3280,6 +3280,7 @@ class StorwizeSVCCommonDriver(san.SanDriver,
         self._vdiskcopyops = {}
         self._vdiskcopyops_loop = None
         self.protocol = None
+        self._storwize_portset = self.configuration.storwize_portset
         self._master_state = {'storage_nodes': {},
                               'enabled_protocols': set(),
                               'compression_enabled': False,
@@ -3381,7 +3382,8 @@ class StorwizeSVCCommonDriver(san.SanDriver,
         state['storage_nodes'] = helper.get_node_info()
 
         # Add the iSCSI IP addresses and WWPNs to the storage node info
-        helper.add_iscsi_ip_addrs(state['storage_nodes'], state['code_level'])
+        helper.add_iscsi_ip_addrs(state['storage_nodes'], state['code_level'],
+                                  portset=self._storwize_portset)
         helper.add_fc_wwpns(state['storage_nodes'], state['code_level'])
 
         # For each node, check what connection modes it supports.  Delete any
diff --git a/releasenotes/notes/bug-1982078-Driver_initialization_error_w.r.t_default_portset-3992a060cca2adcb.yaml b/releasenotes/notes/bug-1982078-Driver_initialization_error_w.r.t_default_portset-3992a060cca2adcb.yaml
new file mode 100644
index 00000000000..35e0cbd5196
--- /dev/null
+++ b/releasenotes/notes/bug-1982078-Driver_initialization_error_w.r.t_default_portset-3992a060cca2adcb.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    IBM Spectrum Virtualize Family driver: `Bug #1982078
+    <https://bugs.launchpad.net/cinder/+bug/1982078>`_:
+    Fixed the default portset value during driver
+    initialization.