[TestFix][Tier1] Move 'tier0' tests to 'tier1'

Change-Id: Ie1f01771518e82eec378564ddde34ae0fb7f0ac6
Signed-off-by: vamahaja <vamahaja@redhat.com>

13 files changed, 44 insertions, 44 deletions

diff --git a/tests/functional/heketi/test_block_volumes_heketi.py b/tests/functional/heketi/test_block_volumes_heketi.py
index 43c8a9ba..a9092b06 100644
--- a/tests/functional/heketi/test_block_volumes_heketi.py
+++ b/tests/functional/heketi/test_block_volumes_heketi.py
@@ -50,7 +50,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
        after manually creating a Block Hosting volume.
     """
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_create_block_vol_after_host_vol_creation(self):
         """Validate block-device after manual block hosting volume creation
            using heketi
@@ -68,7 +68,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
             heketi_blockvolume_delete, self.heketi_client_node,
             self.heketi_server_url, block_vol["id"])
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_block_host_volume_delete_without_block_volumes(self):
         """Validate deletion of empty block hosting volume"""
         block_host_create_info = heketi_volume_create(
@@ -84,7 +84,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
             self.heketi_client_node, self.heketi_server_url,
             block_hosting_vol_id, json=True)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_block_volume_delete(self):
         """Validate deletion of gluster-block volume and capacity of used pool
         """
@@ -104,7 +104,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
                          "The block volume has not been successfully deleted,"
                          " ID is %s" % block_vol["id"])
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_block_volume_list(self):
         """Validate heketi blockvolume list command works as expected"""
         created_vol_ids = []
@@ -126,7 +126,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
                           "Block vol with '%s' ID is absent in the "
                           "list of block volumes." % vol_id)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_block_host_volume_delete_block_volume_delete(self):
         """Validate block volume and BHV removal using heketi"""
         free_space, nodenum = get_total_free_space(
@@ -168,7 +168,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
         self.assertIn(
             block_vol_info["id"], bhv_info["blockinfo"]["blockvolume"])
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @podcmd.GlustoPod()
     def test_validate_gluster_voloptions_blockhostvolume(self):
         """Validate gluster volume options which are set for
@@ -252,7 +252,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
             ("Password is %spresent in %s", (assertion_msg_part,
                                              block_vol["id"])))
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_block_volume_create_with_name(self):
         """Validate creation of block volume with name"""
         vol_name = "autotests-heketi-volume-%s" % utils.get_random_str()
@@ -448,7 +448,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
                     bhv_name, h_node, err)
                 raise exceptions.ExecutionError(err)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @podcmd.GlustoPod()
     def test_heket_block_volume_info_with_gluster_block_volume_info(self):
         """Verify heketi block volume info with the backend gluster
@@ -529,7 +529,7 @@ class TestBlockVolumeOps(GlusterBlockBaseClass):
             err_msg.format(
                 "ha", h_block_vol_ha, g_block_vol_ha, err_msg))
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_dynamic_provisioning_block_vol_with_custom_prefix(self):
         """Verify creation of block volume with custom prefix
         """
diff --git a/tests/functional/heketi/test_check_brick_paths.py b/tests/functional/heketi/test_check_brick_paths.py
index de453de8..67c3bc59 100644
--- a/tests/functional/heketi/test_check_brick_paths.py
+++ b/tests/functional/heketi/test_check_brick_paths.py
@@ -28,7 +28,7 @@ class TestHeketiVolume(BaseClass):
                 results.append(out)
             assertion_method('present', results)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_validate_brick_paths_on_gluster_pods_or_nodes(self):
         """Validate brick paths after creation and deletion of a volume."""
 
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 64ba4d90..ba8f7f61 100644
--- a/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py
+++ b/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py
@@ -195,21 +195,21 @@ class TestHeketiVolume(BaseClass):
                        free_space_after_creating_vol,
                        free_space_after_deleting_vol))
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_to_create_and_delete_dist_rep_vol(self):
         """Validate 2x3 vol type creation when the volume cannot be
            carved out of a single device and the delete the volume
         """
         self._create_distributed_replica_vol(validate_cleanup=True)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @ddt.data(True, False)
     def test_create_and_delete_dist_replicated_bhv(self, validate_cleanup):
         """Validate distributed replicated bhv using heketi-cli"""
         self._create_distributed_replica_vol(
             validate_cleanup, block=True)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_to_create_dist_rep_vol(self):
         """Validate 2x3 vol type creation when the volume cannot be
            carved out of a single device
diff --git a/tests/functional/heketi/test_heketi_create_volume.py b/tests/functional/heketi/test_heketi_create_volume.py
index c257029f..a15d4447 100644
--- a/tests/functional/heketi/test_heketi_create_volume.py
+++ b/tests/functional/heketi/test_heketi_create_volume.py
@@ -63,7 +63,7 @@ class TestHeketiVolume(BaseClass):
         super(TestHeketiVolume, cls).setUpClass()
         cls.volume_size = 1
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @podcmd.GlustoPod()
     def test_volume_create_and_list_volume(self):
         """Validate heketi and gluster volume list"""
@@ -139,7 +139,7 @@ class TestHeketiVolume(BaseClass):
         self.assertTrue(vol_info, "Failed to get volume info %s" % name)
         g.log.info("Successfully got the volume info %s" % name)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_create_vol_and_retrieve_topology_info(self):
         volume_names = []
         volume_ids = []
@@ -245,7 +245,7 @@ class TestHeketiVolume(BaseClass):
         self.assertTrue(out, ("Failed to list heketi cluster"))
         g.log.info("All heketi cluster successfully listed")
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_to_check_deletion_of_node(self):
         """Validate deletion of a node which contains devices"""
 
@@ -747,7 +747,7 @@ class TestHeketiVolume(BaseClass):
         self.assertIn(
             "transport endpoint is not connected", six.text_type(e.exception))
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_heketi_volume_create_with_clusterid(self):
         """Validate creation of heketi volume with clusters argument"""
         h_node, h_url = self.heketi_client_node, self.heketi_server_url
diff --git a/tests/functional/heketi/test_heketi_device_operations.py b/tests/functional/heketi/test_heketi_device_operations.py
index 1d97a7f5..71430a14 100755
--- a/tests/functional/heketi/test_heketi_device_operations.py
+++ b/tests/functional/heketi/test_heketi_device_operations.py
@@ -97,7 +97,7 @@ class TestHeketiDeviceOperations(BaseClass):
 
         return online_hosts
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_heketi_device_enable_disable(self):
         """Validate device enable and disable functionality"""
 
@@ -580,7 +580,7 @@ class TestHeketiDeviceOperations(BaseClass):
             self.addCleanup(
                 heketi_device_add, h_node, h_url, device_name, node_id)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_dev_path_mapping_basic_validation(self):
         """Validate dev_path of all the devices"""
         node_with_devices = dict()
diff --git a/tests/functional/heketi/test_heketi_lvm_wrapper.py b/tests/functional/heketi/test_heketi_lvm_wrapper.py
index dfe787f4..93f76ef1 100644
--- a/tests/functional/heketi/test_heketi_lvm_wrapper.py
+++ b/tests/functional/heketi/test_heketi_lvm_wrapper.py
@@ -50,7 +50,7 @@ class TestHeketiLvmWrapper(baseclass.BaseClass):
         openshift_ops.wait_for_pod_be_ready(
             self.oc_node, new_heketi_pod, wait_step=20)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_lvm_script_and_wrapper_environments(self):
         """Validate lvm script present on glusterfs pods
            lvm wrapper environment is present on heketi pod"""
@@ -79,7 +79,7 @@ class TestHeketiLvmWrapper(baseclass.BaseClass):
         else:
             self.assertIsNotNone(env_var_value[0], err_msg)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_lvm_script_executable_on_host(self):
         """Validate lvm script is executable on host instead
            of container"""
@@ -125,7 +125,7 @@ class TestHeketiLvmWrapper(baseclass.BaseClass):
         self.assertFalse(ret, err_msg)
         self.assertIn("VG", out)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @ddt.data(ENV_FALSE_VALUE, ENV_VALUE, "")
     def test_lvm_script_with_wrapper_environment_value(self, env_var_value):
         """Validate the creation, deletion, etc operations when
diff --git a/tests/functional/heketi/test_heketi_node_operations.py b/tests/functional/heketi/test_heketi_node_operations.py
index 387bfae4..adcbf6ef 100644
--- a/tests/functional/heketi/test_heketi_node_operations.py
+++ b/tests/functional/heketi/test_heketi_node_operations.py
@@ -25,7 +25,7 @@ class TestHeketiNodeOperations(baseclass.BaseClass):
         self.h_node = self.heketi_client_node
         self.h_url = self.heketi_server_url
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @podcmd.GlustoPod()
     def test_heketi_node_list(self):
         """Test node list operation
@@ -73,7 +73,7 @@ class TestHeketiNodeOperations(baseclass.BaseClass):
                 "Failed to match node ID. Exp: %s, Act: %s" % (
                     node_id, node_info["id"]))
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_heketi_node_states_enable_disable(self):
         """Test node enable and disable functionality
         """
@@ -237,7 +237,7 @@ class TestHeketiNodeOperations(baseclass.BaseClass):
             storage_ip, ep_addresses)
         self.assertIn(storage_ip, ep_addresses, err_msg)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_heketi_node_add_with_valid_cluster(self):
         """Test heketi node add operation with valid cluster id"""
         if not self.is_containerized_gluster():
@@ -461,7 +461,7 @@ class TestHeketiNodeOperations(baseclass.BaseClass):
                 self.h_node, self.h_url, device['id'])
         heketi_ops.heketi_node_delete(self.h_node, self.h_url, node_id)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @ddt.data('remove', 'delete')
     def test_heketi_node_remove_or_delete(self, operation='delete'):
         """Test node remove and delete functionality of heketi and validate
diff --git a/tests/functional/heketi/test_restart_heketi_pod.py b/tests/functional/heketi/test_restart_heketi_pod.py
index 98c4f8f4..caab3407 100644
--- a/tests/functional/heketi/test_restart_heketi_pod.py
+++ b/tests/functional/heketi/test_restart_heketi_pod.py
@@ -49,7 +49,7 @@ class TestRestartHeketi(BaseClass):
                 self.ocp_master_node[0], self.heketi_dc_name)
             wait_for_pod_be_ready(self.ocp_master_node[0], pod_name)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_restart_heketi_pod(self):
         """Validate restarting heketi pod"""
 
@@ -102,7 +102,7 @@ class TestRestartHeketi(BaseClass):
         heketi_volume_delete(
             self.heketi_client_node, self.heketi_server_url, vol_info['id'])
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_set_heketi_vol_size_and_brick_amount_limits(self):
         # Get Heketi secret name
         cmd_get_heketi_secret_name = (
@@ -194,7 +194,7 @@ class TestRestartHeketi(BaseClass):
         self.addCleanup(heketi_volume_delete, h_client, h_server, vol_5['id'])
         heketi_volume_expand(h_client, h_server, vol_5['id'], 2)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_heketi_logs_after_heketi_pod_restart(self):
 
         h_node, h_server = self.heketi_client_node, self.heketi_server_url
diff --git a/tests/functional/heketi/test_server_state_examine_gluster.py b/tests/functional/heketi/test_server_state_examine_gluster.py
index bbba966b..6b66f13a 100644
--- a/tests/functional/heketi/test_server_state_examine_gluster.py
+++ b/tests/functional/heketi/test_server_state_examine_gluster.py
@@ -59,7 +59,7 @@ class TestHeketiServerStateExamineGluster(BaseClass):
             "heketi volume list matches with volume list of all nodes",
             out['report'])
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @ddt.data('', 'block')
     def test_compare_real_vol_count_with_db_check_info(self, vol_type):
         """Validate file/block volumes using heketi db check."""
@@ -83,7 +83,7 @@ class TestHeketiServerStateExamineGluster(BaseClass):
             "%svolume count doesn't match expected "
             "result %s, actual result is %s" % (vol_type, count, vol_count))
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @ddt.data('device_count', 'node_count', 'bricks_count')
     def test_verify_db_check(self, count_type):
         """Validate the nodes, devices and bricks count in heketi db"""
@@ -188,7 +188,7 @@ class TestHeketiServerStateExamineGluster(BaseClass):
             examine_msg, msg, "Failed to generate error report for node {} in"
             " gluster examine output".format(g_node))
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @podcmd.GlustoPod()
     def test_compare_brick_mount_status(self):
         """Compare the brick mount status from all nodes"""
diff --git a/tests/functional/heketi/test_volume_creation.py b/tests/functional/heketi/test_volume_creation.py
index 92b9dac3..54c808dd 100644
--- a/tests/functional/heketi/test_volume_creation.py
+++ b/tests/functional/heketi/test_volume_creation.py
@@ -21,7 +21,7 @@ class TestVolumeCreationTestCases(BaseClass):
         super(TestVolumeCreationTestCases, self).setUp()
         self.node = self.ocp_master_node[0]
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @podcmd.GlustoPod()
     def test_create_heketi_volume(self):
         """Test heketi volume creation and background gluster validation"""
@@ -94,7 +94,7 @@ class TestVolumeCreationTestCases(BaseClass):
                              [brick_name]["status"]), 1,
                              "Brick %s is not up" % brick_name)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_volume_creation_no_free_devices(self):
         """Validate heketi error is returned when no free devices available"""
         node, server_url = self.heketi_client_node, self.heketi_server_url
@@ -249,7 +249,7 @@ class TestVolumeCreationTestCases(BaseClass):
             g_vol_info = g_vol_info.get(file_vol)
         return g_vol_info
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_volume_creation_of_size_greater_than_the_device_size(self):
         """Validate creation of a volume of size greater than the size of a
         device.
diff --git a/tests/functional/heketi/test_volume_deletion.py b/tests/functional/heketi/test_volume_deletion.py
index c8288020..6d2e41e0 100644
--- a/tests/functional/heketi/test_volume_deletion.py
+++ b/tests/functional/heketi/test_volume_deletion.py
@@ -61,7 +61,7 @@ class TestVolumeDeleteTestCases(baseclass.BaseClass):
                 ocp_node, self.heketi_dc_name)
             openshift_ops.wait_for_pod_be_ready(ocp_node, pod_name)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_delete_heketi_volume(self):
         """
         Method to test heketi volume deletion and whether it
@@ -89,7 +89,7 @@ class TestVolumeDeleteTestCases(baseclass.BaseClass):
             "Free space is not reclaimed after deletion "
             "of %s" % volume_info["id"])
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_delete_heketidb_volume(self):
         """Method to test heketidb volume deletion via heketi-cli."""
         for i in range(0, 2):
@@ -121,7 +121,7 @@ class TestVolumeDeleteTestCases(baseclass.BaseClass):
         raise exceptions.ExecutionError(
             "Warning: heketidbstorage doesn't exist in list of volumes")
 
-    @pytest.mark.tier1
+    @pytest.mark.tier2
     def test_heketi_server_stale_operations_during_heketi_pod_reboot(self):
         """
         Validate failed/stale entries in db and performs a cleanup
diff --git a/tests/functional/heketi/test_volume_expansion_and_devices.py b/tests/functional/heketi/test_volume_expansion_and_devices.py
index 996e978f..df064e76 100644
--- a/tests/functional/heketi/test_volume_expansion_and_devices.py
+++ b/tests/functional/heketi/test_volume_expansion_and_devices.py
@@ -162,7 +162,7 @@ class TestVolumeExpansionAndDevicesTestCases(BaseClass):
                 device_delete, False,
                 "Device %s could not be deleted" % device_id)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_volume_expansion_expanded_volume(self):
         """Validate volume expansion with brick and check rebalance"""
         creation_info = heketi_ops.heketi_volume_create(
@@ -302,7 +302,7 @@ class TestVolumeExpansionAndDevicesTestCases(BaseClass):
                         "Free space not reclaimed after deletion of %s"
                         % volume_id)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_volume_expansion_no_free_space(self):
         """Validate volume expansion when there is no free space"""
 
@@ -437,7 +437,7 @@ class TestVolumeExpansionAndDevicesTestCases(BaseClass):
             free_space_after_deletion, free_space_after_expansion,
             "Free space not reclaimed after deletion of volume %s" % volume_id)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     @podcmd.GlustoPod()
     def test_volume_expansion_rebalance_brick(self):
         """Validate volume expansion with brick and check rebalance"""
diff --git a/tests/functional/heketi/test_volume_multi_req.py b/tests/functional/heketi/test_volume_multi_req.py
index 3fdc4381..0780be1e 100644
--- a/tests/functional/heketi/test_volume_multi_req.py
+++ b/tests/functional/heketi/test_volume_multi_req.py
@@ -221,7 +221,7 @@ class TestVolumeMultiReq(BaseClass):
         ocp_node = list(g.config['ocp_servers']['master'].keys())[0]
         return len(_heketi_vols(ocp_node, self.heketi_server_url))
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_simple_serial_vol_create(self):
         """Test that serially creating PVCs causes heketi to add volumes.
         """
@@ -282,7 +282,7 @@ class TestVolumeMultiReq(BaseClass):
         self.assertIn(c2.heketiVolumeName, now_vols)
         self.assertNotIn(c2.heketiVolumeName, orig_vols)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_multiple_vol_create(self):
         """Test creating two volumes via PVCs with no waiting between
         the PVC requests.
@@ -385,7 +385,7 @@ class TestVolumeMultiReq(BaseClass):
             c.update_pv_info(ocp_node)
             self.assertIn(c.heketiVolumeName, now_vols)
 
-    @pytest.mark.tier0
+    @pytest.mark.tier1
     def test_create_delete_volumes_concurrently(self):
         """Test creating volume when "other processes" are creating
         and deleting other volumes in the background.