From 4c16522cc25b49b0df92cfbac9562e33695c173e Mon Sep 17 00:00:00 2001 From: Aparna Date: Tue, 19 Jul 2016 11:50:42 +0000 Subject: [PATCH] Fix 'raid_config' validation error message Closes-Bug: #1609232 Change-Id: Ib38f43e42da3d8fd5a419ef5e80ec3ec2b6077af --- proliantutils/hpssa/manager.py | 2 +- proliantutils/tests/hpssa/test_manager.py | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/proliantutils/hpssa/manager.py b/proliantutils/hpssa/manager.py index 4f873d2..3d1b881 100644 --- a/proliantutils/hpssa/manager.py +++ b/proliantutils/hpssa/manager.py @@ -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) diff --git a/proliantutils/tests/hpssa/test_manager.py b/proliantutils/tests/hpssa/test_manager.py index e888474..e0eed57 100644 --- a/proliantutils/tests/hpssa/test_manager.py +++ b/proliantutils/tests/hpssa/test_manager.py @@ -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)