Replacing monitorRebalance() with RebUtil().monitor_rebalance()

Change-Id: I918aa47f2d793bdb0eaafc74c89a472c84905e11
Reviewed-on: https://review.couchbase.org/c/TAF/+/245015
Reviewed-by: <shivam.paliwal@couchbase.com>
Tested-by: <shivam.paliwal@couchbase.com>

Author: ashwin2002

pytests/failover/DiskFailoverTests.py

@@ -6,6 +6,7 @@
 from custom_exceptions.exception import \
     RebalanceFailedException, \
     ServerUnavailableException
+from rebalance_utils.rebalance_util import RebalanceUtil
 
 
 class DiskAutofailoverTests(DiskAutoFailoverBasetest):
@@ -257,7 +258,8 @@ def test_rebalance_after_disk_autofailover(self):
         started, _ = self.rest.rebalance(nodes, nodes_to_remove)
         rebalance_success = False
         if started:
-            rebalance_success = self.rest.monitorRebalance()
+            reb_util = RebalanceUtil(self.cluster)
+            rebalance_success = reb_util.monitor_rebalance()
         if (not rebalance_success or not started) and not \
                 self.failover_expected:
             self.fail("Rebalance failed. Check logs")
@@ -314,7 +316,8 @@ def test_disk_autofailover_and_addback_of_node(self):
         self.rest.rebalance(known_nodes=[node.id for node in self.nodes])
         msg = "rebalance failed while recovering failover nodes {0}".format(
             self.server_to_fail[0])
-        self.assertTrue(self.rest.monitorRebalance(stop_if_loop=True), msg)
+        reb_util = RebalanceUtil(self.cluster)
+        self.assertTrue(reb_util.monitor_rebalance(stop_if_loop=True), msg)
         if self.spec_name is None:
             if not self.atomicity:
                 self.validate_loadgen_tasks()
@@ -362,7 +365,8 @@ def test_disk_autofailover_and_remove_failover_node(self):
                             eject_nodes=[])
         msg = "rebalance failed while removing failover nodes {0}".format(
             self.server_to_fail[0])
-        self.assertTrue(self.rest.monitorRebalance(stop_if_loop=True), msg)
+        reb_util = RebalanceUtil(self.cluster)
+        self.assertTrue(reb_util.monitor_rebalance(stop_if_loop=True), msg)
         if self.spec_name is None:
             if not self.atomicity:
                 self.validate_loadgen_tasks()

pytests/failover/MultiNodeAutoFailoverTests.py

@@ -5,6 +5,7 @@
 from custom_exceptions.exception import RebalanceFailedException, \
     ServerUnavailableException
 from membase.api.rest_client import RestConnection
+from rebalance_utils.rebalance_util import RebalanceUtil
 
 
 class MultiNodeAutoFailoverTests(AutoFailoverBaseTest):
@@ -195,7 +196,8 @@ def test_rebalance_after_autofailover(self):
         started, _ = self.rest.rebalance(known_nodes=nodes, eject_nodes=nodes_to_remove)
         rebalance_success = False
         if started:
-            rebalance_success = self.rest.monitorRebalance()
+            reb_util = RebalanceUtil(self.cluster)
+            rebalance_success = reb_util.monitor_rebalance()
         if (not rebalance_success or not started) and not \
                 self.failover_expected:
             self.fail("Rebalance failed. Check logs")
@@ -234,7 +236,8 @@ def test_autofailover_and_addback_of_node(self):
         self.rest.rebalance(known_nodes=[node.id for node in self.nodes])
         msg = "rebalance failed while recovering failover nodes {0}" \
               .format(self.server_to_fail[0])
-        self.assertTrue(self.rest.monitorRebalance(stop_if_loop=True), msg)
+        reb_util = RebalanceUtil(self.cluster)
+        self.assertTrue(reb_util.monitor_rebalance(stop_if_loop=True), msg)
         if self.spec_name is None:
             for task in tasks:
                 self.task.jython_task_manager.get_task_result(task)
@@ -265,8 +268,8 @@ def test_autofailover_and_remove_failover_node(self):
         self.rest.rebalance(known_nodes=[node.id for node in self.nodes])
         msg = "rebalance failed while removing failover nodes {0}" \
               .format(self.server_to_fail[0])
-        self.assertTrue(self.rest.monitorRebalance(stop_if_loop=True),
-                        msg)
+        reb_util = RebalanceUtil(self.cluster)
+        self.assertTrue(reb_util.monitor_rebalance(stop_if_loop=True), msg)
         if self.spec_name is None:
             for task in tasks:
                 self.task.jython_task_manager.get_task_result(task)