[blivet:master 11/11] Removed some now unused methods from devices (#1085474)
mulhern
amulhern at redhat.com
Fri Apr 11 15:23:12 UTC 2014
Resolves: fed#1085474
Update tests accordingly.
Signed-off-by: mulhern <amulhern at redhat.com>
---
blivet/devices.py | 30 ------------------------------
tests/devices_test.py | 21 ---------------------
2 files changed, 51 deletions(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index 7bceb87..bff2b1a 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -3246,29 +3246,6 @@ class MDRaidArrayDevice(ContainerDevice):
# bitmaps are not meaningful on raid0 according to mdadm-3.0.3
self.createBitmap = self._level.name != "raid0"
- @property
- def rawArraySize(self):
- """ Calculate the raw array size without taking into account space
- reserved for metadata or chunkSize alignment.
-
- This is used to calculate the superBlockSize for v1.1 and v1.2
- metadata.
-
- Returns the raw size
-
- Raises an MDRaidError if this operation is not meaningful for the
- raid level.
- """
- smallestMember = self.smallestMember
- if smallestMember is None:
- return 0
-
- smallestMemberSize = smallestMember.size
- size = self.level.get_net_array_size(self.memberDevices,
- smallestMemberSize)
- log.debug("raw RAID %s size == %s", self.level, size)
- return size
-
def superBlockSize(self, raw_array_size):
"""Estimate the superblock size for a member of an array,
given the total available memory for this array and raid level.
@@ -3282,13 +3259,6 @@ class MDRaidArrayDevice(ContainerDevice):
version=self.metadataVersion)
@property
- def smallestMember(self):
- if not self.devices:
- return None
- else:
- return min(self.devices, key=lambda d: d.size)
-
- @property
def size(self):
"""Returns the actual or estimated size depending on whether or
not the array exists.
diff --git a/tests/devices_test.py b/tests/devices_test.py
index 5d07f65..34b10fb 100644
--- a/tests/devices_test.py
+++ b/tests/devices_test.py
@@ -81,10 +81,8 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
self.assertIsInstance(x, ParentList, m),
"path" : lambda x, m: self.assertRegexpMatches(x, "^/dev", m),
"partitionable" : self.assertFalse,
- "rawArraySize" : lambda x, m: self.assertEqual(x, Size(bytes=0), m),
"resizable" : self.assertFalse,
"size" : lambda x, m: self.assertEqual(x, Size(bytes=0), m),
- "smallestMember" : self.assertIsNone,
"spares" : lambda x, m: self.assertEqual(x, 0, m),
"status" : self.assertFalse,
"sysfsPath" : lambda x, m: self.assertEqual(x, "", m),
@@ -275,7 +273,6 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
memberDevices=lambda x, m: self.assertEqual(x, 2, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
partitionable=self.assertTrue,
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 2, m),
type = lambda x, m: self.assertEqual(x, "mdbiosraidarray", m))
@@ -295,14 +292,10 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
memberDevices=lambda x, m: self.assertEqual(x, 2, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
partitionable=self.assertTrue,
- smallestMember=self.assertIsNotNone,
targetSize=lambda x, m: self.assertEqual(x, Size(spec="32 MiB"), m),
totalDevices=lambda x, m: self.assertEqual(x, 2, m),
type=lambda x, m: self.assertEqual(x, "mdbiosraidarray", m))
- ##
- ## rawArraySize tests
- ##
self.stateCheck(self.dev12,
devices=lambda x, m: self.assertEqual(len(x), 2, m),
isDisk=self.assertTrue,
@@ -311,8 +304,6 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
memberDevices=lambda x, m: self.assertEqual(x, 2, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
partitionable=self.assertTrue,
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="2 MiB"), m),
- smallestMember=self.assertIsNotNone,
targetSize=lambda x, m: self.assertEqual(x, Size(spec="32 MiB"), m),
totalDevices=lambda x, m: self.assertEqual(x, 2, m),
type = lambda x, m: self.assertEqual(x, "mdbiosraidarray", m))
@@ -323,9 +314,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 0, m),
memberDevices=lambda x, m: self.assertEqual(x, 3, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="6 MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="3 MiB"), m),
- smallestMember=self.assertIsNotNone,
targetSize=lambda x, m: self.assertEqual(x, Size(spec="32 MiB"), m),
totalDevices=lambda x, m: self.assertEqual(x, 3, m))
@@ -334,9 +323,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 4, m),
memberDevices=lambda x, m: self.assertEqual(x, 3, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4 MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2 MiB"), m),
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 3, m))
self.stateCheck(self.dev15,
@@ -344,9 +331,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 5, m),
memberDevices=lambda x, m: self.assertEqual(x, 3, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4 MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2 MiB"), m),
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 3, m))
self.stateCheck(self.dev16,
@@ -354,9 +339,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 6, m),
memberDevices=lambda x, m: self.assertEqual(x, 4, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4 MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2 MiB"), m),
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 4, m))
self.stateCheck(self.dev17,
@@ -364,9 +347,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 10, m),
memberDevices=lambda x, m: self.assertEqual(x, 4, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4 MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2 MiB"), m),
- smallestMember=self.assertIsNotNone,
totalDevices=lambda x, m: self.assertEqual(x, 4, m))
self.stateCheck(self.dev18,
@@ -374,9 +355,7 @@ class MDRaidArrayDeviceTestCase(DeviceStateTestCase):
level=lambda x, m: self.assertEqual(x.number, 10, m),
memberDevices=lambda x, m: self.assertEqual(x, 4, m),
parents=lambda x, m: self.assertNotEqual(x, [], m),
- rawArraySize=lambda x, m: self.assertEqual(x, Size(spec="4 MiB"), m),
size=lambda x, m: self.assertEqual(x, Size(spec="2 MiB"), m),
- smallestMember=self.assertIsNotNone,
spares=lambda x, m: self.assertEqual(x, 1, m),
totalDevices=lambda x, m: self.assertEqual(x, 5, m))
--
1.8.3.1
More information about the anaconda-patches
mailing list