[master 2/3] Move mediaPresent out of Device and into StorageDevice.
dwlehman
installerbot-noreply at redhat.com
Thu Apr 2 21:08:12 UTC 2015
From: David Lehman <dlehman at redhat.com>
mediaPresent indicates whether a device node is backed by
readable/writeable media. It is generally only meaningful for root devices
(devices with no parents). There are only a few instances in which this
is relevant: cdrom/dvd, card readers, md containers, and some goofy raid
hardware that creates a zero-size block device node. If you need a general-
purpose property to tell you if a device is available for general use, what
you want is the device's status attribute.
---
blivet/devices/device.py | 5 -----
blivet/devices/md.py | 12 ------------
blivet/devices/storage.py | 5 +++++
tests/devices_test/device_properties_test.py | 6 ++----
4 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/blivet/devices/device.py b/blivet/devices/device.py
index 41c8008..247f792 100644
--- a/blivet/devices/device.py
+++ b/blivet/devices/device.py
@@ -288,11 +288,6 @@ def packages(self):
return packages
- @property
- def mediaPresent(self):
- """ True if this device contains usable media. """
- return True
-
@classmethod
def isNameValid(cls, name): # pylint: disable=unused-argument
"""Is the device name valid for the device type?"""
diff --git a/blivet/devices/md.py b/blivet/devices/md.py
index fe19252..e214a56 100644
--- a/blivet/devices/md.py
+++ b/blivet/devices/md.py
@@ -530,13 +530,6 @@ def formatArgs(self):
return formatArgs
@property
- def mediaPresent(self):
- if flags.testing:
- return True
- else:
- return super(MDRaidArrayDevice, self).mediaPresent
-
- @property
def model(self):
return self.description
@@ -651,8 +644,3 @@ def teardown(self, recursive=None):
# there is no need to stop them and later restart them. Not stopping
# (and thus also not starting) them also works around bug 523334
return
-
- @property
- def mediaPresent(self):
- # BIOS RAID sets should show as present even when teared down
- return True
diff --git a/blivet/devices/storage.py b/blivet/devices/storage.py
index a6cabec..0897065 100644
--- a/blivet/devices/storage.py
+++ b/blivet/devices/storage.py
@@ -573,6 +573,11 @@ def maxSize(self):
return self.alignTargetSize(self.format.maxSize) if self.resizable else self.currentSize
@property
+ def mediaPresent(self):
+ """ True if this device contains usable media. """
+ return True
+
+ @property
def status(self):
""" This device's status.
diff --git a/tests/devices_test/device_properties_test.py b/tests/devices_test/device_properties_test.py
index f3cc8ce..acd447e 100644
--- a/tests/devices_test/device_properties_test.py
+++ b/tests/devices_test/device_properties_test.py
@@ -56,7 +56,7 @@ def __init__(self, methodName='runTest'):
"isleaf" : xform(self.assertTrue),
"major" : xform(lambda x, m: self.assertEqual(x, 0, m)),
"maxSize" : xform(lambda x, m: self.assertEqual(x, Size(0), m)),
- "mediaPresent" : xform(self.assertFalse),
+ "mediaPresent" : xform(self.assertTrue),
"minor" : xform(lambda x, m: self.assertEqual(x, 0, m)),
"parents" : xform(lambda x, m: self.assertEqual(len(x), 0, m) and
self.assertIsInstance(x, ParentList, m)),
@@ -365,6 +365,7 @@ def testMDRaidArrayDeviceInit(self):
devices=xform(lambda x, m: self.assertEqual(len(x), 1, m)),
level=xform(lambda x, m: self.assertEqual(x.name, "container", m)),
parents=xform(lambda x, m: self.assertEqual(len(x), 1, m)),
+ mediaPresent=xform(self.assertFalse),
type=xform(lambda x, m: self.assertEqual(x, "mdcontainer", m)))
self.stateCheck(self.dev2,
createBitmap=xform(self.assertFalse),
@@ -409,7 +410,6 @@ def testMDRaidArrayDeviceInit(self):
devices=xform(lambda x, m: self.assertEqual(len(x), 2, m)),
isDisk=xform(self.assertTrue),
level=xform(lambda x, m: self.assertEqual(x.number, 0, m)),
- mediaPresent=xform(self.assertTrue),
memberDevices=xform(lambda x, m: self.assertEqual(x, 2, m)),
parents=xform(lambda x, m: self.assertNotEqual(x, [], m)),
partitionable=xform(self.assertTrue),
@@ -430,7 +430,6 @@ def testMDRaidArrayDeviceInit(self):
devices=xform(lambda x, m: self.assertEqual(len(x), 2, m)),
isDisk=xform(self.assertTrue),
level=xform(lambda x, m: self.assertEqual(x.number, 1, m)),
- mediaPresent=xform(self.assertTrue),
memberDevices=xform(lambda x, m: self.assertEqual(x, 2, m)),
parents=xform(lambda x, m: self.assertNotEqual(x, [], m)),
partitionable=xform(self.assertTrue),
@@ -442,7 +441,6 @@ def testMDRaidArrayDeviceInit(self):
devices=xform(lambda x, m: self.assertEqual(len(x), 2, m)),
isDisk=xform(self.assertTrue),
level=xform(lambda x, m: self.assertEqual(x.number, 1, m)),
- mediaPresent=xform(self.assertTrue),
memberDevices=xform(lambda x, m: self.assertEqual(x, 2, m)),
parents=xform(lambda x, m: self.assertNotEqual(x, [], m)),
partitionable=xform(self.assertTrue),
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/fe1e5b6641468a193122f57ef4f353399844d1a3
More information about the anaconda-patches
mailing list