From d8a700fae2a92e8f447e9fa64844028a7cfc56e9 Mon Sep 17 00:00:00 2001 From: Sahina Bose Date: Wed, 16 Apr 2014 16:26:10 +0530 Subject: glustercli: Changed return code when quota not enabled When quota is not enabled the gluster cli command fails and was giving the wrong status. Fixed this. Change-Id: Ibf9709f7ccd17565473d5a258b323123f6904b82 Signed-off-by: Sahina Bose --- glusternagios/glustercli.py | 3 +++ tests/test_storage.py | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/glusternagios/glustercli.py b/glusternagios/glustercli.py index 03ea806..5753811 100755 --- a/glusternagios/glustercli.py +++ b/glusternagios/glustercli.py @@ -459,6 +459,9 @@ def volumeQuotaStatus(volumeName, remoteServer=None): rc, out, err = _execGluster(command) if rc == 0: return _parseVolumeQuotaStatus(out) + else: + if len(err) > 0 and err[0].find("Quota is disabled") > -1: + return VolumeQuotaStatus.DISABLED raise GlusterCmdFailedException(rc, err) diff --git a/tests/test_storage.py b/tests/test_storage.py index c736d1d..2426e4e 100644 --- a/tests/test_storage.py +++ b/tests/test_storage.py @@ -229,9 +229,8 @@ class TestStorageUtils(TestCaseBase): 'LVM2_VG_MDA_USED_COUNT': '1', 'LVM2_VG_FREE': '0', 'LVM2_VG_SEQNO': '3', - 'LVM2_LV_PATH': - ['/dev/vg_shubhnd/lv_root', - '/dev/vg_shubhnd/lv_swap'], + 'LVM2_LV_PATH': ['/dev/vg_shubhnd/lv_root', + '/dev/vg_shubhnd/lv_swap'], 'LVM2_VG_FREE_COUNT': '0', 'LVM2_MAX_PV': '0', 'LVM2_MAX_LV': '0', -- cgit