49781e7
commit 10ba799ab08001d5435425e65f039f20cadd306e
49781e7
Author: Tony Asleson <tasleson@redhat.com>
49781e7
Date:   Mon Oct 15 13:54:19 2012 -0700
49781e7
49781e7
    python-lvm: Update example to work with lvm object removal.
49781e7
    
49781e7
    Signed-off-by: Tony Asleson <tasleson@redhat.com>
49781e7
    Signed-off-by: Andy Grover <agrover@redhat.com>
49781e7
---
49781e7
 python/example.py | 35 +++++++++++++++--------------------
49781e7
 1 file changed, 15 insertions(+), 20 deletions(-)
49781e7
49781e7
diff --git a/python/example.py b/python/example.py
49781e7
index 67bb7e4..5c14ee1 100644
49781e7
--- a/python/example.py
49781e7
+++ b/python/example.py
49781e7
@@ -31,9 +31,9 @@ def print_pv(pv):
49781e7
 
49781e7
 
49781e7
 #Dump some information about a specific volume group
49781e7
-def print_vg(h, vg_name):
49781e7
+def print_vg(vg_name):
49781e7
     #Open read only
49781e7
-    vg = h.vgOpen(vg_name, 'r')
49781e7
+    vg = lvm.vgOpen(vg_name, 'r')
49781e7
 
49781e7
     print 'Volume group:', vg_name, 'Size: ', vg.getSize()
49781e7
 
49781e7
@@ -55,13 +55,13 @@ def print_vg(h, vg_name):
49781e7
     vg.close()
49781e7
 
49781e7
 #Returns the name of a vg with space available
49781e7
-def find_vg_with_free_space(h):
49781e7
+def find_vg_with_free_space():
49781e7
     free_space = 0
49781e7
     rc = None
49781e7
 
49781e7
-    vg_names = l.listVgNames()
49781e7
+    vg_names = lvm.listVgNames()
49781e7
     for v in vg_names:
49781e7
-        vg = h.vgOpen(v, 'r')
49781e7
+        vg = lvm.vgOpen(v, 'r')
49781e7
         c_free = vg.getFreeSize()
49781e7
         if c_free > free_space:
49781e7
             free_space = c_free
49781e7
@@ -72,13 +72,13 @@ def find_vg_with_free_space(h):
49781e7
 
49781e7
 #Walk through the volume groups and fine one with space in which we can
49781e7
 #create a new logical volume
49781e7
-def create_delete_logical_volume(h):
49781e7
-    vg_name = find_vg_with_free_space(h)
49781e7
+def create_delete_logical_volume():
49781e7
+    vg_name = find_vg_with_free_space()
49781e7
 
49781e7
     print 'Using volume group ', vg_name, ' for example'
49781e7
 
49781e7
     if vg_name:
49781e7
-        vg = h.vgOpen(vg_name, 'w')
49781e7
+        vg = lvm.vgOpen(vg_name, 'w')
49781e7
         lv = vg.createLvLinear('python_lvm_ok_to_delete', vg.getFreeSize())
49781e7
 
49781e7
         if lv:
49781e7
@@ -93,11 +93,11 @@ def create_delete_logical_volume(h):
49781e7
                 #Remove tag
49781e7
                 lv.removeTag(t)
49781e7
 
49781e7
+            lv.deactivate()
49781e7
+
49781e7
             #Try to rename
49781e7
-            lv.rename("python_lvm_ok_to_be_removed_shortly")
49781e7
+            lv.rename("python_lvm_renamed")
49781e7
             print 'LV name= ', lv.getName()
49781e7
-
49781e7
-            lv.deactivate()
49781e7
             lv.remove()
49781e7
 
49781e7
         vg.close()
49781e7
@@ -105,21 +105,16 @@ def create_delete_logical_volume(h):
49781e7
         print 'No free space available to create demo lv!'
49781e7
 
49781e7
 if __name__ == '__main__':
49781e7
-    #Create a new LVM instance
49781e7
-    l = lvm.Liblvm()
49781e7
-
49781e7
     #What version
49781e7
-    print 'lvm version=', l.getVersion()
49781e7
+    print 'lvm version=', lvm.getVersion()
49781e7
 
49781e7
     #Get a list of volume group names
49781e7
-    vg_names = l.listVgNames()
49781e7
+    vg_names = lvm.listVgNames()
49781e7
 
49781e7
     #For each volume group display some information about each of them
49781e7
     for vg_i in vg_names:
49781e7
-        print_vg(l, vg_i)
49781e7
+        print_vg(vg_i)
49781e7
 
49781e7
     #Demo creating a logical volume
49781e7
-    create_delete_logical_volume(l)
49781e7
+    create_delete_logical_volume()
49781e7
 
49781e7
-    #Close
49781e7
-    l.close()