From: Vojtech Trefny <vtrefny(a)redhat.com>
---
blivet/tasks/dfresize.py | 2 ++
blivet/tasks/fsresize.py | 3 ++-
blivet/tasks/lukstasks.py | 8 ++++++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/blivet/tasks/dfresize.py b/blivet/tasks/dfresize.py
index 856707b..2390a8d 100644
--- a/blivet/tasks/dfresize.py
+++ b/blivet/tasks/dfresize.py
@@ -25,12 +25,14 @@
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):
diff --git a/blivet/tasks/fsresize.py b/blivet/tasks/fsresize.py
index 417cafc..e7e2698 100644
--- a/blivet/tasks/fsresize.py
+++ b/blivet/tasks/fsresize.py
@@ -29,11 +29,12 @@
from . import availability
from . import task
+from . import fstask
from . import dfresize
@add_metaclass(abc.ABCMeta)
-class FSResizeTask(dfresize.DFResizeTask):
+class FSResizeTask(fstask.FSTask):
""" The abstract properties that any resize task must have.
"""
size_fmt = abc.abstractproperty(doc="Size format string.")
diff --git a/blivet/tasks/lukstasks.py b/blivet/tasks/lukstasks.py
index 27920c1..0fa59d7 100644
--- a/blivet/tasks/lukstasks.py
+++ b/blivet/tasks/lukstasks.py
@@ -19,6 +19,9 @@
#
# Red Hat Author(s): Anne Mulhern <amulhern(a)redhat.com>
+import gi
+gi.require_version("BlockDev", "1.0")
+
from gi.repository import BlockDev as blockdev
from .. import util
@@ -31,6 +34,7 @@
from . import task
from . import dfresize
+
class LUKSResize(task.BasicApplication, dfresize.DFResizeTask):
""" Handle resize of LUKS device. """
@@ -48,9 +52,9 @@ def __init__(self, a_luks):
"""
self.luks = a_luks
- def doTask(self):
+ def do_task(self):
""" Resizes the LUKS format. """
try:
- blockdev.crypto.luks_resize(self.luks.mapName,
self.luks.targetSize.convertTo(self.unit))
+ blockdev.crypto.luks_resize(self.luks.map_name,
self.luks.target_size.convert_to(self.unit))
except blockdev.CryptoError as e:
raise LUKSError(e)
--
To view this commit on github, visit
https://github.com/rhinstaller/blivet/commit/a207baa57f802f84a2896f99e198...