[PATCH 5/8] Make isDisk a property

[Hans de Goede <hdegoede@xxxxxxxxxx>]

Some MDRaidDevices are disks (BIOS RAID) others are not, so make
it a property so that MDRaidDevice can override it.
---
 storage/devices.py |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/storage/devices.py b/storage/devices.py
index 26c1a53..bddf055 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -427,7 +427,7 @@ class StorageDevice(Device):
     sysfsBlockDir = "class/block"
     _resizable = False
     _partitionable = False
-    isDisk = False
+    _isDisk = False
 
     def __init__(self, device, format=None,
                  size=None, major=None, minor=None,
@@ -739,6 +739,10 @@ class StorageDevice(Device):
                 open(remfile).readline().strip() == "1")
 
     @property
+    def isDisk(self):
+        return self._isDisk
+
+    @property
     def partitionable(self):
         return self._partitionable
 
@@ -764,7 +768,7 @@ class DiskDevice(StorageDevice):
     """ A disk """
     _type = "disk"
     _partitionable = True
-    isDisk = True
+    _isDisk = True
 
     def __init__(self, device, format=None,
                  size=None, major=None, minor=None, sysfsPath='',
@@ -2841,7 +2845,7 @@ class DMRaidArrayDevice(DMDevice):
     _type = "dm-raid array"
     _packages = ["dmraid"]
     _partitionable = True
-    isDisk = True
+    _isDisk = True
 
     def __init__(self, name, raidSet=None, format=None,
                  size=None, major=None, minor=None, parents=None,
@@ -2943,7 +2947,7 @@ class MultipathDevice(DMDevice):
     _type = "dm-multipath"
     _packages = ["device-mapper-multipath"]
     _partitionable = True
-    isDisk = True
+    _isDisk = True
 
     def __init__(self, name, info, format=None, size=None,
                  parents=None, sysfsPath=''):
@@ -3281,7 +3285,7 @@ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice):
     _type = "iscsi"
     _packages = ["iscsi-initiator-utils", "dracut-network"]
     _partitionable = True
-    isDisk = True
+    _isDisk = True
 
     def __init__(self, device, **kwargs):
         self.node = kwargs.pop("node")
@@ -3315,7 +3319,7 @@ class FcoeDiskDevice(DiskDevice, NetworkStorageDevice):
     _type = "fcoe"
     _packages = ["fcoe-utils", "dracut-network"]
     _partitionable = True
-    isDisk = True
+    _isDisk = True
 
     def __init__(self, device, **kwargs):
         self.nic = kwargs.pop("nic")
-- 
1.6.5.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list