openstack/cinder
Code Issues Proposed changes

Merge "NetApp: iSCSI/FC detach operation fails when multiple initiators connected"

Browse Source
This commit is contained in:
Zuul
2025-07-16 22:19:47 +00:00
committed by Gerrit Code Review
parent 21af57108f 4addad4baf
commit ffa5996381
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_cmode_rest.py
View File

@@ -1894,7 +1894,7 @@ class NetAppRestCmodeClientTestCase(test.TestCase):
expected_query = {
'svm.name': fake_client.VOLUME_VSERVER_NAME,
'initiators.name': ' '.join(initiators),
'initiators.name': ','.join(initiators),
'fields': 'name,protocol,os_type'
}
@@ -1919,7 +1919,7 @@ class NetAppRestCmodeClientTestCase(test.TestCase):
expected_query = {
'svm.name': fake_client.VOLUME_VSERVER_NAME,
'initiators.name': ' '.join(initiators),
'initiators.name': ','.join(initiators),
'fields': 'name,protocol,os_type'
}
@@ -2180,7 +2180,7 @@ class NetAppRestCmodeClientTestCase(test.TestCase):
self.assertTrue(self.client.has_luns_mapped_to_initiators(initiators))
query = {
'initiators.name': ' '.join(initiators),
'initiators.name': ','.join(initiators),
'fields': 'lun_maps'
}
@@ -2196,7 +2196,7 @@ class NetAppRestCmodeClientTestCase(test.TestCase):
self.assertFalse(self.client.has_luns_mapped_to_initiators(initiators))
query = {
'initiators.name': ' '.join(initiators),
'initiators.name': ','.join(initiators),
'fields': 'lun_maps'
}
@@ -2212,7 +2212,7 @@ class NetAppRestCmodeClientTestCase(test.TestCase):
self.assertFalse(self.client.has_luns_mapped_to_initiators(initiators))
query = {
'initiators.name': ' '.join(initiators),
'initiators.name': ','.join(initiators),
'fields': 'lun_maps'
}

4
cinder/volume/drivers/netapp/dataontap/client/client_cmode_rest.py
View File

@@ -1434,7 +1434,7 @@ class RestClient(object, metaclass=volume_utils.TraceWrapperMetaclass):
query = {
'svm.name': self.vserver,
'initiators.name': ' '.join(initiator_list),
'initiators.name': ','.join(initiator_list),
'fields': 'name,protocol,os_type'
}
@@ -1587,7 +1587,7 @@ class RestClient(object, metaclass=volume_utils.TraceWrapperMetaclass):
def has_luns_mapped_to_initiators(self, initiator_list):
"""Checks whether any LUNs are mapped to the given initiator(s)."""
query = {
'initiators.name': ' '.join(initiator_list),
'initiators.name': ','.join(initiator_list),
'fields': 'lun_maps'
}

6
releasenotes/notes/bug-2114993-iscsi-fc-detach-operation-fails-when-multiple-initiators-connected-b1069bab32d86027.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
fixes:
- |
NetApp Driver `bug #2114993
<https://bugs.launchpad.net/cinder/+bug/2114993>`_: Fixed iSCSI and FC
detach operation failure issue when multiple initiators are connected.