diff options
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/gluster_stability/test_gluster_block_stability.py | 14 | ||||
| -rw-r--r-- | tests/functional/provisioning/test_storage_class_cases.py | 36 |
2 files changed, 50 insertions, 0 deletions
diff --git a/tests/functional/gluster_stability/test_gluster_block_stability.py b/tests/functional/gluster_stability/test_gluster_block_stability.py index acbec125..cb8f7f65 100644 --- a/tests/functional/gluster_stability/test_gluster_block_stability.py +++ b/tests/functional/gluster_stability/test_gluster_block_stability.py @@ -30,6 +30,9 @@ from openshiftstoragelibs.openshift_storage_libs import ( get_iscsi_session, get_mpath_name_from_device_name, ) +from openshiftstoragelibs.openshift_storage_version import ( + get_openshift_storage_version +) from openshiftstoragelibs.waiter import Waiter @@ -40,6 +43,17 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): super(TestGlusterBlockStability, self).setUp() self.node = self.ocp_master_node[0] + # TODO(vamahaja): Add check for CRS version + if not self.is_containerized_gluster(): + self.skipTest( + "Skipping this test case as CRS version check " + "is not implemented") + + if get_openshift_storage_version() <= "3.9": + self.skipTest( + "Skipping this test case as multipath validation " + "is not supported in OCS 3.9") + def initiator_side_failures(self): self.create_storage_class() self.create_and_wait_for_pvc() diff --git a/tests/functional/provisioning/test_storage_class_cases.py b/tests/functional/provisioning/test_storage_class_cases.py index 52b9d82a..6cf6e96c 100644 --- a/tests/functional/provisioning/test_storage_class_cases.py +++ b/tests/functional/provisioning/test_storage_class_cases.py @@ -30,6 +30,9 @@ from openshiftstoragelibs.openshift_ops import ( wait_for_pod_be_ready, wait_for_resource_absence, ) +from openshiftstoragelibs.openshift_storage_version import ( + get_openshift_storage_version +) from openshiftstoragelibs.openshift_version import get_openshift_version @@ -203,6 +206,17 @@ class TestStorageClassCases(BaseClass): """Validate gluster-block provisioning with different valid 'hacount' values """ + # TODO(vamahaja): Add check for CRS version + if not self.is_containerized_gluster(): + self.skipTest( + "Skipping this test case as CRS version check " + "is not implemented") + + if hacount > 1 and get_openshift_storage_version() <= "3.9": + self.skipTest( + "Skipping this test case as multipath validation " + "is not supported in OCS 3.9") + # create storage class and pvc with given parameters self.create_sc_with_parameter( 'glusterblock', success=True, parameter={'hacount': str(hacount)} @@ -222,6 +236,17 @@ class TestStorageClassCases(BaseClass): """Validate gluster-block provisioning with "hacount" value equal to gluster pods count """ + # TODO(vamahaja): Add check for CRS version + if not self.is_containerized_gluster(): + self.skipTest( + "Skipping this test case as CRS version check " + "is not implemented") + + if get_openshift_storage_version() <= "3.9": + self.skipTest( + "Skipping this test case as multipath validation " + "is not supported in OCS 3.9") + # get hacount as no of gluster pods the pvc creation hacount = get_amount_of_gluster_nodes(self.ocp_master_node[0]) @@ -241,6 +266,17 @@ class TestStorageClassCases(BaseClass): """Validate gluster-block provisioning with any invalid 'hacount' value """ + # TODO(vamahaja): Add check for CRS version + if not self.is_containerized_gluster(): + self.skipTest( + "Skipping this test case as CRS version check " + "is not implemented") + + if get_openshift_storage_version() <= "3.9": + self.skipTest( + "Skipping this test case as multipath validation " + "is not supported in OCS 3.9") + # get hacount as no of gluster pods + 1 to fail the pvc creation hacount = get_amount_of_gluster_nodes(self.ocp_master_node[0]) + 1 |