summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xglusternagios/glustercli.py3
-rw-r--r--tests/test_storage.py5
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',