From: "Samantha N. Bueno" <sbueno+anaconda(a)redhat.com>
---
examples/factory.py | 4 ++--
examples/lvm.py | 2 +-
examples/lvm_cache.py | 4 ++--
examples/lvm_non_linear.py | 4 ++--
examples/partitioning.py | 4 ++--
tests/clearpart_test.py | 2 +-
tests/imagebackedtestcase.py | 8 ++++----
tests/populator_test.py | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/examples/factory.py b/examples/factory.py
index c580494..7c47746 100644
--- a/examples/factory.py
+++ b/examples/factory.py
@@ -9,9 +9,9 @@
# create two disk image files on which to create new devices
disk1_file = create_sparse_tempfile("disk1", Size("100GiB"))
-b.config.disk_images["disk1"] = disk1_file
+b.disk_images["disk1"] = disk1_file
disk2_file = create_sparse_tempfile("disk2", Size("100GiB"))
-b.config.disk_images["disk2"] = disk2_file
+b.disk_images["disk2"] = disk2_file
b.reset()
diff --git a/examples/lvm.py b/examples/lvm.py
index 1c271f2..ac1f561 100644
--- a/examples/lvm.py
+++ b/examples/lvm.py
@@ -9,7 +9,7 @@
# create a disk image file on which to create new devices
disk1_file = create_sparse_tempfile("disk1", Size("100GiB"))
-b.config.disk_images["disk1"] = disk1_file
+b.disk_images["disk1"] = disk1_file
b.reset()
diff --git a/examples/lvm_cache.py b/examples/lvm_cache.py
index 6d49097..e8dd062 100644
--- a/examples/lvm_cache.py
+++ b/examples/lvm_cache.py
@@ -10,9 +10,9 @@
# create a disk image file on which to create new devices
disk1_file = create_sparse_tempfile("disk1", Size("100GiB"))
-b.config.disk_images["disk1"] = disk1_file
+b.disk_images["disk1"] = disk1_file
disk2_file = create_sparse_tempfile("disk2", Size("100GiB"))
-b.config.disk_images["disk2"] = disk2_file
+b.disk_images["disk2"] = disk2_file
b.reset()
diff --git a/examples/lvm_non_linear.py b/examples/lvm_non_linear.py
index 186b523..08a484c 100644
--- a/examples/lvm_non_linear.py
+++ b/examples/lvm_non_linear.py
@@ -9,9 +9,9 @@
# create a disk image file on which to create new devices
disk1_file = create_sparse_tempfile("disk1", Size("100GiB"))
-b.config.disk_images["disk1"] = disk1_file
+b.disk_images["disk1"] = disk1_file
disk2_file = create_sparse_tempfile("disk2", Size("100GiB"))
-b.config.disk_images["disk2"] = disk2_file
+b.disk_images["disk2"] = disk2_file
b.reset()
diff --git a/examples/partitioning.py b/examples/partitioning.py
index c002c2f..ee53fa8 100644
--- a/examples/partitioning.py
+++ b/examples/partitioning.py
@@ -9,9 +9,9 @@
# create two disk image files on which to create new devices
disk1_file = create_sparse_tempfile("disk1", Size("100GiB"))
-b.config.disk_images["disk1"] = disk1_file
+b.disk_images["disk1"] = disk1_file
disk2_file = create_sparse_tempfile("disk2", Size("100GiB"))
-b.config.disk_images["disk2"] = disk2_file
+b.disk_images["disk2"] = disk2_file
b.reset()
diff --git a/tests/clearpart_test.py b/tests/clearpart_test.py
index 3ded684..d973f63 100644
--- a/tests/clearpart_test.py
+++ b/tests/clearpart_test.py
@@ -20,7 +20,7 @@ def setUp(self):
def test_should_clear(self):
""" Test the Blivet.should_clear method. """
- b = blivet.Blivet()
+ b = blivet.osinstall.InstallerStorage()
DiskDevice = blivet.devices.DiskDevice
PartitionDevice = blivet.devices.PartitionDevice
diff --git a/tests/imagebackedtestcase.py b/tests/imagebackedtestcase.py
index 01e2929..ae668cb 100644
--- a/tests/imagebackedtestcase.py
+++ b/tests/imagebackedtestcase.py
@@ -2,7 +2,7 @@
import os
import unittest
-from blivet import Blivet
+from blivet.osinstall import InstallerStorage
from blivet import util
from blivet.size import Size
from blivet.flags import flags
@@ -44,7 +44,7 @@ def set_up_disks(self):
"""
for (name, size) in iter(self.disks.items()):
path = util.create_sparse_tempfile(name, size)
- self.blivet.config.disk_images[name] = path
+ self.blivet.disk_images[name] = path
#
# set up the disk images with a disklabel
@@ -95,7 +95,7 @@ def set_up_storage(self):
def setUp(self):
""" Do any setup required prior to running a test.
"""
flags.image_install = True
- self.blivet = Blivet()
+ self.blivet = InstallerStorage()
self.addCleanup(self._clean_up)
self.set_up_storage()
@@ -104,7 +104,7 @@ def _clean_up(self):
""" Clean up any resources that may have been set up for a test.
"""
self.blivet.reset()
self.blivet.devicetree.teardown_disk_images()
- for fn in self.blivet.config.disk_images.values():
+ for fn in self.blivet.disk_images.values():
if os.path.exists(fn):
os.unlink(fn)
diff --git a/tests/populator_test.py b/tests/populator_test.py
index 8975b0f..ccd4974 100644
--- a/tests/populator_test.py
+++ b/tests/populator_test.py
@@ -48,7 +48,7 @@ def setUp(self):
# anaconda first configures disk images
for (name, size) in iter(self.disks.items()):
path = util.create_sparse_tempfile(name, size)
- self.blivet.config.disk_images[name] = path
+ self.blivet.disk_images[name] = path
# at this point the DMLinearDevice has correct size
self.blivet.setup_disk_images()
@@ -67,7 +67,7 @@ def setUp(self):
def tearDown(self):
self.blivet.reset()
self.blivet.devicetree.teardown_disk_images()
- for fn in self.blivet.config.disk_images.values():
+ for fn in self.blivet.disk_images.values():
if os.path.exists(fn):
os.unlink(fn)
--
To view this commit on github, visit
https://github.com/rhinstaller/blivet/commit/de7715b5e11ed786bb02939be2d4...