From: mulhern amulhern@redhat.com
Adjust the task class heirarchy accordingly.
Signed-off-by: mulhern amulhern@redhat.com --- blivet/tasks/dfresize.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ blivet/tasks/fsresize.py | 12 +++--------- 2 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 blivet/tasks/dfresize.py
diff --git a/blivet/tasks/dfresize.py b/blivet/tasks/dfresize.py new file mode 100644 index 0000000..856707b --- /dev/null +++ b/blivet/tasks/dfresize.py @@ -0,0 +1,45 @@ +# dfresize.py +# DeviceFormat resizing classes. +# +# Copyright (C) 2015 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions of +# the GNU General Public License v.2, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY expressed or implied, including the implied warranties of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. You should have received a copy of the +# GNU General Public License along with this program; if not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the +# source code or documentation are not subject to the GNU General Public +# License and may only be used or replicated with the express permission of +# Red Hat, Inc. +# +# Red Hat Author(s): Anne Mulhern amulhern@redhat.com + +import abc + +from six import add_metaclass + +from . import task + +@add_metaclass(abc.ABCMeta) +class DFResizeTask(task.Task): + """ The abstract properties that any resize task must have. """ + + unit = abc.abstractproperty(doc="Resize unit.") + +class UnimplementedDFResize(task.UnimplementedTask, DFResizeTask): + + def __init__(self, a_df): + """ Initializer. + + :param DeviceFormat a_df: a device format object + """ + self.df = a_df + + @property + def unit(self): + raise NotImplementedError() diff --git a/blivet/tasks/fsresize.py b/blivet/tasks/fsresize.py index 343acaf..417cafc 100644 --- a/blivet/tasks/fsresize.py +++ b/blivet/tasks/fsresize.py @@ -28,16 +28,14 @@ from ..import util
from . import availability -from . import fstask from . import task +from . import dfresize
@add_metaclass(abc.ABCMeta) -class FSResizeTask(fstask.FSTask): - +class FSResizeTask(dfresize.DFResizeTask): """ The abstract properties that any resize task must have. """
- unit = abc.abstractproperty(doc="Resize unit.") size_fmt = abc.abstractproperty(doc="Size format string.")
@@ -135,11 +133,7 @@ def args(self): return ['-o', ",".join(options), self.fs._type, self.fs.system_mountpoint]
-class UnimplementedFSResize(task.UnimplementedTask, FSResizeTask): - - @property - def unit(self): - raise NotImplementedError() +class UnimplementedFSResize(dfresize.UnimplementedDFResize, FSResizeTask):
@property def size_fmt(self):
anaconda-patches@lists.fedorahosted.org