openstack
/
cinder
Code Issues Proposed changes

Provide user with more information on quota fail 

Provide the user with useful information when a snapshot or volume
create fails because it would cause the user to exceed available quota.
Specifically report the user's current gigabyte usage and quota
allocations.

Closes-Bug: #1235148

Change-Id: Ib4c5dbcbd172c69834c2824791af755380f38e01
This commit is contained in:
Ollie Leahy 2013-10-04 14:56:26 +00:00
parent 150e83da9f
commit 2d8b905f47
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/exception.py
View File

@ -399,8 +399,9 @@ class QuotaError(CinderException):
class VolumeSizeExceedsAvailableQuota(QuotaError):
message = _("Requested volume or snapshot exceeds "
"allowed Gigabytes quota")
message = _("Requested volume or snapshot exceeds allowed Gigabytes "
"quota. Requested %(requested)sG, quota is %(quota)sG and "
"%(consumed)sG has been consumed.")
class VolumeLimitExceeded(QuotaError):

7
cinder/tests/api/contrib/test_backups.py
View File

@ -852,7 +852,9 @@ class BackupsAPITestCase(test.TestCase):
def fake_backup_api_restore_throwing_VolumeSizeExceedsAvailableQuota(
cls, context, backup_id, volume_id):
raise exception.VolumeSizeExceedsAvailableQuota()
raise exception.VolumeSizeExceedsAvailableQuota(requested='2',
consumed='2',
quota='3')
self.stubs.Set(
cinder.backup.API,
@ -877,7 +879,8 @@ class BackupsAPITestCase(test.TestCase):
self.assertEqual(res_dict['overLimit']['code'], 413)
self.assertEqual(res_dict['overLimit']['message'],
'Requested volume or snapshot exceeds allowed '
'Gigabytes quota')
'Gigabytes quota. Requested 2G, quota is 3G and '
'2G has been consumed.')
def test_restore_backup_with_VolumeLimitExceeded(self):

7
cinder/tests/api/contrib/test_volume_transfer.py
View File

@ -513,7 +513,9 @@ class VolumeTransferAPITestCase(test.TestCase):
def fake_transfer_api_accept_throwing_VolumeSizeExceedsAvailableQuota(
cls, context, transfer, volume_id):
raise exception.VolumeSizeExceedsAvailableQuota()
raise exception.VolumeSizeExceedsAvailableQuota(requested='2',
consumed='2',
quota='3')
self.stubs.Set(
cinder.transfer.API,
@ -538,7 +540,8 @@ class VolumeTransferAPITestCase(test.TestCase):
self.assertEqual(res_dict['overLimit']['code'], 413)
self.assertEqual(res_dict['overLimit']['message'],
'Requested volume or snapshot exceeds allowed '
'Gigabytes quota')
'Gigabytes quota. Requested 2G, quota is 3G and '
'2G has been consumed.')
def test_accept_transfer_with_VolumeLimitExceeded(self):

5
cinder/transfer/api.py
View File

@ -162,7 +162,10 @@ class API(base.Base):
's_size': vol_ref['size'],
'd_consumed': _consumed('gigabytes'),
'd_quota': quotas['gigabytes']})
raise exception.VolumeSizeExceedsAvailableQuota()
raise exception.VolumeSizeExceedsAvailableQuota(
requested=vol_ref['size'],
consumed=_consumed('gigabytes'),
quota=quotas['gigabytes'])
elif 'volumes' in overs:
msg = _("Quota exceeded for %(s_pid)s, tried to create "
"volume (%(d_consumed)d volumes "

5
cinder/volume/api.py
View File

@ -496,7 +496,10 @@ class API(base.Base):
's_size': volume['size'],
'd_consumed': _consumed(over),
'd_quota': quotas[over]})
raise exception.VolumeSizeExceedsAvailableQuota()
raise exception.VolumeSizeExceedsAvailableQuota(
requested=volume['size'],
consumed=_consumed('gigabytes'),
quota=quotas['gigabytes'])
elif 'snapshots' in over:
msg = _("Quota exceeded for %(s_pid)s, tried to create "
"snapshot (%(d_consumed)d snapshots "

5
cinder/volume/flows/create_volume/__init__.py
View File

@ -634,7 +634,10 @@ class QuotaReserveTask(base.CinderTask):
's_size': size,
'd_consumed': _consumed('gigabytes'),
'd_quota': quotas['gigabytes']})
raise exception.VolumeSizeExceedsAvailableQuota()
raise exception.VolumeSizeExceedsAvailableQuota(
requested=size,
consumed=_consumed('gigabytes'),
quota=quotas['gigabytes'])
elif _is_over('volumes'):
msg = _("Quota exceeded for %(s_pid)s, tried to create "
"volume (%(d_consumed)d volumes "