diff options
author | “Milind <“mwaykole@redhat.com”> | 2020-12-29 16:16:41 +0530 |
---|---|---|
committer | Arthy Loganathan <aloganat@redhat.com> | 2021-01-04 07:03:38 +0000 |
commit | 9a190b6494a82359fbb0f3b4a712ea7a97f681fb (patch) | |
tree | c7c9cee76dc8b15849fcb8fa1dc6837e0d409d83 /glustolibs-gluster/glustolibs | |
parent | 7936283847db39070d760f79f0af1804be7f6744 (diff) |
[LibFix] Add dirname support form_bricks_list()
Adding arg dirname as a gluster brick directory
Change-Id: I1bb69b4d719bad4cbac3a0e6a497fdae386c6004
Signed-off-by: “Milind <“mwaykole@redhat.com”>
Diffstat (limited to 'glustolibs-gluster/glustolibs')
-rwxr-xr-x | glustolibs-gluster/glustolibs/gluster/lib_utils.py | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/lib_utils.py b/glustolibs-gluster/glustolibs/gluster/lib_utils.py index 26f2ad904..aa919e344 100755 --- a/glustolibs-gluster/glustolibs/gluster/lib_utils.py +++ b/glustolibs-gluster/glustolibs/gluster/lib_utils.py @@ -387,7 +387,8 @@ def get_servers_unused_bricks_dict(mnode, servers, servers_info): return servers_unused_bricks_dict -def form_bricks_list(mnode, volname, number_of_bricks, servers, servers_info): +def form_bricks_list(mnode, volname, number_of_bricks, servers, servers_info, + dirname=None): """Forms bricks list for create-volume/add-brick given the num_of_bricks servers and servers_info. @@ -400,6 +401,9 @@ def form_bricks_list(mnode, volname, number_of_bricks, servers, servers_info): needs to be selected for creating the brick list. servers_info (dict): dict of server info of each servers. + kwargs: + dirname (str): Name of the directory for glusterfs brick + Returns: list - List of bricks to use with volume-create/add-brick None - if number_of_bricks is greater than unused bricks. @@ -437,10 +441,18 @@ def form_bricks_list(mnode, volname, number_of_bricks, servers, servers_info): list(servers_unused_bricks_dict.values())[dict_index]) brick_path = '' if current_server_unused_bricks_list: - brick_path = ("%s:%s/%s_brick%s" % - (current_server, - current_server_unused_bricks_list[0], volname, num)) - bricks_list.append(brick_path) + if dirname and (" " not in dirname): + brick_path = ("%s:%s/%s_brick%s" % + (current_server, + current_server_unused_bricks_list[0], dirname, + num)) + bricks_list.append(brick_path) + else: + brick_path = ("%s:%s/%s_brick%s" % + (current_server, + current_server_unused_bricks_list[0], volname, + num)) + bricks_list.append(brick_path) # Remove the added brick from the current_server_unused_bricks_list list(servers_unused_bricks_dict.values())[dict_index].pop(0) |