[PATCH 5/5] Adapt callers to use the new parent list interface.
David Lehman
dlehman at redhat.com
Mon Mar 24 18:50:52 UTC 2014
---
blivet/deviceaction.py | 8 ++++----
blivet/devicefactory.py | 26 +++++++++++++-------------
blivet/devicetree.py | 10 +++++-----
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py
index 0815d6f..9c49f9f 100644
--- a/blivet/deviceaction.py
+++ b/blivet/deviceaction.py
@@ -688,10 +688,10 @@ class ActionAddMember(DeviceAction):
def __init__(self, container, device):
super(ActionAddMember, self).__init__(device)
self.container = container
- container._addMember(device)
+ container.parents.append(device)
def cancel(self):
- self.container._removeMember(self.device)
+ self.container.parents.remove(self.device)
def execute(self):
self.container.add(self.device)
@@ -741,10 +741,10 @@ class ActionRemoveMember(DeviceAction):
def __init__(self, container, device):
super(ActionRemoveMember, self).__init__(device)
self.container = container
- container._removeMember(device)
+ container.parents.remove(device)
def cancel(self):
- self.container._addMember(self.device)
+ self.container.parents.append(self.device)
def execute(self):
self.container.remove(self.device)
diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
index d635a59..e2e0434 100644
--- a/blivet/devicefactory.py
+++ b/blivet/devicefactory.py
@@ -482,11 +482,11 @@ class DeviceFactory(object):
log.debug("old member set: %s", [d.name for d in self.container.parents])
for member in self.container.parents[:]:
if member not in members:
- self.container._removeMember(member)
+ self.container.parents.remove(member)
for member in members:
if member not in self.container.parents:
- self.container._addMember(member)
+ self.container.parents.append(member)
def _set_container_raid_level(self):
pass
@@ -650,15 +650,15 @@ class DeviceFactory(object):
raw_device = self.raw_device
leaf_format = self.device.format
if parent_container:
- parent_container._removeMember(self.device)
+ parent_container.parents.remove(self.device)
self.storage.destroyDevice(self.device)
self.storage.formatDevice(self.raw_device, leaf_format)
self.device = raw_device
if parent_container:
- parent_container._addMember(self.device)
+ parent_container.parents.append(self.device)
elif self.encrypted and not isinstance(self.device, LUKSDevice):
if parent_container:
- parent_container._removeMember(self.device)
+ parent_container.parents.remove(self.device)
leaf_format = self.device.format
self.storage.formatDevice(self.device, getFormat("luks"))
luks_device = LUKSDevice("luks-%s" % self.device.name,
@@ -667,7 +667,7 @@ class DeviceFactory(object):
self.storage.createDevice(luks_device)
self.device = luks_device
if parent_container:
- parent_container._addMember(self.device)
+ parent_container.parents.append(self.device)
def _set_name(self):
if not self.device_name:
@@ -971,7 +971,7 @@ class PartitionSetFactory(PartitionFactory):
for member in members[:]:
if any([d in remove_disks for d in member.disks]):
if container:
- container._removeMember(member)
+ container.parents.remove(member)
if isinstance(member, LUKSDevice):
self.storage.destroyDevice(member)
@@ -989,7 +989,7 @@ class PartitionSetFactory(PartitionFactory):
member_encrypted = isinstance(member, LUKSDevice)
if member_encrypted and not self.encrypted:
if container:
- container._removeMember(member)
+ container.parents.remove(member)
self.storage.destroyDevice(member)
members.remove(member)
@@ -997,14 +997,14 @@ class PartitionSetFactory(PartitionFactory):
getFormat(self.fstype))
members.append(member.slave)
if container:
- container._addMember(member.slave)
+ container.parents.append(member.slave)
continue
if not member_encrypted and self.encrypted:
members.remove(member)
if container:
- container._removeMember(member)
+ container.parents.remove(member)
self.storage.formatDevice(member, getFormat("luks"))
luks_member = LUKSDevice("luks-%s" % member.name,
@@ -1013,7 +1013,7 @@ class PartitionSetFactory(PartitionFactory):
self.storage.createDevice(luks_member)
members.append(luks_member)
if container:
- container._addMember(luks_member)
+ container.parents.append(luks_member)
continue
@@ -1058,7 +1058,7 @@ class PartitionSetFactory(PartitionFactory):
members.append(member)
new_members.append(member)
if container:
- container._addMember(member)
+ container.parents.append(member)
##
## Determine target container size.
@@ -1272,7 +1272,7 @@ class LVMFactory(DeviceFactory):
if ((self.container_raid_level and use_dev.type != "mdarray") or
(not self.container_raid_level and use_dev.type == "mdarray")):
- self.container._removeMember(member)
+ self.container.parents.remove(member)
self.storage.destroyDevice(member)
if member != use_dev:
self.storage.destroyDevice(use_dev)
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index ce1cb49..234996c 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1478,7 +1478,7 @@ class DeviceTree(object):
vg_device = self.getDeviceByUuid(vg_uuid, incomplete=True)
if vg_device:
- vg_device._addMember(device)
+ vg_device.parents.append(device)
else:
try:
vg_size = udev_device_get_vg_size(info)
@@ -1543,7 +1543,7 @@ class DeviceTree(object):
md_array = self.getDeviceByUuid(device.format.mdUuid, incomplete=True)
if device.format.mdUuid and md_array:
- md_array._addMember(device)
+ md_array.parents.append(device)
else:
# create the array with just this one member
try:
@@ -1617,7 +1617,7 @@ class DeviceTree(object):
return
md_array.updateSysfsPath()
- md_array._addMember(device)
+ md_array.parents.append(device)
self._addDevice(md_array)
def handleUdevDMRaidMemberFormat(self, info, device):
@@ -1648,7 +1648,7 @@ class DeviceTree(object):
dm_array = self.getDeviceByName(rs.name, incomplete=True)
if dm_array is not None:
# We add the new device.
- dm_array._addMember(device)
+ dm_array.parents.append(device)
else:
# Activate the Raid set.
rs.activate(mknod=True)
@@ -1690,7 +1690,7 @@ class DeviceTree(object):
if btrfs_dev:
log.info("found btrfs volume %s" % btrfs_dev.name)
- btrfs_dev._addMember(device)
+ btrfs_dev.parents.append(device)
else:
label = udev_device_get_label(info)
log.info("creating btrfs volume btrfs.%s", label)
--
1.8.5.3
More information about the anaconda-patches
mailing list