[blivet 08/13] Removed mdraid.get_raid_max_spares.
mulhern
amulhern at redhat.com
Tue Nov 26 18:47:13 UTC 2013
This procedure does not seem to be used by any of our downstream users.
The functionality is implemented in the raid package.
Tests have been updated accordingly.
Signed-off-by: mulhern <amulhern at redhat.com>
---
blivet/devicelibs/mdraid.py | 10 ----------
tests/devicelibs_test/mdraid_test.py | 16 ----------------
2 files changed, 26 deletions(-)
diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index 66cfe9c..de76d3f 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -118,16 +118,6 @@ def get_raid_min_members(descriptor):
except RaidError as e:
raise MDRaidError(e.message)
-def get_raid_max_spares(descriptor, nummembers):
- """Return the maximum number of raid spares for the descriptor,
- given nummembers members in the array. Raises an MDRaidError
- if the descriptor is invalid.
- """
- try:
- return _RAID_levels.raidLevel(descriptor).get_max_spares(nummembers)
- except RaidError as e:
- raise MDRaidError(e.message)
-
def get_raid_superblock_size(size, version=None):
""" mdadm has different amounts of space reserved for its use depending
on the metadata type and size of the array.
diff --git a/tests/devicelibs_test/mdraid_test.py b/tests/devicelibs_test/mdraid_test.py
index c92a0bd..085f724 100755
--- a/tests/devicelibs_test/mdraid_test.py
+++ b/tests/devicelibs_test/mdraid_test.py
@@ -36,22 +36,6 @@ class MDRaidTestCase(unittest.TestCase):
mdraid.get_raid_min_members, 8)
##
- ## get_raid_max_spares
- ##
- # pass
- self.assertEqual(mdraid.get_raid_max_spares(mdraid.RAID0, 5), 0)
- self.assertEqual(mdraid.get_raid_max_spares(mdraid.RAID1, 5), 3)
- self.assertEqual(mdraid.get_raid_max_spares(mdraid.RAID5, 5), 2)
- self.assertEqual(mdraid.get_raid_max_spares(mdraid.RAID6, 5), 1)
- self.assertEqual(mdraid.get_raid_max_spares(mdraid.RAID10, 5), 1)
-
- # fail
- # unsupported raid
- self.assertRaisesRegexp(errors.MDRaidError,
- "invalid raid level",
- mdraid.get_raid_max_spares, 8, 5)
-
- ##
## get_raid_superblock_size
##
self.assertEqual(mdraid.get_raid_superblock_size(256 * 1024), 128)
--
1.8.3.1
More information about the anaconda-patches
mailing list