diff --git a/manila/share/drivers/hitachi/ssh.py b/manila/share/drivers/hitachi/ssh.py index 1e402fb6a7..ced6d24418 100644 --- a/manila/share/drivers/hitachi/ssh.py +++ b/manila/share/drivers/hitachi/ssh.py @@ -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 diff --git a/manila/tests/share/drivers/hitachi/test_ssh.py b/manila/tests/share/drivers/hitachi/test_ssh.py index a5a12d4335..a17d632843 100644 --- a/manila/tests/share/drivers/hitachi/test_ssh.py +++ b/manila/tests/share/drivers/hitachi/test_ssh.py @@ -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