From 525601e334368de09cdf892b9002e903b3f9cbd6 Mon Sep 17 00:00:00 2001 From: vamahaja Date: Wed, 8 Jan 2020 11:06:46 +0530 Subject: Add check for 'json' param in function 'get_block_hosting_volume_list' 'get_block_hosting_volume_list' will get failed in case user pass 'json=True' value as this function works on raw output of 'heketi_volume_list'. Add code to pop 'json' param in case user pass 'json=True' value. Change-Id: Iad053762fd1fa0c25bc4d01c038d20450e29676c Signed-off-by: vamahaja --- openshift-storage-libs/openshiftstoragelibs/heketi_ops.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/openshift-storage-libs/openshiftstoragelibs/heketi_ops.py b/openshift-storage-libs/openshiftstoragelibs/heketi_ops.py index df00dbf3..6b08b5d5 100644 --- a/openshift-storage-libs/openshiftstoragelibs/heketi_ops.py +++ b/openshift-storage-libs/openshiftstoragelibs/heketi_ops.py @@ -1573,16 +1573,17 @@ def get_block_hosting_volume_list( Raises: exceptions.ExecutionError: if command fails. """ + # Delete json key from kwargs + kwargs.pop("json", None) - out = heketi_volume_list( + volume_list = heketi_volume_list( heketi_client_node, heketi_server_url, **kwargs) - BHV = {} - - for volume in HEKETI_BHV.findall(out.strip()): - BHV[volume[0]] = {'Cluster': volume[1], 'Name': volume[2]} + bhv = { + volume[0]: {"Cluster": volume[1], "Name": volume[2]} + for volume in HEKETI_BHV.findall(volume_list.strip())} - return BHV + return bhv def get_total_free_space(heketi_client_node, heketi_server_url): -- cgit