lib/libtest.py updated

tushk2 · tushk2 · commit e915c717ea6f · 2011-03-31T17:09:36.000+05:30
diff --git a/lib/libtest.py b/lib/libtest.py
@@ -7,6 +7,7 @@
 from common_variable import *
 from all_commands import *
 
+global container
 container = "false"
 volume = "false"
 
@@ -27,7 +28,7 @@ def default_setup_noexit(disk_l):
    else: 
       print "pool does not exist" 
  #  print "TESTPOOL",TESTPOOL
-   log_must([[ZPOOL,"create","-f",TESTPOOL]+disk_l])
+   log_must([[ZPOOL,"create","-f",TESTPOOL,disk_l]])
 
    (out, ret) = cmdExecute([[RM,"-rf",TESTDIR]])
    if ret != 0:
@@ -54,7 +55,6 @@ def default_setup_noexit(disk_l):
       log_must([[ZFS,"create",TESTPOOL+"/"+TESTCTR+"/"+TESTFS1]])
       log_must([[ZFS,"set","mountpoint="+TESTDIR1,TESTPOOL+"/"+TESTCTR+"/"+TESTFS1]])
 
-      global container
       container = "false"
    return 0 
 
@@ -316,3 +316,23 @@ def check_version(unsupported_vers):
               return 0
 	return 1
 
+
+
+#
+# Simple function to get the specified property of pool. If unable to
+# get the property then exits.
+#
+def get_pool_prop(prop, pool) : 
+
+	prop_val = ""
+        if  0 == poolexists(pool) :
+		(prop_val, ret) = cmdExecute([[ZPOOL, "get", prop, pool, "2>/dev/null"],[TAIL, "-1"],[AWK, '{print $3}']])
+		if  ret != 0 :
+                	log_note("Unable to get prop property for pool")
+                        return (prop_val, 1)
+	else :
+        	log_note(" pool not exists : ")
+                return (prop_val, 1)
+	return (prop_val, ret)
+
+
