[blivet 11/13] Remove raidLevelString in raid and mdraid.

mulhern amulhern at redhat.com
Tue Nov 26 18:47:16 UTC 2013


This procedure is no longer used. If the user needs a raidLevelString
they should get the level object and use its name (or nick) field.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/devicelibs/mdraid.py          | 11 -----------
 blivet/devicelibs/raid.py            | 10 ----------
 tests/devicelibs_test/mdraid_test.py | 14 --------------
 tests/devicelibs_test/raid_test.py   | 11 -----------
 4 files changed, 46 deletions(-)

diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index 652b33b..81bbb95 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -95,17 +95,6 @@ def raidLevel(descriptor):
     except ValueError:
         raise MDRaidError(e.message)
 
-def raidLevelString(descriptor, use_nick=False):
-    """Returns the canonical name for the descriptor. Raises an
-       MDRaidError if there is no corresponding level for the descriptor.
-
-       Return the nickname if use_nick is True.
-    """
-    try:
-        return _RAID_levels.raidLevelString(descriptor, use_nick)
-    except RaidError as e:
-        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
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index f9ad1c1..e8d64a9 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -246,16 +246,6 @@ class RAIDLevels(object):
                 return level
         raise RaidError("invalid raid level descriptor %s" % descriptor)
 
-    def raidLevelString(self, descriptor, use_nick=False):
-        """Returns the canonical name for the descriptor. Raises an
-           MDRaidError if there is no corresponding level for the descriptor.
-
-           Return the nickname if use_nick is True.
-        """
-        level = self.raidLevel(descriptor)
-        nick = level.nick
-        return nick if nick and use_nick else level.name
-
     def addRaidLevel(self, level):
         """Adds level to the list of levels if it is not already there.
            Raises a RaidError if it is not a valid level.
diff --git a/tests/devicelibs_test/mdraid_test.py b/tests/devicelibs_test/mdraid_test.py
index 8b33fa5..63fb3cd 100755
--- a/tests/devicelibs_test/mdraid_test.py
+++ b/tests/devicelibs_test/mdraid_test.py
@@ -61,20 +61,6 @@ class MDRaidTestCase(unittest.TestCase):
            "invalid raid level",
            mdraid.raidLevel, "RAID")
 
-        ##
-        ## raidLevelString
-        ##
-        self.assertEqual(mdraid.raidLevelString(0), "raid0")
-        self.assertEqual(mdraid.raidLevelString(0, True), "stripe")
-        self.assertEqual(mdraid.raidLevelString(1, True), "mirror")
-        self.assertEqual(mdraid.raidLevelString(6, True), "raid6")
-
-        # fail
-        # invalid constant
-        self.assertRaisesRegexp(errors.MDRaidError,
-           "invalid raid level",
-           mdraid.raidLevelString, -1)
-
 class MDRaidAsRootTestCase(baseclass.DevicelibsTestCase):
 
     @unittest.skipUnless(os.geteuid() == 0, "requires root privileges")
diff --git a/tests/devicelibs_test/raid_test.py b/tests/devicelibs_test/raid_test.py
index 46a54b1..331bef2 100644
--- a/tests/devicelibs_test/raid_test.py
+++ b/tests/devicelibs_test/raid_test.py
@@ -92,17 +92,6 @@ class RaidTestCase(unittest.TestCase):
 
         self.assertRaises(errors.RaidError, raid.RAID10.get_recommended_stride, 1)
 
-        ##
-        ## raidLevelString
-        ##
-        self.assertEqual(self.levels.raidLevelString(0), "raid0")
-        self.assertEqual(self.levels.raidLevelString(0, True), "stripe")
-        self.assertEqual(self.levels.raidLevelString(1, True), "mirror")
-        self.assertEqual(self.levels.raidLevelString(6, True), "raid6")
-
-        self.assertRaisesRegexp(errors.RaidError,
-                                "invalid raid level",
-                                self.levels.raidLevelString, 27)
 
         ##
         ## names
-- 
1.8.3.1



More information about the anaconda-patches mailing list