[TestFix] Remove hot and cold bricks list - Part2

For the non-tiered volume types, In few test cases while bringing
bricks offline, collecting both hot_tier_bricks and cold_tier_bricks
and it is not needed to collect hot and cold tier bricks.

Removing tier kwarg in one of the test.

Removing the hot and cold tiered bricks and collecting only bricks
of the particular volume as mentioned below.

Removing below section
```
bricks_to_bring_offline_dict = (select_bricks_to_bring_offline(
                self.mnode, self.volname))
bricks_to_bring_offline = list(filter(None, (
bricks_to_bring_offline_dict['hot_tier_bricks'] +
bricks_to_bring_offline_dict['cold_tier_bricks'] +
bricks_to_bring_offline_dict['volume_bricks'])))
```

Modifying as below for bringing bricks offline.
```
bricks_to_bring_offline = bricks_to_bring_offline_dict['volume_bricks']
```

Change-Id: I4f59343b380ced498516794a8cc7c968390a8459
Signed-off-by: Bala Konda Reddy M <bala12352@gmail.com>

2 files changed, 2 insertions, 6 deletions

diff --git a/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py b/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py
index 947c6eef7..4f6bba95a 100755
--- a/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py
+++ b/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py
@@ -99,8 +99,7 @@ class GlusterArbiterVolumeTypeClass(GlusterBaseClass):
         g.log.info("Adding bricks to convert to Arbiter Volume")

         replica_arbiter = {'replica_count': 1, 'arbiter_count': 1}

         ret = expand_volume(self.mnode, self.volname, self.servers,

-                            self.all_servers_info, add_to_hot_tier=False,

-                            **replica_arbiter)

+                            self.all_servers_info, **replica_arbiter)

         self.assertTrue(ret, "Failed to expand the volume  %s" % self.volname)

         g.log.info("Changing volume to arbiter volume is successful %s",

                    self.volname)

diff --git a/tests/functional/arbiter/brick_cases/test_rmvrf_files.py b/tests/functional/arbiter/brick_cases/test_rmvrf_files.py
index 9dbaa74fc..8d7304b0b 100755
--- a/tests/functional/arbiter/brick_cases/test_rmvrf_files.py
+++ b/tests/functional/arbiter/brick_cases/test_rmvrf_files.py
@@ -145,10 +145,7 @@ class TestRmrfMount(GlusterBaseClass):
         # Select bricks to bring offline
         bricks_to_bring_offline_dict = (select_bricks_to_bring_offline(
             self.mnode, self.volname))
-        bricks_to_bring_offline = list(filter(None, (
-            bricks_to_bring_offline_dict['hot_tier_bricks'] +
-            bricks_to_bring_offline_dict['cold_tier_bricks'] +
-            bricks_to_bring_offline_dict['volume_bricks'])))
+        bricks_to_bring_offline = bricks_to_bring_offline_dict['volume_bricks']
 
         # Killing one brick from the volume set
         g.log.info("Bringing bricks: %s offline", bricks_to_bring_offline)