diff options
| author | vamahaja <vamahaja@redhat.com> | 2019-02-08 14:01:53 +0530 |
|---|---|---|
| committer | vponomar <vponomar@redhat.com> | 2019-02-22 11:22:41 +0000 |
| commit | eb396cc001519bfc3d27061a81a7cbf0692e4853 (patch) | |
| tree | 1606ea5579a8c1c8da34a980080782bf0f7fd8c5 /tests/functional/common/gluster_block | |
| parent | d62b88c330a36142f8e0ac18c3713908e3ca26be (diff) | |
Merged HeketiBaseClass to BaseClass
Renamed cns_baseclass.py to baseclass.py with updated BaseClass.
Merged HeketiBaseClass to BaseClass with appropriate changes.
Updated delete_volumes and delete_block_volumes methods used in
test case method with heketi_delete_volume and heketi_blockvolume-
delete.
Change-Id: I8f623f1692cd863dc8ff041f7e8525ee0dc84f7b
Signed-off-by: vamahaja <vamahaja@redhat.com>
Diffstat (limited to 'tests/functional/common/gluster_block')
| -rw-r--r-- | tests/functional/common/gluster_block/test_restart_gluster_block.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/functional/common/gluster_block/test_restart_gluster_block.py b/tests/functional/common/gluster_block/test_restart_gluster_block.py index be5c4e9b..90c10dec 100644 --- a/tests/functional/common/gluster_block/test_restart_gluster_block.py +++ b/tests/functional/common/gluster_block/test_restart_gluster_block.py @@ -1,4 +1,4 @@ -from cnslibs.common.heketi_libs import HeketiBaseClass +from cnslibs.common.baseclass import BaseClass from cnslibs.common.heketi_ops import ( heketi_blockvolume_create, heketi_blockvolume_delete) @@ -9,7 +9,7 @@ from cnslibs.common.openshift_ops import ( wait_for_resource_absence) -class TestRestartGlusterBlockPod(HeketiBaseClass): +class TestRestartGlusterBlockPod(BaseClass): def test_restart_gluster_block_provisioner_pod(self): """Restart gluster-block provisioner pod @@ -26,13 +26,13 @@ class TestRestartGlusterBlockPod(HeketiBaseClass): # restart gluster-block-provisioner-pod dc_name = "glusterblock-%s-provisioner-dc" % self.storage_project_name - pod_name = get_pod_name_from_dc(self.ocp_master_node, dc_name) - oc_delete(self.ocp_master_node, 'pod', pod_name) - wait_for_resource_absence(self.ocp_master_node, 'pod', pod_name) + pod_name = get_pod_name_from_dc(self.ocp_master_node[0], dc_name) + oc_delete(self.ocp_master_node[0], 'pod', pod_name) + wait_for_resource_absence(self.ocp_master_node[0], 'pod', pod_name) # new gluster-pod name - pod_name = get_pod_name_from_dc(self.ocp_master_node, dc_name) - wait_for_pod_be_ready(self.ocp_master_node, pod_name) + pod_name = get_pod_name_from_dc(self.ocp_master_node[0], dc_name) + wait_for_pod_be_ready(self.ocp_master_node[0], pod_name) # create new heketi block volume vol_info = heketi_blockvolume_create(self.heketi_client_node, |