openstack
/
senlin
Code Issues Proposed changes

Merge "Fix LB creation failure with cluster name"

This commit is contained in:
Zuul 2021-06-29 01:36:52 +00:00 committed by Gerrit Code Review
parent 567402a632 5922e74a61
commit 2b2d51d748
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
senlin/policies/lb_policy.py
View File

@ -418,8 +418,9 @@ class LoadBalancingPolicy(base.Policy):
data['healthmonitor'] = self.hm_spec.get(self.HM_ID)
else:
res, data = lb_driver.lb_create(self.vip_spec, self.pool_spec,
cluster_name,
self.hm_spec, self.az_spec,
self.flavor_id_spec, cluster_name)
self.flavor_id_spec)
if res is False:
return False, data

4
senlin/tests/unit/policies/test_lb_policy.py
View File

@ -391,10 +391,10 @@ class TestLoadBalancingPolicy(base.SenlinTestCase):
self.assertEqual('policy_data', data)
self.lb_driver.lb_create.assert_called_once_with(policy.vip_spec,
policy.pool_spec,
cluster_name,
policy.hm_spec,
policy.az_spec,
policy.flavor_id_spec,
cluster_name)
policy.flavor_id_spec)
member_add_calls = [
mock.call(node1, 'LB_ID', 'POOL_ID', 80, 'internal-subnet'),
mock.call(node2, 'LB_ID', 'POOL_ID', 80, 'internal-subnet')