CBQE-7196: failoverServerGroup is removed

Change-Id: Ia73ee6b678d59a42d6c2fc289ad13c8b760be2d2 Reviewed-on: https://review.couchbase.org/c/testrunner/+/165920 Tested-by: Balakumaran G <balakumaran.gopal@couchbase.com> Reviewed-by: Balakumaran G <balakumaran.gopal@couchbase.com> Reviewed-by: Sumedh Basarkod <sumedhpb8@gmail.com>
couchbase · Nov 17, 2021 · 4cc95fe · 4cc95fe
1 parent 5597795
commit 4cc95fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/lib/membase/api/rest_client.py b/lib/membase/api/rest_client.py
@@ -3054,13 +3054,12 @@ def get_autofailover_settings(self):
             settings.failoverOnDataDiskIssuesEnabled = json_parsed["failoverOnDataDiskIssues"]["enabled"]
             settings.failoverOnDataDiskIssuesTimeout = json_parsed["failoverOnDataDiskIssues"]["timePeriod"]
             settings.maxCount = json_parsed["maxCount"]
-            settings.failoverServerGroup = json_parsed["failoverServerGroup"]
             if json_parsed["canAbortRebalance"]:
                 settings.can_abort_rebalance = json_parsed["canAbortRebalance"]
         return settings
 
     def update_autofailover_settings(self, enabled, timeout, canAbortRebalance=False, enable_disk_failure=False,
-                                     disk_timeout=120, maxCount=1, enableServerGroup=False):
+                                     disk_timeout=120, maxCount=1):
         params_dict = {}
         params_dict['timeout'] = timeout
         if enabled:
@@ -3076,10 +3075,6 @@ def update_autofailover_settings(self, enabled, timeout, canAbortRebalance=False
         else:
             params_dict['failoverOnDataDiskIssues[enabled]'] = 'false'
         params_dict['maxCount'] = maxCount
-        if enableServerGroup:
-            params_dict['failoverServerGroup'] = 'true'
-        else:
-            params_dict['failoverServerGroup'] = 'false'
         params = urllib.parse.urlencode(params_dict)
         api = self.baseUrl + 'settings/autoFailover'
         log.info('settings/autoFailover params : {0}'.format(params))
@@ -6169,7 +6164,6 @@ def __init__(self):
         self.failoverOnDataDiskIssuesEnabled = False
         self.failoverOnDataDiskIssuesTimeout = 0
         self.maxCount = 1
-        self.failoverServerGroup = False
         self.can_abort_rebalance = False
 
 

diff --git a/pytests/failover/AutoFailoverBaseTest.py b/pytests/failover/AutoFailoverBaseTest.py
@@ -156,8 +156,7 @@ def enable_autofailover(self):
         status = self.rest.update_autofailover_settings(True,
                                                         self.timeout,
                                                         self.can_abort_rebalance,
-                                                        maxCount=self.max_count,
-                                                        enableServerGroup=self.server_group_failover)
+                                                        maxCount=self.max_count)
         return status
 
     def disable_autofailover(self):
@@ -500,7 +499,6 @@ def _get_params(self):
         """
         self.timeout = self.input.param("timeout", 60)
         self.max_count = self.input.param("maxCount", 1)
-        self.server_group_failover = self.input.param("serverGroupFailover", False)
         self.failover_action = self.input.param("failover_action",
                                                 "stop_server")
         self.failover_orchestrator = self.input.param("failover_orchestrator",