[master 12/19] Make a top level device format resizing task class.
mulkieran
installerbot-noreply at redhat.com
Thu Jun 18 21:04:13 UTC 2015
From: mulhern <amulhern at redhat.com>
Related: #56
Adjust the task class heirarchy accordingly.
Signed-off-by: mulhern <amulhern at redhat.com>
---
blivet/tasks/dfresize.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
blivet/tasks/fsresize.py | 17 +++--------------
blivet/tasks/lukstasks.py | 1 +
tests/pylint/runpylint.py | 1 +
4 files changed, 50 insertions(+), 14 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 at redhat.com>
+
+import abc
+
+from six import add_metaclass
+
+from . import task
+
+ at 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 ef12686..c6db378 100644
--- a/blivet/tasks/fsresize.py
+++ b/blivet/tasks/fsresize.py
@@ -29,12 +29,12 @@
from . import availability
from . import task
+from . import dfresize
@add_metaclass(abc.ABCMeta)
-class FSResizeTask(task.Task):
+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.")
@add_metaclass(abc.ABCMeta)
@@ -133,18 +133,7 @@ def args(self):
options = ("remount", opts, self.sizeSpec())
return ['-o', ",".join(options), self.fs._type, self.fs.systemMountpoint]
-class UnimplementedFSResize(task.UnimplementedTask, FSResizeTask):
-
- def __init__(self, an_fs):
- """ Initializer.
-
- :param FS an_fs: a filesystem object
- """
- self.fs = an_fs
-
- @property
- def unit(self):
- raise NotImplementedError()
+class UnimplementedFSResize(dfresize.UnimplementedDFResize, FSResizeTask):
@property
def size_fmt(self):
diff --git a/blivet/tasks/lukstasks.py b/blivet/tasks/lukstasks.py
index 931ad7a..176aed8 100644
--- a/blivet/tasks/lukstasks.py
+++ b/blivet/tasks/lukstasks.py
@@ -26,6 +26,7 @@
from . import availability
from . import task
+from . import dfresize
class LUKSSize(task.BasicApplication):
""" Obtain information about the size of a LUKS format. """
diff --git a/tests/pylint/runpylint.py b/tests/pylint/runpylint.py
index 64badd4..7203658 100755
--- a/tests/pylint/runpylint.py
+++ b/tests/pylint/runpylint.py
@@ -18,6 +18,7 @@ def __init__(self):
FalsePositive(r"Method 'doTask' is abstract in class 'UnimplementedTask' but is not overridden"),
FalsePositive(r"No value for argument 'member_count' in unbound method call$"),
FalsePositive(r"No value for argument 'smallest_member_size' in unbound method call$"),
+ FalsePositive(r"TmpFS._sizeOption: Instance of 'UnimplementedDFResize' has no 'size_fmt' member$"),
# FIXME: These are temporary, until there's a python3 anaconda.
FalsePositive(r"Unable to import 'pyanaconda'$"),
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/ba4fd6660eb9127d6f81013f06accfc5bf68dadc
More information about the anaconda-patches
mailing list