summaryrefslogtreecommitdiffstats
path: root/glustolibs-gluster/glustolibs/gluster/volume_libs.py
diff options
context:
space:
mode:
authorShwethaHP <spandura@redhat.com>2017-11-30 13:19:11 +0530
committerJonathan Holloway <jholloway@redhat.com>2018-01-16 06:21:33 +0000
commit389862e34225430b06a1d494c1c1e3037f4b6d5d (patch)
treef762786f17070ac88d6ecc1859072d243955fa12 /glustolibs-gluster/glustolibs/gluster/volume_libs.py
parentc39a42140f328d12a605f5480d0e3c7a2d4c6308 (diff)
Check if servers/nodes which is expected to be passed as list
is str. i.e passing a single node to the function. If it is str, then convert it to list Change-Id: I1abacf62fdbe1ec56fe85c86d8e2a323a2c3971b Signed-off-by: ShwethaHP <spandura@redhat.com>
Diffstat (limited to 'glustolibs-gluster/glustolibs/gluster/volume_libs.py')
-rw-r--r--glustolibs-gluster/glustolibs/gluster/volume_libs.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/volume_libs.py b/glustolibs-gluster/glustolibs/gluster/volume_libs.py
index 5b66835..6687552 100644
--- a/glustolibs-gluster/glustolibs/gluster/volume_libs.py
+++ b/glustolibs-gluster/glustolibs/gluster/volume_libs.py
@@ -1100,14 +1100,15 @@ def enable_and_validate_volume_options(mnode, volname, volume_options_list,
Args:
mnode (str): Node on which commands are executed.
volname (str): Name of the volume.
- volume_options_list (list): List of volume options to be enabled
+ volume_options_list (str|list): A volume option|List of volume options
+ to be enabled
time_delay (int): Time delay between 2 volume set operations
Returns:
bool: True when enabling and validating all volume options is
successful. False otherwise
"""
- if not isinstance(volume_options_list, list):
+ if isinstance(volume_options_list, str):
volume_options_list = [volume_options_list]
for option in volume_options_list:
@@ -1143,7 +1144,7 @@ def expand_volume(mnode, volname, servers, all_servers_info, force=False,
Args:
mnode (str): Node on which commands has to be executed
volname (str): volume name
- servers (list): List of servers in the storage pool.
+ servers (str|list): A server|List of servers in the storage pool.
all_servers_info (dict): Information about all servers.
example :
all_servers_info = {
@@ -1178,6 +1179,9 @@ def expand_volume(mnode, volname, servers, all_servers_info, force=False,
NOTE: adding bricks to hot tier is yet to be added in this function.
"""
+ if isinstance(servers, str):
+ servers = [servers]
+
# Check if volume exists
if not volume_exists(mnode, volname):
g.log.error("Volume %s doesn't exists.", volname)
@@ -1553,7 +1557,7 @@ def replace_brick_from_volume(mnode, volname, servers, all_servers_info,
Args:
mnode (str): Node on which commands has to be executed
volname (str): volume name
- servers (list): List of servers in the storage pool.
+ servers (str|list): A server|List of servers in the storage pool.
all_servers_info (dict): Information about all servers.
example :
all_servers_info = {
@@ -1583,6 +1587,9 @@ def replace_brick_from_volume(mnode, volname, servers, all_servers_info,
bool: True if replacing brick from the volume is successful.
False otherwise.
"""
+ if isinstance(servers, str):
+ servers = [servers]
+
# Check if volume exists
if not volume_exists(mnode, volname):
g.log.error("Volume %s doesn't exists.", volname)