From f8ae4f4991ba51a59e271efe8f27aaac20e622ab Mon Sep 17 00:00:00 2001
From: David Lehman <dlehman@redhat.com>
Date: Thu, 24 Apr 2014 10:51:34 -0500
Subject: [PATCH 10/13] Adapt examples to examples/common.py function
 dispersement.

---
 examples/factory.py      | 19 +++++--------------
 examples/list_devices.py | 12 ++----------
 examples/lvm.py          | 17 ++++-------------
 examples/partitioning.py | 19 +++++--------------
 4 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/examples/factory.py b/examples/factory.py
index b434af4..8e4bb5b 100644
--- a/examples/factory.py
+++ b/examples/factory.py
@@ -1,27 +1,18 @@
-import logging
-import sys
 import os
 
-from common import set_up_logging
-from common import create_sparse_file
-from common import tear_down_disk_images
 from common import print_devices
 
-# doing this before importing blivet gets the logging from format class
-# registrations and other stuff triggered by the import
-set_up_logging()
-blivet_log = logging.getLogger("blivet")
-blivet_log.info(sys.argv[0])
-
 import blivet
 from blivet.size import Size
+from blivet.util import set_up_logging, create_sparse_tempfile
 
+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_file(b, "disk1", Size(spec="100GiB"))
+disk1_file = create_sparse_tempfile("disk1", Size(spec="100GiB"))
 b.config.diskImages["disk1"] = disk1_file
-disk2_file = create_sparse_file(b, "disk2", Size(spec="100GiB"))
+disk2_file = create_sparse_tempfile("disk2", Size(spec="100GiB"))
 b.config.diskImages["disk2"] = disk2_file
 
 b.reset()
@@ -49,6 +40,6 @@ try:
     b.devicetree.processActions()
     print_devices(b)
 finally:
-    tear_down_disk_images(b)
+    b.devicetree.tearDownDiskImages(b)
     os.unlink(disk1_file)
     os.unlink(disk2_file)
diff --git a/examples/list_devices.py b/examples/list_devices.py
index 1a96022..5dff8b2 100644
--- a/examples/list_devices.py
+++ b/examples/list_devices.py
@@ -1,17 +1,9 @@
-import logging
-import sys
-
-from common import set_up_logging
 from common import print_devices
 
-# doing this before importing blivet gets the logging from format class
-# registrations and other stuff triggered by the import
-set_up_logging()
-blivet_log = logging.getLogger("blivet")
-blivet_log.info(sys.argv[0])
-
 import blivet
+from blivet.util import set_up_logging
 
+set_up_logging()
 b = blivet.Blivet()   # create an instance of Blivet
 b.reset()             # detect system storage configuration
 
diff --git a/examples/lvm.py b/examples/lvm.py
index 0c7d67f..a86f39d 100644
--- a/examples/lvm.py
+++ b/examples/lvm.py
@@ -1,25 +1,16 @@
-import logging
-import sys
 import os
 
-from common import set_up_logging
-from common import create_sparse_file
-from common import tear_down_disk_images
 from common import print_devices
 
-# doing this before importing blivet gets the logging from format class
-# registrations and other stuff triggered by the import
-set_up_logging()
-blivet_log = logging.getLogger("blivet")
-blivet_log.info(sys.argv[0])
-
 import blivet
 from blivet.size import Size
+from blivet.util import set_up_logging, create_sparse_tempfile
 
+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_file(b, "disk1", Size(spec="100GiB"))
+disk1_file = create_sparse_tempfile("disk1", Size(spec="100GiB"))
 b.config.diskImages["disk1"] = disk1_file
 
 b.reset()
@@ -60,5 +51,5 @@ try:
     b.doIt()
     print_devices(b)
 finally:
-    tear_down_disk_images(b)
+    b.devicetree.tearDownDiskImages(b)
     os.unlink(disk1_file)
diff --git a/examples/partitioning.py b/examples/partitioning.py
index 1a1391f..a60e03a 100644
--- a/examples/partitioning.py
+++ b/examples/partitioning.py
@@ -1,27 +1,18 @@
-import logging
-import sys
 import os
 
-from common import set_up_logging
-from common import create_sparse_file
-from common import tear_down_disk_images
 from common import print_devices
 
-# doing this before importing blivet gets the logging from format class
-# registrations and other stuff triggered by the import
-set_up_logging()
-blivet_log = logging.getLogger("blivet")
-blivet_log.info(sys.argv[0])
-
 import blivet
 from blivet.size import Size
+from blivet.util import set_up_logging, create_sparse_tempfile
 
+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_file(b, "disk1", Size(spec="100GiB"))
+disk1_file = create_sparse_tempfile("disk1", Size(spec="100GiB"))
 b.config.diskImages["disk1"] = disk1_file
-disk2_file = create_sparse_file(b, "disk2", Size(spec="100GiB"))
+disk2_file = create_sparse_tempfile("disk2", Size(spec="100GiB"))
 b.config.diskImages["disk2"] = disk2_file
 
 b.reset()
@@ -58,6 +49,6 @@ try:
     b.doIt()
     print_devices(b)
 finally:
-    tear_down_disk_images(b)
+    b.devicetree.tearDownDiskImages(b)
     os.unlink(disk1_file)
     os.unlink(disk2_file)
-- 
1.9.0