[blivet 12/13] Remove raidLevel and get_raid_min_members for mdraid.py.
mulhern
amulhern at redhat.com
Tue Nov 26 18:47:17 UTC 2013
Removed all tests as well.
Since anaconda makes use of these functions, an accompanying anaconda patch
must go in simultaneously with this patch.
Signed-off-by: mulhern <amulhern at redhat.com>
---
blivet/devicelibs/mdraid.py | 22 ----------------------
tests/devicelibs_test/mdraid_test.py | 26 --------------------------
2 files changed, 48 deletions(-)
diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index 81bbb95..6b05408 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -83,28 +83,6 @@ def getRaidLevel(descriptor):
except RaidError as e:
raise MDRaidError(e.message)
-def raidLevel(descriptor):
- """Return an integer code corresponding to this raid level descriptor.
- Raises an MDRaidError if the descriptor is not valid or does not
- have a corresponding numeric code.
- """
- try:
- return _RAID_levels.raidLevel(descriptor).number
- except RaidError as e:
- raise MDRaidError(e.message)
- except ValueError:
- raise MDRaidError(e.message)
-
-def get_raid_min_members(descriptor):
- """Return the minimum number of raid members required for this raid
- level descriptor. Raises an MDRaidError if the descriptor is
- invalid.
- """
- try:
- return _RAID_levels.raidLevel(descriptor).min_members
- 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 63fb3cd..04c9a28 100755
--- a/tests/devicelibs_test/mdraid_test.py
+++ b/tests/devicelibs_test/mdraid_test.py
@@ -20,22 +20,6 @@ class MDRaidTestCase(unittest.TestCase):
self.assertEqual(mdraid.getRaidLevel("raid10").name, "raid10")
##
- ## get_raid_min_members
- ##
- # pass
- self.assertEqual(mdraid.get_raid_min_members(mdraid.RAID0), 2)
- self.assertEqual(mdraid.get_raid_min_members(mdraid.RAID1), 2)
- self.assertEqual(mdraid.get_raid_min_members(mdraid.RAID5), 3)
- self.assertEqual(mdraid.get_raid_min_members(mdraid.RAID6), 4)
- self.assertEqual(mdraid.get_raid_min_members(mdraid.RAID10), 4)
-
- # fail
- # unsupported raid
- self.assertRaisesRegexp(errors.MDRaidError,
- "invalid raid level",
- mdraid.get_raid_min_members, 8)
-
- ##
## get_raid_superblock_size
##
self.assertEqual(mdraid.get_raid_superblock_size(256 * 1024), 128)
@@ -50,16 +34,6 @@ class MDRaidTestCase(unittest.TestCase):
self.assertEqual(mdraid.get_raid_superblock_size(257, "version"),
mdraid.MD_SUPERBLOCK_SIZE)
- ##
- ## raidLevel
- ##
- self.assertEqual(mdraid.raidLevel("RAID0"), 0)
-
- # fail
- # invalid raid
- self.assertRaisesRegexp(errors.MDRaidError,
- "invalid raid level",
- mdraid.raidLevel, "RAID")
class MDRaidAsRootTestCase(baseclass.DevicelibsTestCase):
--
1.8.3.1
More information about the anaconda-patches
mailing list