[blivet:master 09/16] Make 'min_members' a necessary property for every RAID level

mulhern amulhern at redhat.com
Tue May 6 16:42:34 UTC 2014


So far, they all seem to need it, also a minimum of at least 0 seems
sensible.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/devicelibs/mdraid.py | 7 +------
 blivet/devicelibs/raid.py   | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index 9cf6be0..715f5df 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -37,12 +37,7 @@ MD_CHUNK_SIZE = Size(spec="512 KiB")
 class MDRaidLevels(raid.RAIDLevels):
     @classmethod
     def isRaidLevel(cls, level):
-        """Every mdraid level must define min_members."""
-        try:
-            min_members = level.min_members
-            return super(MDRaidLevels, cls).isRaidLevel(level) and min_members > 0
-        except AttributeError:
-            return False
+        return super(MDRaidLevels, cls).isRaidLevel(level)
 
 _RAID_levels = MDRaidLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10", "container"])
 
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
index b4ea1ab..ebc98e6 100644
--- a/blivet/devicelibs/raid.py
+++ b/blivet/devicelibs/raid.py
@@ -285,7 +285,8 @@ class RAIDLevels(object):
         """
         return hasattr(level, 'names') and \
            hasattr(level, 'name') and \
-           level.name in level.names
+           level.name in level.names and \
+           hasattr(level, 'min_members')
 
     def raidLevel(self, descriptor):
         """Return RAID object corresponding to descriptor.
-- 
1.8.3.1



More information about the anaconda-patches mailing list