anaconda-patches April 2016

anaconda-patches@lists.fedorahosted.org

9 participants
1157 discussions

[2.2-devel 7/7] Add a unit test for DBusBlivet.RemoveDevice.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> --- tests/dbus_test.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/dbus_test.py b/tests/dbus_test.py index 913e720..203bb9f 100644 --- a/tests/dbus_test.py +++ b/tests/dbus_test.py @@ -17,7 +17,7 @@ class UDevBlivetTestCase(TestCase): @patch("blivet.dbus.blivet.callbacks") def setUp(self, *args): # pylint: disable=unused-argument self.dbus_object = DBusBlivet(Mock(name="ObjectManager")) - self.dbus_object._blivet = Mock(spec=Blivet) + self.dbus_object._blivet = Mock() def test_ListDevices(self): """ Verify that ListDevices returns what it should. @@ -43,6 +43,17 @@ def test_Reset(self): self.dbus_object._blivet.reset.assert_called_once_with() self.dbus_object._blivet.reset_mock() + def test_RemoveDevice(self): + self.dbus_object._blivet.reset_mock() + object_path = '/com/redhat/Blivet1/Devices/23' + device_mock = Mock("device 23") + with patch.object(self.dbus_object, '_dbus_devices', new=dict()): + self.dbus_object._dbus_devices[object_path] = device_mock + self.dbus_object.RemoveDevice(object_path) + + self.dbus_object._blivet.devicetree.recursive_remove.assert_called_once_with(device_mock) + self.dbus_object._blivet.reset_mock() + class DBusObjectTestCase(TestCase): @patch.object(DBusObject, '__init__', return_value=None) -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/26e065d111e4eeb43dbe3240b95404…

1 0

[2.2-devel 6/7] Maintain a mapping of object path to DBusDevice in DBusBlivet.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> This is far more efficient given the frequency of device lookups by object path as necessitated by the dbus interface. --- blivet/dbus/blivet.py | 21 ++++++++------------- tests/dbus_test.py | 3 ++- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/blivet/dbus/blivet.py b/blivet/dbus/blivet.py index e893681..d69f7b8 100644 --- a/blivet/dbus/blivet.py +++ b/blivet/dbus/blivet.py @@ -17,6 +17,7 @@ # # Red Hat Author(s): David Lehman <dlehman(a)redhat.com> # +from collections import OrderedDict import sys import dbus @@ -36,7 +37,7 @@ class DBusBlivet(DBusObject): """ def __init__(self, manager): super().__init__() - self._dbus_devices = list() + self._dbus_devices = OrderedDict() self._manager = manager # provides ObjectManager interface self._blivet = Blivet() self._set_up_callbacks() @@ -61,21 +62,16 @@ def properties(self): def _device_removed(self, device): """ Update ObjectManager interface after a device is removed. """ removed_object_path = DBusDevice.get_object_path_by_id(device.id) - removed = next((d for d in self._dbus_devices if d.object_path == removed_object_path)) + removed = self._dbus_devices[removed_object_path] self._manager.remove_object(removed) - self._dbus_devices.remove(removed) + del self._dbus_devices[removed_object_path] def _device_added(self, device): """ Update ObjectManager interface after a device is added. """ added = DBusDevice(device) - self._dbus_devices.append(added) + self._dbus_devices[added.object_path] = added self._manager.add_object(added) - def _get_device_by_object_path(self, object_path): - """ Return the :class:`blivet.dbus.device.DBusDevice` at the given path. """ - # FIXME: This is inefficient. Implement an object_path->dbus_device dictionary. - return next(d._device for d in self._dbus_devices if d.object_path == object_path) - @dbus.service.method(dbus_interface=BLIVET_INTERFACE) def Reset(self): """ Reset the Blivet instance and populate the device tree. """ @@ -93,7 +89,7 @@ def Exit(self): @dbus.service.method(dbus_interface=BLIVET_INTERFACE, out_signature='ao') def ListDevices(self): """ Return a list of strings describing the devices in this system. """ - return dbus.Array([d.object_path for d in self._dbus_devices], signature='o') + return dbus.Array(list(self._dbus_devices.keys()), signature='o') @dbus.service.method(dbus_interface=BLIVET_INTERFACE, in_signature='s', out_signature='o') def ResolveDevice(self, spec): @@ -105,12 +101,11 @@ def ResolveDevice(self, spec): 'No device was found that matches the device ' 'descriptor "%s".' % spec) - dbus_device = next(d for d in self._dbus_devices if d._device == device) - object_path = dbus_device.object_path + object_path = next(p for (p, d) in self._dbus_devices.items() if d._device == device) return object_path @dbus.service.method(dbus_interface=BLIVET_INTERFACE, in_signature='o') def RemoveDevice(self, object_path): """ Remove a device and all devices built on it. """ - device = self._get_device_by_object_path(object_path) + device = self._dbus_devices[object_path] self._blivet.devicetree.recursive_remove(device) diff --git a/tests/dbus_test.py b/tests/dbus_test.py index cca70e3..913e720 100644 --- a/tests/dbus_test.py +++ b/tests/dbus_test.py @@ -1,3 +1,4 @@ +from collections import OrderedDict import random from unittest import TestCase from unittest.mock import Mock, patch, sentinel @@ -25,7 +26,7 @@ def test_ListDevices(self): dbus object path of each device in the DBusBlivet. """ object_paths = dbus.Array([sentinel.dev1, sentinel.dev2, sentinel.dev3], signature='o') - dbus_devices = [Mock(object_path=p) for p in object_paths] + dbus_devices = OrderedDict((p, Mock(object_path=p)) for p in object_paths) self.dbus_object._dbus_devices = dbus_devices self.assertEqual(self.dbus_object.ListDevices(), object_paths) -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/1a8dfe21dfa1086dade81bed98f933…

1 0

[2.2-devel 5/7] Correctly handle failures in ResolveDevice.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> You can't return "" when your out signature is expecting an object path. It's better to return an error instead. --- blivet/dbus/blivet.py | 12 ++++++++---- tests/dbus_test.py | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/blivet/dbus/blivet.py b/blivet/dbus/blivet.py index dc6ffc4..e893681 100644 --- a/blivet/dbus/blivet.py +++ b/blivet/dbus/blivet.py @@ -23,7 +23,7 @@ from blivet import Blivet from blivet.callbacks import callbacks -from .constants import BLIVET_INTERFACE, BLIVET_OBJECT_PATH +from .constants import BLIVET_INTERFACE, BLIVET_OBJECT_PATH, BUS_NAME from .device import DBusDevice from .object import DBusObject @@ -100,9 +100,13 @@ def ResolveDevice(self, spec): """ Return a string describing the device the given specifier resolves to. """ device = self._blivet.devicetree.resolve_device(spec) object_path = "" - if device is not None: - dbus_device = next(d for d in self._dbus_devices if d._device == device) - object_path = dbus_device.object_path + if device is None: + raise dbus.exceptions.DBusException('%s.DeviceLookupFailed' % BUS_NAME, + 'No device was found that matches the device ' + 'descriptor "%s".' % spec) + + dbus_device = next(d for d in self._dbus_devices if d._device == device) + object_path = dbus_device.object_path return object_path @dbus.service.method(dbus_interface=BLIVET_INTERFACE, in_signature='o') diff --git a/tests/dbus_test.py b/tests/dbus_test.py index 40e0e67..cca70e3 100644 --- a/tests/dbus_test.py +++ b/tests/dbus_test.py @@ -45,6 +45,7 @@ def test_Reset(self): class DBusObjectTestCase(TestCase): @patch.object(DBusObject, '__init__', return_value=None) + @patch("blivet.dbus.blivet.callbacks") def setUp(self, *args): # pylint: disable=unused-argument self.obj = DBusObject() @@ -61,6 +62,7 @@ def test_properties(self): class DBusDeviceTestCase(DBusObjectTestCase): @patch.object(DBusObject, '__init__', return_value=None) + @patch("blivet.dbus.blivet.callbacks") def setUp(self, *args): self._device_id = random.randint(0, 500) self.obj = DBusDevice(Mock(name="StorageDevice", id=self._device_id, -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/3cd9bacb1d626411afe326dd53093f…

1 0

[2.2-devel 4/7] Allow replacing an active format within blivet's model.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> There is no reason to disallow this that I can think of as we can tear things down right before we commit the changes. --- blivet/devices/storage.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/blivet/devices/storage.py b/blivet/devices/storage.py index d20a52e..0ba515c 100644 --- a/blivet/devices/storage.py +++ b/blivet/devices/storage.py @@ -701,9 +701,6 @@ def _set_format(self, fmt): log_method_call(self, self.name, type=fmt.type, current=getattr(self._format, "type", None)) - if self._format and self._format.status: - # FIXME: self.format.status doesn't mean much - raise errors.DeviceError("cannot replace active format", self.name) # check device size against format limits if not fmt.exists: -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/802fe844643d64726dab3d1bc46377…

1 0

[2.2-devel 3/7] Convert event handling change accounting to use blivet callbacks.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> There will be some spurious format-changed entries because the callback is run even when the format is set from the device constructor. --- blivet/actionlist.py | 3 --- blivet/devicetree.py | 9 ------- blivet/events/changes.py | 42 +++++++++++++++++++++++++++++ blivet/events/handler.py | 13 +++++---- blivet/events/manager.py | 4 +++ blivet/populator/helpers/formatpopulator.py | 12 +++------ blivet/populator/helpers/lvm.py | 11 ++++---- 7 files changed, 60 insertions(+), 34 deletions(-) diff --git a/blivet/actionlist.py b/blivet/actionlist.py index 83f172d..a3dfca6 100644 --- a/blivet/actionlist.py +++ b/blivet/actionlist.py @@ -29,8 +29,6 @@ from .devicelibs import lvm from .devices import PartitionDevice from .errors import DiskLabelCommitError, StorageError -from .events.changes import record_change -from .events.changes import ActionCanceled from .flags import flags from . import tsort from .threads import blivet_lock, SynchronizedMeta @@ -84,7 +82,6 @@ def remove(self, action): action.cancel() self._actions.remove(action) - record_change(ActionCanceled(action=action)) _callbacks.action_removed(action=action) log.info("canceled action %s", action) diff --git a/blivet/devicetree.py b/blivet/devicetree.py index d30bf5d..7f878d0 100644 --- a/blivet/devicetree.py +++ b/blivet/devicetree.py @@ -37,8 +37,6 @@ from .devices import LVMLogicalVolumeDevice, LVMVolumeGroupDevice from . import formats from .devicelibs import lvm -from .events.changes import record_change -from .events.changes import AttributeChanged, DeviceAdded, DeviceRemoved from .events.handler import EventHandlerMixin from . import util from .populator import PopulatorMixin @@ -162,7 +160,6 @@ def _add_device(self, newdev, new=True): newdev.type != "btrfs volume" and newdev.name not in self.names): self.names.append(newdev.name) - record_change(DeviceAdded(device=newdev)) callbacks.device_added(device=newdev) log.info("added %s %s (id %d) to device tree", newdev.type, newdev.name, @@ -206,7 +203,6 @@ def _remove_device(self, dev, force=None, modparent=True): device.update_name() self._devices.remove(dev) - record_change(DeviceRemoved(device=dev)) callbacks.device_removed(device=dev) log.info("removed %s %s (id %d) from device tree", dev.type, dev.name, @@ -254,16 +250,11 @@ def recursive_remove(self, device, actions=True, remove_device=True, modparent=T devices.remove(leaf) if not device.format_immutable: - old_fmt = device.format if actions: self.actions.add(ActionDestroyFormat(device)) else: device.format = None - if old_fmt.type and (not remove_device or device.is_disk): - record_change(AttributeChanged(device=device, attr="format", - old=old_fmt, new=device.format)) - if remove_device and not device.is_disk: if actions: self.actions.add(ActionDestroyDevice(device)) diff --git a/blivet/events/changes.py b/blivet/events/changes.py index 5d3c124..220d7e3 100644 --- a/blivet/events/changes.py +++ b/blivet/events/changes.py @@ -22,6 +22,7 @@ from threading import local +from ..callbacks import callbacks from .. import util @@ -83,3 +84,44 @@ def record_change(change): data.changes = list() data.changes.append(change) + + +def device_added_cb(device): + record_change(DeviceAdded(device)) + + +def device_removed_cb(device): + record_change(DeviceRemoved(device)) + + +def action_removed_cb(action): + record_change(ActionCanceled(action)) + + +def parent_added_cb(device, parent): + record_change(ParentAdded(parent, device)) + + +def parent_removed_cb(device, parent): + record_change(ParentRemoved(parent, device)) + + +def attribute_changed_cb(device, attr, old, new, fmt=None): + record_change(AttributeChanged(device, fmt, attr, old, new)) + + +def _control_callbacks(meth): + getattr(callbacks.device_added, meth)(device_added_cb) + getattr(callbacks.device_removed, meth)(device_removed_cb) + getattr(callbacks.action_removed, meth)(action_removed_cb) + getattr(callbacks.parent_added, meth)(parent_added_cb) + getattr(callbacks.parent_removed, meth)(parent_removed_cb) + getattr(callbacks.attribute_changed, meth)(attribute_changed_cb) + + +def enable_callbacks(): + _control_callbacks("add") + + +def disable_callbacks(): + _control_callbacks("remove") diff --git a/blivet/events/handler.py b/blivet/events/handler.py index d7e48cd..fe8a899 100644 --- a/blivet/events/handler.py +++ b/blivet/events/handler.py @@ -20,14 +20,13 @@ # Red Hat Author(s): David Lehman <dlehman(a)redhat.com> # +from ..callbacks import callbacks from ..errors import DeviceError, EventHandlingError from ..devices import DM_MAJORS, MD_MAJORS from .. import udev from ..threads import SynchronizedMeta from .changes import data as event_data -from .changes import record_change -from .changes import AttributeChanged, ParentRemoved from .manager import event_manager import logging @@ -137,8 +136,8 @@ def _handle_add_event(self, event): if device.sysfs_path != sysfs_path: old_sysfs_path = device.sysfs_path device.sysfs_path = sysfs_path - record_change(AttributeChanged(device=device, attr="sysfs_path", - old=old_sysfs_path, new=sysfs_path)) + callbacks.attribute_changed(device=device, attr="sysfs_path", + old=old_sysfs_path, new=sysfs_path) def _handle_format_change(self, event, device): helper_class = self._get_format_helper(event.info, device) # pylint: disable=no-member @@ -175,7 +174,7 @@ def _handle_format_change(self, event, device): device.name, container.name, str(e)) raise EventHandlingError("reformatted container member") - record_change(ParentRemoved(device=container, attr="parents", item=device)) + callbacks.parent_removed(device=container, parent=device) self.recursive_remove(device, actions=False, remove_device=False) @@ -245,5 +244,5 @@ def _handle_remove_event(self, event): log.info("device %s was deactivated", device.name) # device was deactivated from outside, so clear the sysfs path device.sysfs_path = '' - record_change(AttributeChanged(device=device, attr="sysfs_path", - old=old_sysfs_path, new='')) + callbacks.attribute_changed(device=device, attr="sysfs_path", + old=old_sysfs_path, new='') diff --git a/blivet/events/manager.py b/blivet/events/manager.py index 73ee0d4..5475c59 100644 --- a/blivet/events/manager.py +++ b/blivet/events/manager.py @@ -34,6 +34,8 @@ from ..errors import EventManagerError, EventParamError from ..flags import flags +from .changes import disable_callbacks, enable_callbacks + import logging event_log = logging.getLogger("blivet.event") @@ -203,11 +205,13 @@ def enable(self): raise EventManagerError("cannot enable handler with no callback") event_log.info("enabling event handling") + enable_callbacks() @abc.abstractmethod def disable(self): """ Disable monitoring and handling of events. """ event_log.info("disabling event handling") + disable_callbacks() def _mask_event(self, event): """ Return True if this event should be ignored """ diff --git a/blivet/populator/helpers/formatpopulator.py b/blivet/populator/helpers/formatpopulator.py index fbeee4c..e9f7165 100644 --- a/blivet/populator/helpers/formatpopulator.py +++ b/blivet/populator/helpers/formatpopulator.py @@ -20,8 +20,7 @@ # Red Hat Author(s): David Lehman <dlehman(a)redhat.com> # -from ...events.changes import record_change -from ...events.changes import AttributeChanged +from ...callbacks import callbacks from ... import formats from ... import udev from ...errors import FSError @@ -83,7 +82,6 @@ def run(self): """ Create a format instance and associate it with the device instance. """ kwargs = self._get_kwargs() type_spec = self.type_spec - old_fmt = self.device.format try: log.info("type detected on '%s' is '%s'", self.device.name, type_spec) self.device.format = formats.get_format(type_spec, **kwargs) @@ -92,14 +90,10 @@ def run(self): type_spec, self.device.name) self.device.format = formats.DeviceFormat(device=self.device.path, exists=True) - if old_fmt.type != self.device.format.type or old_fmt.uuid != self.device.format.uuid: - record_change(AttributeChanged(device=self.device, attr="format", - old=old_fmt, new=self.device.format)) - def update(self): label = udev.device_get_label(self.data) if hasattr(self.device.format, "label") and self.device.format.label != label: old_label = self.device.format.label self.device.format.label = label - record_change(AttributeChanged(device=self.device, fmt=self.device.format, - attr="label", old=old_label, new=label)) + callbacks.attribute_changed(device=self.device, fmt=self.device.format, + attr="label", old=old_label, new=label) diff --git a/blivet/populator/helpers/lvm.py b/blivet/populator/helpers/lvm.py index cdb755a..8175ce8 100644 --- a/blivet/populator/helpers/lvm.py +++ b/blivet/populator/helpers/lvm.py @@ -25,12 +25,11 @@ from gi.repository import BlockDev as blockdev +from ...callbacks import callbacks from ... import udev from ...devicelibs import lvm from ...devices.lvm import LVMVolumeGroupDevice, LVMLogicalVolumeDevice, LVMInternalLVtype from ...errors import DeviceTreeError, DuplicateVGError -from ...events.changes import record_change -from ...events.changes import AttributeChanged, ParentAdded, ParentRemoved from ...flags import flags from ...size import Size from ...storage_log import log_method_call @@ -191,8 +190,8 @@ def add_lv(lv): # for the pv(s) old_size = lv_device._size lv_device.update_size(newsize=lv_size) - record_change(AttributeChanged(device=lv_device, attr="size", - old=old_size, new=lv_size)) + callbacks.attribute_changed(device=lv_device, attr="size", + old=old_size, new=lv_size) self._devicetree.cancel_disk_actions(vg_device.disks) return @@ -361,7 +360,7 @@ def _add_vg_device(self): vg_device = self._devicetree.get_device_by_uuid(vg_uuid, incomplete=True) if vg_device and self.device not in vg_device.parents: vg_device.parents.append(self.device) - record_change(ParentAdded(device=vg_device, item=self.device)) + callbacks.parent_added(device=vg_device, parent=self.device) elif vg_device is None: same_name = self._devicetree.get_device_by_name(vg_name) if isinstance(same_name, LVMVolumeGroupDevice): @@ -436,7 +435,7 @@ def update(self): vg_device = self.device.children[0] if len(vg_device.parents) > 1: vg_device.parents.remove(self.device) - record_change(ParentRemoved(device=vg_device, item=self.device)) + callbacks.parent_removed(device=vg_device, parent=self.device) else: self._devicetree.recursive_remove(vg_device, actions=False) return -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/98a6e3f11eab6bc93ff32402453806…

1 0

[2.2-devel 2/7] Add a set of callbacks for changes to blivet's view of things.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> --- blivet/actionlist.py | 4 ++ blivet/callbacks.py | 162 ++++++++++++++++++++++++++++++++++++++++++++++ blivet/devices/storage.py | 3 + blivet/devicetree.py | 3 + 4 files changed, 172 insertions(+) diff --git a/blivet/actionlist.py b/blivet/actionlist.py index 8b29690..83f172d 100644 --- a/blivet/actionlist.py +++ b/blivet/actionlist.py @@ -23,6 +23,7 @@ import copy from functools import wraps +from .callbacks import callbacks as _callbacks from .deviceaction import ActionCreateDevice from .deviceaction import action_type_from_string, action_object_from_string from .devicelibs import lvm @@ -74,6 +75,7 @@ def add(self, action): # apply the action before adding it in case apply raises an exception action.apply() self._actions.append(action) + _callbacks.action_added(action=action) log.info("registered action: %s", action) def remove(self, action): @@ -83,6 +85,7 @@ def remove(self, action): action.cancel() self._actions.remove(action) record_change(ActionCanceled(action=action)) + _callbacks.action_removed(action=action) log.info("canceled action %s", action) def find(self, device=None, action_type=None, object_type=None, @@ -338,5 +341,6 @@ def process(self, callbacks=None, devices=None, dry_run=None): device.format.device = device.path self._completed_actions.append(self._actions.pop(0)) + _callbacks.action_executed(action=action) self._post_process(devices=devices) diff --git a/blivet/callbacks.py b/blivet/callbacks.py index 8947f13..56edd88 100644 --- a/blivet/callbacks.py +++ b/blivet/callbacks.py @@ -79,3 +79,165 @@ def create_new_callbacks_register(create_format_pre=None, ["msg", "min_entropy"]) ReportProgressData = namedtuple("ReportProgressData", ["msg"]) + + +# +# Callbacks for changes to the model. +# +class CallbackList: + def __init__(self): + self._cb_list = list() + + def add(self, cb): + """ Add a callback. """ + self._cb_list.append(cb) + + def remove(self, cb): + """ Remove a callback. """ + self._cb_list.remove(cb) + + def __call__(self, *args, **kwargs): + """ Run all of the callbacks. """ + for cb in self._cb_list: + cb(*args, **kwargs) + + +class Callbacks: + """A collection of callbacks for various events + + Each trigger/event gets a list of callbacks to run, represented by an + instance of :class:`~.callbacks.CallbackList`. + """ + def __init__(self): + self.device_added = CallbackList() + """callback list for when a device is added to the devicetree""" + + self.device_removed = CallbackList() + """callback list for when a device is removed from the devicetree""" + + self.format_added = CallbackList() + """callback list for when a format is added to a device""" + + self.format_removed = CallbackList() + """callback list for when a format is removed from a device""" + + self.action_added = CallbackList() + """ callback list for when an action is added/registered/scheduled""" + + self.action_removed = CallbackList() + """ callback list for when an action is removed/canceled""" + + self.action_executed = CallbackList() + """ callback list for when an action is executed""" + + self.parent_added = CallbackList() + """ callback list for when a member device is added to a container device""" + + self.parent_removed = CallbackList() + """ callback list for when a member device is removed from a container device""" + + self.attribute_changed = CallbackList() + """ callback list for when a device or format attribute's value is changed""" + +""" + .. data:: callbacks + + .. note:: + The arguments for these callbacks are provided by name, so any callbacks + you provide should be able to handle that. + + .. function:: device_added_cb(device) + + A device was added to the devicetree. + + :param device: the device that was added + :type device: :class:`~.devices.StorageDevice` + + + .. function:: device_removed_cb(device) + + A device was removed from the devicetree. + + :param device: the device instance that was removed + :type device: :class:`~.devices.StorageDevice` + + + .. function:: format_added_cb(device, fmt) + + A new format was added to the device. + + :param device: the device + :type device: :class:`~.devices.StorageDevice` + :param fmt: the added format + :type fmt: :class:`~.formats.DeviceFormat` + + + .. function:: format_removed_cb(device, fmt) + + A format was removed from the device. + + :param device: the device + :type device: :class:`~.devices.StorageDevice` + :param fmt: the removed format + :type fmt: :class:`~.formats.DeviceFormat` + + + .. function:: action_added_cb(action) + + An action was scheduled/registered/added. + + :param action: the action + :type action: :class:`~.deviceaction.DeviceAction` + + + .. function:: action_removed_cb(action) + + An action was canceled/removed. + + :param action: the action + :type action: :class:`~.deviceaction.DeviceAction` + + + .. function:: action_executed_cb(action) + + An action was executed/completed. + + :param action: the action + :type action: :class:`~.deviceaction.DeviceAction` + + + .. function:: parent_added_cb(device, parent) + + A member device was added to a container device. + + :param device: the member device + :type device: :class:`~.devices.StorageDevice` + :param device: the container device + :type device: :class:`~.devices.StorageDevice` + + + .. function:: parent_removed_cb(device, parent) + + A member device was removed from a container device. + + :param device: the device instance that was removed + :type device: :class:`~.devices.StorageDevice` + :param device: the container device + :type device: :class:`~.devices.StorageDevice` + + + .. function:: attribute_changed_cb(device, attr, old, new, fmt=None) + + An attribute value was changed. + + :param device: the device + :type device: :class:`~.devices.StorageDevice` + :param str attr: the attribute name + :param old: the old value + :param new: the new value + :keyword fmt: the format, if a format attribute is what changed + :type fmt: :class:`~.formats.DeviceFormat` + + +""" +callbacks = Callbacks() diff --git a/blivet/devices/storage.py b/blivet/devices/storage.py index 0ba515c..a618171 100644 --- a/blivet/devices/storage.py +++ b/blivet/devices/storage.py @@ -24,6 +24,7 @@ import copy import pyudev +from ..callbacks import callbacks from .. import errors from .. import util from ..flags import flags @@ -709,9 +710,11 @@ def _set_format(self, fmt): elif fmt.min_size and fmt.min_size > self.size: raise errors.DeviceError("device is too small for new format") + callbacks.format_removed(device=self, fmt=self._format) self._format = fmt self._format.device = self.path self._update_netdev_mount_option() + callbacks.format_added(device=self, fmt=self._format) def _update_netdev_mount_option(self): """ Fix mount options to include or exclude _netdev as appropriate. """ diff --git a/blivet/devicetree.py b/blivet/devicetree.py index 832dce5..d30bf5d 100644 --- a/blivet/devicetree.py +++ b/blivet/devicetree.py @@ -30,6 +30,7 @@ from gi.repository import BlockDev as blockdev from .actionlist import ActionList +from .callbacks import callbacks from .errors import DeviceError, DeviceTreeError, StorageError from .deviceaction import ActionDestroyDevice, ActionDestroyFormat from .devices import BTRFSDevice, NoDevice, PartitionDevice @@ -162,6 +163,7 @@ def _add_device(self, newdev, new=True): newdev.name not in self.names): self.names.append(newdev.name) record_change(DeviceAdded(device=newdev)) + callbacks.device_added(device=newdev) log.info("added %s %s (id %d) to device tree", newdev.type, newdev.name, newdev.id) @@ -205,6 +207,7 @@ def _remove_device(self, dev, force=None, modparent=True): self._devices.remove(dev) record_change(DeviceRemoved(device=dev)) + callbacks.device_removed(device=dev) log.info("removed %s %s (id %d) from device tree", dev.type, dev.name, dev.id) -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/0ee712ef229b3f045d1e0aa29db5ab…

1 0

[2.2-devel 1/7] Add a RemoveDevice method to DBusBlivet.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> This method implements DeviceTree.recursive_remove. --- blivet/dbus/blivet.py | 23 +++++++++++++++++++---- tests/dbus_test.py | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/blivet/dbus/blivet.py b/blivet/dbus/blivet.py index 659c389..dc6ffc4 100644 --- a/blivet/dbus/blivet.py +++ b/blivet/dbus/blivet.py @@ -22,6 +22,7 @@ import dbus from blivet import Blivet +from blivet.callbacks import callbacks from .constants import BLIVET_INTERFACE, BLIVET_OBJECT_PATH from .device import DBusDevice from .object import DBusObject @@ -38,6 +39,11 @@ def __init__(self, manager): self._dbus_devices = list() self._manager = manager # provides ObjectManager interface self._blivet = Blivet() + self._set_up_callbacks() + + def _set_up_callbacks(self): + callbacks.device_added.add(self._device_added) + callbacks.device_removed.add(self._device_removed) @property def object_path(self): @@ -65,16 +71,19 @@ def _device_added(self, device): self._dbus_devices.append(added) self._manager.add_object(added) + def _get_device_by_object_path(self, object_path): + """ Return the :class:`blivet.dbus.device.DBusDevice` at the given path. """ + # FIXME: This is inefficient. Implement an object_path->dbus_device dictionary. + return next(d._device for d in self._dbus_devices if d.object_path == object_path) + @dbus.service.method(dbus_interface=BLIVET_INTERFACE) def Reset(self): """ Reset the Blivet instance and populate the device tree. """ old_devices = self._blivet.devices[:] - self._blivet.reset() for removed in old_devices: - self._device_removed(removed) + self._device_removed(device=removed) - for added in self._blivet.devices: - self._device_added(added) + self._blivet.reset() @dbus.service.method(dbus_interface=BLIVET_INTERFACE) def Exit(self): @@ -95,3 +104,9 @@ def ResolveDevice(self, spec): dbus_device = next(d for d in self._dbus_devices if d._device == device) object_path = dbus_device.object_path return object_path + + @dbus.service.method(dbus_interface=BLIVET_INTERFACE, in_signature='o') + def RemoveDevice(self, object_path): + """ Remove a device and all devices built on it. """ + device = self._get_device_by_object_path(object_path) + self._blivet.devicetree.recursive_remove(device) diff --git a/tests/dbus_test.py b/tests/dbus_test.py index 9517a8a..40e0e67 100644 --- a/tests/dbus_test.py +++ b/tests/dbus_test.py @@ -13,6 +13,7 @@ class UDevBlivetTestCase(TestCase): @patch.object(DBusObject, '__init__', return_value=None) + @patch("blivet.dbus.blivet.callbacks") def setUp(self, *args): # pylint: disable=unused-argument self.dbus_object = DBusBlivet(Mock(name="ObjectManager")) self.dbus_object._blivet = Mock(spec=Blivet) -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/7ff30d3adf20e97e9d8f0b97255dac…

1 0

Updated: [rhinstaller/blivet/pulls/394 2.2-devel] Add a RemoveDevice method to DBusBlivet
by dashea 29 Apr '16

29 Apr '16

This is implemented via `DeviceTree.recursive_remove`, so I'm open to different names, including `RecursiveRemove`. Since #392 isn't merged yet its commits are appearing here, too. This one starts with 7b2ebfc and currently has six commits. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/394

1 0

Re: [rhinstaller/blivet/pulls/392 2.2-devel] Add a Device interface to the dbus service
by dashea 29 Apr '16

29 Apr '16

Closed. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/392

1 0

[2.2-devel 8/8] Add the beginnings of an example client.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> --- examples/dbus_client.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 examples/dbus_client.py diff --git a/examples/dbus_client.py b/examples/dbus_client.py new file mode 100644 index 0000000..2fdcc25 --- /dev/null +++ b/examples/dbus_client.py @@ -0,0 +1,18 @@ + +import dbus + +bus = dbus.SystemBus() + +# This adds a signal match so that the client gets signals sent by Blivet1's +# ObjectManager. These signals are used to notify clients of changes to the +# managed objects (for blivet, this will be devices, formats, and actions). +bus.add_match_string("type='signal',sender='com.redhat.Blivet1',path_namespace='/com/redhat/Blivet1'") + +blivet = bus.get_object('com.redhat.Blivet1', '/com/redhat/Blivet1/Blivet') +blivet.Reset() + +object_manager = bus.get_object('com.redhat.Blivet1', '/com/redhat/Blivet1') +objects = object_manager.GetManagedObjects() +for object_path in blivet.ListDevices(): + device = objects[object_path]['com.redhat.Blivet1.Device'] + print(device['Name'], device['Type'], device['Size'], device['FormatType']) -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/f29dab9a82b44fac483d71c432a40a…

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches April 2016