diff options
author | kshithijiyer <kshithij.ki@gmail.com> | 2019-08-01 12:51:12 +0530 |
---|---|---|
committer | kshithijiyer <kshithij.ki@gmail.com> | 2019-08-01 15:46:02 +0530 |
commit | 37ab92f00ca2303d98c03616a0e2dd7ce11f1c37 (patch) | |
tree | a290531f0eaeacbb10d551f333425723982f5a72 /glustolibs-gluster | |
parent | 74b4bab01b504f735e656f855100441afe2a700a (diff) |
Moving check_gluster_shared_volume to library.
Adding function check_gluster_shared_volume() to
check if gluster_shared_storage is present or absent.
Change-Id: Ifa646187a0ef351f3dd37b54bb0a3a8a7c8b2500
Signed-off-by: kshithijiyer <kshithij.ki@gmail.com>
Diffstat (limited to 'glustolibs-gluster')
-rw-r--r-- | glustolibs-gluster/glustolibs/gluster/shared_storage_ops.py | 61 |
1 files changed, 57 insertions, 4 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/shared_storage_ops.py b/glustolibs-gluster/glustolibs/gluster/shared_storage_ops.py index baf7de77a..3ea3c97e2 100644 --- a/glustolibs-gluster/glustolibs/gluster/shared_storage_ops.py +++ b/glustolibs-gluster/glustolibs/gluster/shared_storage_ops.py @@ -19,9 +19,10 @@ Description : Modules for enabling and disabling shared storoge """ -import time +from time import sleep from glusto.core import Glusto as g -from glustolibs.gluster.volume_ops import set_volume_options +from glustolibs.gluster.volume_ops import (set_volume_options, + get_volume_list) def enable_shared_storage(mnode): @@ -84,7 +85,7 @@ def is_shared_volume_mounted(mnode): g.log.info("Shared volume mounted successfully") return True else: - time.sleep(2) + sleep(2) counter = counter + 2 g.log.error("Shared volume not mounted") return False @@ -110,7 +111,59 @@ def is_shared_volume_unmounted(mnode): g.log.info("Shared volume unmounted successfully") return True else: - time.sleep(2) + sleep(2) counter = counter + 2 g.log.error("Shared volume not unmounted") return False + + +def check_gluster_shared_volume(mnode, present=True): + """ + Check gluster shared volume present or absent. + + Args: + mnode (str) : Node on which command is to be executed + present (bool) : True if you want to check presence + False if you want to check absence. + + Returns: + bool : True if shared volume is present or absent. + False otherwise. + """ + if present: + halt = 20 + counter = 0 + g.log.info("Wait for some seconds to create " + "gluster_shared_storage volume.") + + while counter < halt: + vol_list = get_volume_list(mnode) + if "gluster_shared_storage" in vol_list: + return True + else: + g.log.info("Wait for some seconds, since it takes " + "time to create gluster_shared_storage " + "volume.") + sleep(2) + counter = counter + 2 + + return False + + else: + halt = 20 + counter = 0 + g.log.info("Wait for some seconds to delete " + "gluster_shared_storage volume.") + + while counter < halt: + vol_list = get_volume_list(mnode) + if "gluster_shared_storage" not in vol_list: + return True + else: + g.log.info("Wait for some seconds, since it takes " + "time to delete gluster_shared_storage " + "volume.") + sleep(2) + counter = counter + 2 + + return False |