summaryrefslogtreecommitdiffstats
path: root/tests/functional/gluster_stability/test_restart_gluster_services.py
diff options
context:
space:
mode:
authorvamahaja <vamahaja@redhat.com>2019-09-25 20:15:46 +0530
committervamahaja <vamahaja@redhat.com>2019-10-17 17:05:42 +0530
commit70ded8d3fbfe0b9962d7b4d83edee25044c5ab9b (patch)
tree4ab10eb5e8d0a3369543fe6aeb4bab725c3ee2f5 /tests/functional/gluster_stability/test_restart_gluster_services.py
parent22d5a75ea92b555beb6da357dc4f46908b17248e (diff)
Add library to get heketi block volumes by name prefix
This change required due to - 1. Get block volume by prefix is common step which is used in two places for now and will be used in other places too. 2. Hence add library "heketi_blockvolume_list_by_name_prefix" in heketi_ops.py. 3. And use added library and update code from class "GlusterStabilityTestSetup" and "TestGlusterBlockStability". Change-Id: I9e60d58d5c84380104081335745270b3d21ff071 Signed-off-by: vamahaja <vamahaja@redhat.com>
Diffstat (limited to 'tests/functional/gluster_stability/test_restart_gluster_services.py')
-rw-r--r--tests/functional/gluster_stability/test_restart_gluster_services.py45
1 files changed, 8 insertions, 37 deletions
diff --git a/tests/functional/gluster_stability/test_restart_gluster_services.py b/tests/functional/gluster_stability/test_restart_gluster_services.py
index 84bf0e3..3d760f2 100644
--- a/tests/functional/gluster_stability/test_restart_gluster_services.py
+++ b/tests/functional/gluster_stability/test_restart_gluster_services.py
@@ -1,5 +1,4 @@
from datetime import datetime
-import re
import time
from unittest import skip
@@ -15,7 +14,7 @@ from openshiftstoragelibs.gluster_ops import (
wait_to_heal_complete,
)
from openshiftstoragelibs.heketi_ops import (
- heketi_blockvolume_list,
+ heketi_blockvolume_list_by_name_prefix,
heketi_server_operation_cleanup,
heketi_server_operations_list,
)
@@ -87,35 +86,6 @@ class GlusterStabilityTestSetup(GlusterBlockBaseClass):
for pvc_name in self.pvc_list:
self.addCleanup(oc_delete, self.oc_node, "pvc", pvc_name)
- def get_heketi_block_volumes(self):
- """lists heketi block volumes
-
- Returns:
- list : list of ids of heketi block volumes
- """
- heketi_cmd_out = heketi_blockvolume_list(
- self.heketi_client_node, self.heketi_server_url)
-
- self.assertTrue(heketi_cmd_out, "failed to get block volume list")
-
- heketi_block_volume_ids = []
- heketi_block_volume_names = []
- for block_vol in heketi_cmd_out.split("\n"):
- heketi_vol_match = re.search(
- HEKETI_BLOCK_VOLUME_REGEX % self.prefix, block_vol.strip()
- )
- if heketi_vol_match:
- heketi_block_volume_ids.append(
- (heketi_vol_match.group(1)).strip()
- )
- heketi_block_volume_names.append(
- (heketi_vol_match.group(3)).strip()
- )
-
- return (sorted(heketi_block_volume_ids), sorted(
- heketi_block_volume_names)
- )
-
def validate_volumes_and_blocks(self):
"""Validates PVC and block volumes generated through heketi and OCS
"""
@@ -141,18 +111,19 @@ class GlusterStabilityTestSetup(GlusterBlockBaseClass):
match_pvc_and_pv(self.oc_node, self.prefix)
# get list of block volumes using heketi
- heketi_block_volume_ids, heketi_block_volume_names = (
- self.get_heketi_block_volumes()
- )
+ h_blockvol_list = heketi_blockvolume_list_by_name_prefix(
+ self.heketi_client_node, self.heketi_server_url, self.prefix)
# validate block volumes listed by heketi and pvs
+ heketi_blockvolume_ids = sorted([bv[0] for bv in h_blockvol_list])
match_pv_and_heketi_block_volumes(
- self.oc_node, heketi_block_volume_ids, self.prefix
- )
+ self.oc_node, heketi_blockvolume_ids, self.prefix)
# validate block volumes listed by heketi and gluster
+ heketi_blockvolume_names = sorted([
+ bv[1].replace("%s_" % self.prefix, "") for bv in h_blockvol_list])
match_heketi_and_gluster_block_volumes_by_prefix(
- heketi_block_volume_names, "%s_" % self.prefix)
+ heketi_blockvolume_names, "%s_" % self.prefix)
def get_io_time(self):
"""Gets last io time of io pod by listing log file directory