summaryrefslogtreecommitdiffstats
path: root/tests/functional/provisioning
diff options
context:
space:
mode:
authorvamahaja <vamahaja@redhat.com>2019-08-14 14:16:52 +0530
committervamahaja <vamahaja@redhat.com>2019-08-14 17:24:06 +0530
commit1f55afcf661f460cde5fb9a949761fe88db37761 (patch)
tree11fd512403ddd25a79e4ed77a0d34a9f8bd8a014 /tests/functional/provisioning
parent3f060d7c5957791e91df7441dad8cc8bb9679331 (diff)
Add OCS 3.9 version check for test cases which uses multipath validation
Change-Id: I5bb2760ff284cdc83424388bfdfc79d5fd112f21 Signed-off-by: vamahaja <vamahaja@redhat.com>
Diffstat (limited to 'tests/functional/provisioning')
-rw-r--r--tests/functional/provisioning/test_storage_class_cases.py36
1 files changed, 36 insertions, 0 deletions
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