openstack/manila
Code Issues Proposed changes

Merge "HNAS: Fix syntax to make shares read-only in snapshot create"

Browse Source
This commit is contained in:
Jenkins 2017-02-03 17:27:37 +00:00 committed by Gerrit Code Review
commit 43de3b30c8
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manila/share/drivers/hitachi/hnas/driver.py
View File

@ -973,7 +973,9 @@ class HitachiHNASDriver(driver.ShareDriver):
saved_list = self.hnas.get_nfs_host_list(hnas_share_id)
new_list = []
for access in saved_list:
new_list.append(access.replace('(rw)', '(ro)'))
for rw in ('read_write', 'readwrite', 'rw'):
access = access.replace(rw, 'ro')
new_list.append(access)
self.hnas.update_nfs_access_rule(new_list, share_id=hnas_share_id)
else: # CIFS
if (self.hnas.is_cifs_in_use(hnas_share_id) and

22
manila/tests/share/drivers/hitachi/hnas/test_driver.py
View File

@ -498,6 +498,22 @@ class HitachiHNASTestCase(test.TestCase):
snapshot_mount_support_cifs)
def test_create_snapshot(self, snapshot):
hnas_id = snapshot['share_id']
access_list = ['172.24.44.200(rw,norootsquash)',
'172.24.49.180(all_squash,read_write,secure)',
'172.24.49.110(ro, secure)',
'172.24.49.112(secure,readwrite,norootsquash)',
'172.24.49.142(read_only, secure)',
'172.24.49.201(rw,read_write,readwrite)',
'172.24.49.218(rw)']
ro_list = ['172.24.44.200(ro,norootsquash)',
'172.24.49.180(all_squash,ro,secure)',
'172.24.49.110(ro, secure)',
'172.24.49.112(secure,ro,norootsquash)',
'172.24.49.142(read_only, secure)',
'172.24.49.201(ro,ro,ro)',
'172.24.49.218(ro)']
export_locations = [
self._get_export(
snapshot['id'], snapshot['share']['share_proto'],
@ -513,7 +529,7 @@ class HitachiHNASTestCase(test.TestCase):
expected['export_locations'] = export_locations
self.mock_object(ssh.HNASSSHBackend, "get_nfs_host_list", mock.Mock(
return_value=['172.24.44.200(rw)']))
return_value=access_list))
self.mock_object(ssh.HNASSSHBackend, "update_nfs_access_rule",
mock.Mock())
self.mock_object(ssh.HNASSSHBackend, "is_cifs_in_use", mock.Mock(
@ -533,9 +549,9 @@ class HitachiHNASTestCase(test.TestCase):
ssh.HNASSSHBackend.get_nfs_host_list.assert_called_once_with(
hnas_id)
ssh.HNASSSHBackend.update_nfs_access_rule.assert_any_call(
['172.24.44.200(ro)'], share_id=hnas_id)
ro_list, share_id=hnas_id)
ssh.HNASSSHBackend.update_nfs_access_rule.assert_any_call(
['172.24.44.200(rw)'], share_id=hnas_id)
access_list, share_id=hnas_id)
else:
ssh.HNASSSHBackend.is_cifs_in_use.assert_called_once_with(
hnas_id)

5
releasenotes/notes/bug-1661271-hnas-snapshot-readonly-4e50183100ed2b19.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fixed HNAS driver creating snapshots of NFS shares
without first changing it to read-only.