[blivet:master 2/2] Get rid of remaining uses of spec keyword for Size() in examples directory.
mulhern
amulhern at redhat.com
Tue May 13 12:19:27 UTC 2014
Signed-off-by: mulhern <amulhern at redhat.com>
---
examples/factory.py | 8 ++++----
examples/lvm.py | 12 ++++++------
examples/partitioning.py | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/examples/factory.py b/examples/factory.py
index 0c0fa51..77f6e19 100644
--- a/examples/factory.py
+++ b/examples/factory.py
@@ -10,9 +10,9 @@ set_up_logging()
b = blivet.Blivet() # create an instance of Blivet (don't add system devices)
# create two disk image files on which to create new devices
-disk1_file = create_sparse_tempfile("disk1", Size(spec="100GiB"))
+disk1_file = create_sparse_tempfile("disk1", Size("100GiB"))
b.config.diskImages["disk1"] = disk1_file
-disk2_file = create_sparse_tempfile("disk2", Size(spec="100GiB"))
+disk2_file = create_sparse_tempfile("disk2", Size("100GiB"))
b.config.diskImages["disk2"] = disk2_file
b.reset()
@@ -25,13 +25,13 @@ try:
# create an lv named data in a vg named testvg
device = b.factoryDevice(blivet.devicefactory.DEVICE_TYPE_LVM,
- Size(spec="50GiB"), disks=[disk1, disk2],
+ Size("50GiB"), disks=[disk1, disk2],
fstype="xfs", mountpoint="/data")
print_devices(b)
# change testvg to have an md RAID1 pv instead of partition pvs
device = b.factoryDevice(blivet.devicefactory.DEVICE_TYPE_LVM,
- Size(spec="50GiB"), disks=[disk1, disk2],
+ Size("50GiB"), disks=[disk1, disk2],
fstype="xfs", mountpoint="/data",
container_raid_level="raid1",
device=device)
diff --git a/examples/lvm.py b/examples/lvm.py
index c79d2e0..962b272 100644
--- a/examples/lvm.py
+++ b/examples/lvm.py
@@ -10,7 +10,7 @@ set_up_logging()
b = blivet.Blivet() # create an instance of Blivet (don't add system devices)
# create a disk image file on which to create new devices
-disk1_file = create_sparse_tempfile("disk1", Size(spec="100GiB"))
+disk1_file = create_sparse_tempfile("disk1", Size("100GiB"))
b.config.diskImages["disk1"] = disk1_file
b.reset()
@@ -20,7 +20,7 @@ try:
b.initializeDisk(disk1)
- pv = b.newPartition(size=Size(spec="50GiB"), fmt_type="lvmpv")
+ pv = b.newPartition(size=Size("50GiB"), fmt_type="lvmpv")
b.createDevice(pv)
# allocate the partitions (decide where and on which disks they'll reside)
@@ -30,17 +30,17 @@ try:
b.createDevice(vg)
# new lv with base size 5GiB and unbounded growth and an ext4 filesystem
- dev = b.newLV(fmt_type="ext4", size=Size(spec="5GiB"), grow=True,
+ dev = b.newLV(fmt_type="ext4", size=Size("5GiB"), grow=True,
parents=[vg], name="unbounded")
b.createDevice(dev)
# new lv with base size 5GiB and growth up to 15GiB and an ext4 filesystem
- dev = b.newLV(fmt_type="ext4", size=Size(spec="5GiB"), grow=True,
- maxsize=Size(spec="15GiB"), parents=[vg], name="bounded")
+ dev = b.newLV(fmt_type="ext4", size=Size("5GiB"), grow=True,
+ maxsize=Size("15GiB"), parents=[vg], name="bounded")
b.createDevice(dev)
# new lv with a fixed size of 2GiB formatted as swap space
- dev = b.newLV(fmt_type="swap", size=Size(spec="2GiB"), parents=[vg])
+ dev = b.newLV(fmt_type="swap", size=Size("2GiB"), parents=[vg])
b.createDevice(dev)
# allocate the growable lvs
diff --git a/examples/partitioning.py b/examples/partitioning.py
index 342a15b..85d3268 100644
--- a/examples/partitioning.py
+++ b/examples/partitioning.py
@@ -10,9 +10,9 @@ set_up_logging()
b = blivet.Blivet() # create an instance of Blivet (don't add system devices)
# create two disk image files on which to create new devices
-disk1_file = create_sparse_tempfile("disk1", Size(spec="100GiB"))
+disk1_file = create_sparse_tempfile("disk1", Size("100GiB"))
b.config.diskImages["disk1"] = disk1_file
-disk2_file = create_sparse_tempfile("disk2", Size(spec="100GiB"))
+disk2_file = create_sparse_tempfile("disk2", Size("100GiB"))
b.config.diskImages["disk2"] = disk2_file
b.reset()
@@ -26,19 +26,19 @@ try:
# new partition on either disk1 or disk2 with base size 10GiB and growth
# up to a maximum size of 50GiB
- dev = b.newPartition(size=Size(spec="10MiB"), maxsize=Size(spec="50GiB"),
+ dev = b.newPartition(size=Size("10MiB"), maxsize=Size("50GiB"),
grow=True, parents=[disk1, disk2])
b.createDevice(dev)
# new partition on disk1 with base size 5GiB and unbounded growth and an
# ext4 filesystem
- dev = b.newPartition(fmt_type="ext4", size=Size(spec="5GiB"), grow=True,
+ dev = b.newPartition(fmt_type="ext4", size=Size("5GiB"), grow=True,
parents=[disk1])
b.createDevice(dev)
# new partition on any suitable disk with a fixed size of 2GiB formatted
# as swap space
- dev = b.newPartition(fmt_type="swap", size=Size(spec="2GiB"))
+ dev = b.newPartition(fmt_type="swap", size=Size("2GiB"))
b.createDevice(dev)
# allocate the partitions (decide where and on which disks they'll reside)
--
1.8.3.1
More information about the anaconda-patches
mailing list