openstack
/
manila
Code Issues Proposed changes

Merge "Fix HDS HNAS Create from snapshot ignoring Size"

This commit is contained in:
Jenkins 2015-09-18 15:53:10 +00:00 committed by Gerrit Code Review
parent 31c2d6c0ff 99d39374f9
commit 415e3f7322
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manila/share/drivers/hitachi/ssh.py
View File

@ -380,16 +380,8 @@ class HNASSSHBackend(object):
# Before copying everything to new vvol, we need to create it,
# because we only can transform an empty directory into a vvol.
quota = self._get_share_quota(snapshot['share_id'])
LOG.debug("Share size: %(quota)s.", {'quota': six.text_type(quota)})
if quota is None:
msg = (_("The original share %s does not have a quota limit, "
"please set it before creating a new "
"share.") % share['id'])
raise exception.HNASBackendException(msg=msg)
self._vvol_create(share['id'], quota)
self._vvol_create(share['id'], share['size'])
try:
# Copy the directory to new vvol

20
manila/tests/share/drivers/hitachi/test_ssh.py
View File

@ -1091,8 +1091,7 @@ class HNASSSHTestCase(test.TestCase):
'/shares/vvol_test']
# Tests when successfully creates a share from snapshot
self.mock_object(ssh.HNASSSHBackend, '_execute',
mock.Mock(side_effect=[(HNAS_RESULT_quota, ""),
(HNAS_RESULT_fs, ""),
mock.Mock(side_effect=[(HNAS_RESULT_fs, ""),
(HNAS_RESULT_empty, ""),
(HNAS_RESULT_empty, ""),
(HNAS_RESULT_job, ""),
@ -1105,17 +1104,6 @@ class HNASSSHTestCase(test.TestCase):
self.assertTrue(self.mock_log.debug.called)
ssh.HNASSSHBackend._execute.assert_called_with(fake_export_command)
def test_create_share_from_snapshot_quota_unset(self):
# Tests when quota is unset
fake_quota_command = ['quota', 'list', 'file_system', 'vvol_test']
self.mock_object(ssh.HNASSSHBackend, '_execute',
mock.Mock(return_value=(HNAS_RESULT_quota_err, "")))
self.assertRaises(exception.HNASBackendException,
self._driver.create_share_from_snapshot,
self.vvol, self.snapshot)
ssh.HNASSSHBackend._execute.assert_called_with(fake_quota_command)
def test_create_share_from_empty_snapshot(self):
msg = 'Cannot find any clonable files in the source directory'
fake_export_command = ['nfs-export', 'add', '-S', 'disable', '-c',
@ -1124,8 +1112,7 @@ class HNASSSHTestCase(test.TestCase):
# Tests when successfully creates a share from snapshot
self.mock_object(ssh.HNASSSHBackend, '_execute',
mock.Mock(side_effect=[(HNAS_RESULT_quota, ""),
(HNAS_RESULT_fs, ""),
mock.Mock(side_effect=[(HNAS_RESULT_fs, ""),
(HNAS_RESULT_empty, ""),
(HNAS_RESULT_empty, ""),
(putils.ProcessExecutionError
@ -1147,8 +1134,7 @@ class HNASSSHTestCase(test.TestCase):
'/shares/vvol_test']
self.mock_object(ssh.HNASSSHBackend, '_execute',
mock.Mock(side_effect=[(HNAS_RESULT_quota, ""),
(HNAS_RESULT_fs, ""),
mock.Mock(side_effect=[(HNAS_RESULT_fs, ""),
(HNAS_RESULT_empty, ""),
(HNAS_RESULT_empty, ""),
(putils.ProcessExecutionError