From a19f483954e18022e8a9aef305262be400ec6fbc Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Thu, 22 Jan 2015 02:38:37 +0100 Subject: [PATCH] fix typo in config.py Change help texts and messages from GigaByte/Gigabyte(s) to correct spelling gigabyte(s). Change-Id: I6b9d80dad619a9f02cef10d2a303c30b6c4572fb Signed-off-by: Danny Al-Gaaf --- cinder/common/config.py | 2 +- cinder/exception.py | 4 ++-- cinder/tests/api/contrib/test_backups.py | 2 +- cinder/tests/api/contrib/test_volume_transfer.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cinder/common/config.py b/cinder/common/config.py index 6c5415613..5631a3726 100644 --- a/cinder/common/config.py +++ b/cinder/common/config.py @@ -175,7 +175,7 @@ global_opts = [ 'with its options'), cfg.BoolOpt('no_snapshot_gb_quota', default=False, - help='Whether snapshots count against GigaByte quota'), + help='Whether snapshots count against gigabyte quota'), cfg.StrOpt('transfer_api_class', default='cinder.transfer.api.API', help='The full class name of the volume transfer API class'), diff --git a/cinder/exception.py b/cinder/exception.py index b236bc1a3..90025e0af 100644 --- a/cinder/exception.py +++ b/cinder/exception.py @@ -444,13 +444,13 @@ class QuotaError(CinderException): class VolumeSizeExceedsAvailableQuota(QuotaError): - message = _("Requested volume or snapshot exceeds allowed Gigabytes " + message = _("Requested volume or snapshot exceeds allowed gigabytes " "quota. Requested %(requested)sG, quota is %(quota)sG and " "%(consumed)sG has been consumed.") class VolumeBackupSizeExceedsAvailableQuota(QuotaError): - message = _("Requested backup exceeds allowed Backup Gigabytes " + message = _("Requested backup exceeds allowed Backup gigabytes " "quota. Requested %(requested)sG, quota is %(quota)sG and " "%(consumed)sG has been consumed.") diff --git a/cinder/tests/api/contrib/test_backups.py b/cinder/tests/api/contrib/test_backups.py index 3bf5f22a7..55bf52077 100644 --- a/cinder/tests/api/contrib/test_backups.py +++ b/cinder/tests/api/contrib/test_backups.py @@ -908,7 +908,7 @@ 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. Requested 2G, quota is 3G and ' + 'gigabytes quota. Requested 2G, quota is 3G and ' '2G has been consumed.') @mock.patch('cinder.backup.API.restore') diff --git a/cinder/tests/api/contrib/test_volume_transfer.py b/cinder/tests/api/contrib/test_volume_transfer.py index 9ba455f9f..e870882dc 100644 --- a/cinder/tests/api/contrib/test_volume_transfer.py +++ b/cinder/tests/api/contrib/test_volume_transfer.py @@ -568,7 +568,7 @@ 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. Requested 2G, quota is 3G and ' + 'gigabytes quota. Requested 2G, quota is 3G and ' '2G has been consumed.') def test_accept_transfer_with_VolumeLimitExceeded(self): -- 2.45.2