summaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/arbiter/test_arbiter.py28
-rw-r--r--tests/functional/heketi/test_block_volumes_heketi.py13
-rw-r--r--tests/functional/heketi/test_create_distributed_replica_heketi_volume.py24
-rw-r--r--tests/functional/heketi/test_heketi_device_operations.py25
4 files changed, 35 insertions, 55 deletions
diff --git a/tests/functional/arbiter/test_arbiter.py b/tests/functional/arbiter/test_arbiter.py
index 6d5ab44e..be0ab39d 100644
--- a/tests/functional/arbiter/test_arbiter.py
+++ b/tests/functional/arbiter/test_arbiter.py
@@ -515,27 +515,10 @@ class TestArbiterVolumeCreateExpandDelete(baseclass.BaseClass):
self.create_storage_class(is_arbiter_vol=True)
# Create and delete 3 small volumes concurrently
- pvc_names = []
- for i in range(3):
- pvc_name = openshift_ops.oc_create_pvc(
- self.node, self.sc_name, pvc_name_prefix='arbiter-pvc',
- pvc_size=int(pvc_size / 3))
- pvc_names.append(pvc_name)
- exception_exists = False
- for pvc_name in pvc_names:
- try:
- openshift_ops.verify_pvc_status_is_bound(self.node, pvc_name)
- except Exception:
- for pvc_name in pvc_names:
- self.addCleanup(
- openshift_ops.wait_for_resource_absence,
- self.node, 'pvc', pvc_name)
- for pvc_name in pvc_names:
- self.addCleanup(
- openshift_ops.oc_delete, self.node, 'pvc', pvc_name)
- exception_exists = True
- if exception_exists:
- raise
+ pvc_names = self.create_and_wait_for_pvcs(
+ pvc_size=int(pvc_size / 3), pvc_name_prefix='arbiter-pvc',
+ pvc_amount=3, sc_name=self.sc_name)
+
for pvc_name in pvc_names:
openshift_ops.oc_delete(self.node, 'pvc', pvc_name)
for pvc_name in pvc_names:
@@ -547,7 +530,8 @@ class TestArbiterVolumeCreateExpandDelete(baseclass.BaseClass):
self.node, self.sc_name, pvc_name_prefix='arbiter-pvc',
pvc_size=pvc_size)
try:
- openshift_ops.verify_pvc_status_is_bound(self.node, pvc_name)
+ openshift_ops.verify_pvc_status_is_bound(
+ self.node, pvc_name, 300, 10)
except Exception:
self.addCleanup(
openshift_ops.wait_for_resource_absence,
diff --git a/tests/functional/heketi/test_block_volumes_heketi.py b/tests/functional/heketi/test_block_volumes_heketi.py
index 5520e8bc..b6ff9ee0 100644
--- a/tests/functional/heketi/test_block_volumes_heketi.py
+++ b/tests/functional/heketi/test_block_volumes_heketi.py
@@ -114,16 +114,13 @@ class TestBlockVolumeOps(BaseClass):
self.skipTest("Skipping the test since free_space_available %s"
"is less than the default_bhv_size %s"
% (free_space_available, default_bhv_size))
- block_host_create_info = heketi_volume_create(
- self.heketi_client_node, self.heketi_server_url,
- default_bhv_size, json=True, block=True)
+ h_volume_name = (
+ "autotests-heketi-volume-%s" % utils.get_random_str())
+ block_host_create_info = self.create_heketi_volume_with_name_and_wait(
+ h_volume_name, default_bhv_size, json=True, block=True)
+
block_vol_size = block_host_create_info["blockinfo"]["freesize"]
block_hosting_vol_id = block_host_create_info["id"]
- self.addCleanup(heketi_volume_delete,
- self.heketi_client_node,
- self.heketi_server_url,
- block_hosting_vol_id,
- raise_on_error=True)
block_vol_info = {"blockhostingvolume": "init_value"}
while (block_vol_info['blockhostingvolume'] != block_hosting_vol_id):
block_vol = heketi_blockvolume_create(
diff --git a/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py b/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py
index e19502c2..82fcf704 100644
--- a/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py
+++ b/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py
@@ -13,11 +13,11 @@ from openshiftstoragelibs.heketi_ops import (
heketi_node_enable,
heketi_node_info,
heketi_node_list,
- heketi_volume_create,
heketi_volume_delete,
heketi_volume_list,
)
from openshiftstoragelibs import podcmd
+from openshiftstoragelibs import utils
@ddt.ddt
@@ -100,33 +100,27 @@ class TestHeketiVolume(BaseClass):
# Create distributed vol
vol_size_gb = self._get_vol_size()
heketi_url = self.heketi_server_url
+ h_volume_name = "autotests-heketi-volume-%s" % utils.get_random_str()
try:
- g.log.info(
- "Trying to create distributed '%s'Gb volume." % vol_size_gb)
- heketi_vol = heketi_volume_create(
- self.heketi_client_node, heketi_url, vol_size_gb,
- json=True, block=block)
+ heketi_vol = self.create_heketi_volume_with_name_and_wait(
+ h_volume_name, vol_size_gb, json=True)
except AssertionError as e:
# NOTE: rare situation when we need to decrease size of a volume.
# and we expect this vol to be distributed.
g.log.info("Failed to create distributed '%s'Gb volume. "
"Trying to create another one, smaller for 1Gb.")
- if ('more required' in str(e)
+ if not ('more required' in str(e)
and ('Insufficient suitable allocatable extents for '
'logical volume' in str(e))):
- vol_size_gb -= 1
- heketi_vol = heketi_volume_create(
- self.heketi_client_node, heketi_url, vol_size_gb,
- json=True, block=block)
- else:
raise
+
+ vol_size_gb -= 1
+ heketi_vol = self.create_heketi_volume_with_name_and_wait(
+ h_volume_name, vol_size_gb, json=True)
g.log.info("Successfully created distributed volume.")
vol_name = heketi_vol['name']
vol_id = heketi_vol["bricks"][0]["volume"]
- self.addCleanup(
- heketi_volume_delete, self.heketi_client_node, heketi_url,
- vol_id, raise_on_error=(not validate_cleanup))
# Get gluster volume info
g.log.info("Get gluster volume '%s' info" % vol_name)
diff --git a/tests/functional/heketi/test_heketi_device_operations.py b/tests/functional/heketi/test_heketi_device_operations.py
index e27fc0d5..2261304a 100644
--- a/tests/functional/heketi/test_heketi_device_operations.py
+++ b/tests/functional/heketi/test_heketi_device_operations.py
@@ -17,6 +17,7 @@ from openshiftstoragelibs.heketi_ops import (
heketi_volume_create,
heketi_volume_delete,
)
+from openshiftstoragelibs import utils
@ddt.ddt
@@ -381,19 +382,23 @@ class TestHeketiDeviceOperations(BaseClass):
# Create volume with such size that we consume space more than
# size of smaller disks
+ h_volume_name = "autotests-heketi-volume-%s" % utils.get_random_str()
try:
- heketi_vol = heketi_volume_create(
- heketi_node, heketi_url, vol_size_gb, json=True)
+ self.create_heketi_volume_with_name_and_wait(
+ h_volume_name, vol_size_gb, json=True)
except Exception as e:
- g.log.warning(
- "Got following error trying to create '%s'Gb vol: %s" % (
- vol_size_gb, e))
+ # NOTE: rare situation when we need to decrease size of a volume.
+ g.log.info("Failed to create '%s'Gb volume. "
+ "Trying to create another one, smaller for 1Gb.")
+
+ if not ('more required' in str(e)
+ and ('Insufficient suitable allocatable extents for '
+ 'logical volume' in str(e))):
+ raise
+
vol_size_gb -= 1
- heketi_vol = heketi_volume_create(
- heketi_node, heketi_url, vol_size_gb, json=True)
- self.addCleanup(
- heketi_volume_delete, self.heketi_client_node,
- self.heketi_server_url, heketi_vol["bricks"][0]["volume"])
+ self.create_heketi_volume_with_name_and_wait(
+ h_volume_name, vol_size_gb, json=True)
# Try to 'remove' bigger Heketi disk expecting error,
# because there is no space on smaller disk to relocate bricks to