openstack/deb-python-proliantutils
Code Issues Proposed changes

Merge "Fix 'raid_config' validation error message"

Browse Source
This commit is contained in:
Jenkins
2016-08-03 12:12:31 +00:00
committed by Gerrit Code Review
parent 0d74b924cc 4c16522cc2
commit 4845cf77b2
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proliantutils/hpssa/manager.py
View File

@@ -68,7 +68,7 @@ def validate(raid_config):
if (no_of_disks_specified and
no_of_disks_specified < min_disks_reqd):
msg = ("RAID level %(raid_level)s requires at least %(number) "
msg = ("RAID level %(raid_level)s requires at least %(number)s "
"disks." % {'raid_level': raid_level,
'number': min_disks_reqd})
raise exception.InvalidInputError(msg)

21
proliantutils/tests/hpssa/test_manager.py
View File

@@ -414,13 +414,18 @@ class ManagerTestCases(testtools.TestCase):
class RaidConfigValidationTestCases(testtools.TestCase):
def test_validate_fails_min_disks_number(self):
raid_config = {'size_gb': 100, 'raid_level': 5,
'number_of_physical_disks': 2}
self.assertRaises(exception.InvalidInputError,
manager.validate, raid_config)
raid_config = {'logical_disks':
[{'size_gb': 100,
'raid_level': '5',
'number_of_physical_disks': 2}]}
msg = "RAID level 5 requires at least 3 disks"
self.assertRaisesRegex(exception.InvalidInputError, msg,
manager.validate, raid_config)
def test_validate_fails_min_physical_disks(self):
raid_config = {'size_gb': 100, 'raid_level': 5,
'physical_disks': ['foo']}
self.assertRaises(exception.InvalidInputError,
manager.validate, raid_config)
raid_config = {'logical_disks':
[{'size_gb': 100, 'raid_level': '5',
'physical_disks': ['foo']}]}
msg = "RAID level 5 requires at least 3 disks"
self.assertRaisesRegex(exception.InvalidInputError, msg,
manager.validate, raid_config)