openstack
/
manila
Code Issues Proposed changes

Merge "[NetApp] fallback to cifs-server force delete on vserver cleanup"

This commit is contained in:
Zuul 2023-01-26 22:16:33 +00:00 committed by Gerrit Code Review
parent c8a9485fbe 46d0c4d34a
commit 7d10352758
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manila/share/drivers/netapp/dataontap/client/client_cmode.py
View File

@ -477,7 +477,13 @@ class NetAppCmodeClient(client_base.NetAppBaseClient):
LOG.error('CIFS server does not exist for '
'Vserver %s.', vserver_name)
else:
vserver_client.send_request('cifs-server-delete')
LOG.debug('Retrying CIFS server delete with force flag'
' for Vserver %s.', vserver_name)
api_args = {
'force-account-delete': 'true'
}
vserver_client.send_request('cifs-server-delete',
api_args)
elif service['type'].lower() == 'kerberos':
vserver_client.disable_kerberos(service)

5
manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py
View File

@ -886,9 +886,12 @@ class NetAppClientCmodeTestCase(test.TestCase):
'admin-password': fake.CIFS_SECURITY_SERVICE['password'],
'admin-username': fake.CIFS_SECURITY_SERVICE['user'],
}
cifs_server_delete_force_args = {
'force-account-delete': 'true',
}
self.vserver_client.send_request.assert_has_calls([
mock.call('cifs-server-delete', cifs_server_delete_args),
mock.call('cifs-server-delete')])
mock.call('cifs-server-delete', cifs_server_delete_force_args)])
self.assertEqual(0, client_cmode.LOG.error.call_count)
def test_list_cluster_nodes(self):

6
releasenotes/notes/bug-1995733-netapp-cifs-server-force-delete-d513c548ebf56448.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
NetApp driver has been fixed to the error in `launchpad bug 1995733
<https://bugs.launchpad.net/manila/+bug/1995733>`_ preventing share server
cleanup with active directory security service.