Merge pull request #1632 from zongzw/revert-alg

Revert "change the algorithm from least-connection-node to least-conn…
F5Networks · Jan 26, 2021 · 55887f4 · 55887f4
2 parents 05e994b + bbb0133
commit 55887f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/service_adapter.py b/f5_openstack_agent/lbaasv2/drivers/bigip/service_adapter.py
@@ -422,7 +422,7 @@ def _get_lb_method(self, method):
         elif lb_method == 'RATIO_LEAST_CONNECTIONS':
             return 'ratio-least-connections-member'
         elif lb_method == 'SOURCE_IP':
-            return 'least-connections-member'
+            return 'least-connections-node'
         elif lb_method == 'OBSERVED_MEMBER':
             return 'observed-member'
         elif lb_method == 'PREDICTIVE_MEMBER':

diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_service_adapter.py b/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_service_adapter.py
@@ -654,7 +654,7 @@ def test_pool_member_weight_source_ip(self, pool_member_service):
         srvc = copy.deepcopy(pool_member_service)
         srvc['pool']['lb_algorithm'] = 'SOURCE_IP'
         pool = adapter.get_pool(srvc)
-        assert pool['loadBalancingMode'] == 'least-connections-member'
+        assert pool['loadBalancingMode'] == 'least-connections-node'
 
     def test_pool_member_weight_bad_lb_method(self, pool_member_service):
         '''If lb method is bad and member has weight, lb is changed
@@ -713,7 +713,7 @@ def test_pool_no_members_source_ip(self, pool_member_service):
         del srvc['members']
         srvc['pool']['lb_algorithm'] = 'SOURCE_IP'
         pool = adapter.get_pool(srvc)
-        assert pool['loadBalancingMode'] == 'least-connections-member'
+        assert pool['loadBalancingMode'] == 'least-connections-node'
 
     def test_get_pool_monitor_no_monitor(self, basic_service):
         adapter = ServiceModelAdapter(mock.MagicMock())