openstack
/
manila
Code Issues Proposed changes

Merge "Fix Manila HNAS driver managing a share twice" into stable/mitaka

This commit is contained in:
Jenkins 2016-09-13 17:46:32 +00:00 committed by Gerrit Code Review
parent 6ae58e0f24 c89d627e44
commit 5de77cced9
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manila/share/drivers/hitachi/hds_hnas.py
View File

@ -390,12 +390,12 @@ class HDSHNASDriver(driver.ShareDriver):
{'shr_path': share['export_locations'][0]['path'],
'shr_id': share['id']})
old_path_info = share['export_locations'][0]['path'].split(':')
old_path = old_path_info[1].split('/')
old_path_info = share['export_locations'][0]['path'].split(
':/shares/')
if len(old_path) == 3:
if len(old_path_info) == 2:
evs_ip = old_path_info[0]
hnas_share_id = old_path[2]
hnas_share_id = old_path_info[1]
else:
msg = _("Incorrect path. It should have the following format: "
"IP:/shares/share_id.")

18
manila/tests/share/drivers/hitachi/test_hds_hnas.py
View File

@ -416,12 +416,20 @@ class HDSHNASTestCase(test.TestCase):
self.assertRaises(exception.HNASBackendException,
self._driver.manage_existing, share, 'option')
def test_manage_existing_wrong_path_format(self):
share['export_locations'] = [{'path': ':/'}]
@ddt.data(':/', '1.1.1.1:/share_id', '1.1.1.1:/shares',
'1.1.1.1:shares/share_id', ':/share_id')
def test_manage_existing_wrong_path_format(self, wrong_location):
expected_exception = ("Share backend error: Incorrect path. It "
"should have the following format: "
"IP:/shares/share_id.")
share_copy = share.copy()
share_copy['export_locations'] = [{'path': wrong_location}]
self.assertRaises(exception.ShareBackendException,
self._driver.manage_existing, share,
'option')
ex = self.assertRaises(exception.ShareBackendException,
self._driver.manage_existing, share_copy,
'option')
self.assertEqual(expected_exception, ex.msg)
def test_manage_existing_wrong_evs_ip(self):
share['export_locations'] = [{'path': '172.24.44.189:/shares/'

4
releasenotes/notes/fix-managing-twice-hnas-4956a7653d27e320.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Fixed Hitachi HNAS driver allowing a share to be managed twice through
a malformed export location parameter.