From 58a71f32c632c433c2db2672bb21fb2781dfac87 Mon Sep 17 00:00:00 2001 From: sayaleeraut Date: Thu, 13 Feb 2020 10:49:17 +0530 Subject: [LibFix] Fix volume type check Earlier the elements passed in list for volume type check were ('replicate', 'disperse', 'arbiter'), but as the volume type returned by get_volume_type() will be in the format 'Replicate', 'Disperse', 'Arbiter' and lists are case sensitive, these changes will make sure it does not change. Change-Id: Ic73ca946cd9c06bfa5b92605dbeba74d6ffa83d9 Signed-off-by: sayaleeraut --- glustolibs-gluster/glustolibs/gluster/brickdir.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'glustolibs-gluster/glustolibs/gluster/brickdir.py') diff --git a/glustolibs-gluster/glustolibs/gluster/brickdir.py b/glustolibs-gluster/glustolibs/gluster/brickdir.py index 29db08b4c..ffc868b93 100644 --- a/glustolibs-gluster/glustolibs/gluster/brickdir.py +++ b/glustolibs-gluster/glustolibs/gluster/brickdir.py @@ -96,10 +96,10 @@ def get_hashrange(brickdir_path): return None elif gluster_version >= 6.0: ret = get_volume_type(brickdir_path) - if ret in ('replicate', 'disperse', 'arbiter'): + if ret in ('Replicate', 'Disperse', 'Arbiter'): g.log.info("Cannot find hash-range for Replicate/Disperse/Arbiter" " volume type on Gluster 6.0 and higher.") - return "Skipping for replicate/disperse/arbiter volume type" + return "Skipping for Replicate/Disperse/Arbiter volume type" else: ret = check_hashrange(brickdir_path) hash_range_low = ret[0] @@ -156,7 +156,7 @@ class BrickDir(object): self._hashrange_high = self._hashrange[1] elif gluster_version >= 6.0: ret = get_volume_type(self._path) - if ret in ('replicate', 'disperse', 'arbiter'): + if ret in ('Replicate', 'Disperse', 'Arbiter'): g.log.info("Cannot find hash-range as the volume type under" " test is Replicate/Disperse/Arbiter") else: @@ -210,7 +210,7 @@ class BrickDir(object): gluster_version = get_gluster_version(self._host) if gluster_version >= 6.0: ret = get_volume_type(self._path) - if ret in ('replicate', 'disperse', 'arbiter'): + if ret in ('Replicate', 'Disperse', 'Arbiter'): g.log.info("Cannot find hash-range as the volume type" " under test is Replicate/Disperse/Arbiter") else: -- cgit