openstack
/
senlin
Code Issues Proposed changes

senlin.policy.loadbalance module fix key error 

the pool can be created without setting the var below
session_persistence[type|cookie_name]

Closes-Bug: 1934543

Change-Id: I08eecb2c45d2cb1f730e6b9d8bb549306b3a2f89
This commit is contained in:
hamza alqtaishat 2021-07-02 22:18:25 +00:00
parent 2b2d51d748
commit cd33c1256f
2 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
senlin/drivers/os/octavia_v2.py
View File

@ -102,10 +102,10 @@ class OctaviaClient(base.DriverBase):
name=None, description=None):
# Remove cookie_name when type not equal to APP_COOKIE
if session_persistence['type'] != 'APP_COOKIE':
if session_persistence.get('type') != 'APP_COOKIE':
session_persistence.pop('cookie_name', None)
# When type=NONE set session_persistence to None
if session_persistence['type'] == 'NONE':
if session_persistence.get('type') in ('NONE', None):
session_persistence = None
kwargs = {

63
senlin/tests/unit/drivers/test_lbaas.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import copy
import eventlet
from unittest import mock
@ -133,6 +134,68 @@ class TestOctaviaLBaaSDriver(base.SenlinTestCase):
self.assertFalse(res)
mock_sleep.assert_called_once_with(10)
def test_lb_create_succeeded_session_persistence_none(self):
lb_obj = mock.Mock()
listener_obj = mock.Mock()
pool_obj = mock.Mock()
hm_obj = mock.Mock()
lb_obj.id = 'LB_ID'
lb_obj.vip_address = '192.168.1.100'
listener_obj.id = 'LISTENER_ID'
pool_obj.id = 'POOL_ID'
subnet_obj = mock.Mock()
subnet_obj.name = 'subnet'
subnet_obj.id = 'SUBNET_ID'
subnet_obj.network_id = 'NETWORK_ID'
hm_obj.id = 'HEALTHMONITOR_ID'
cluster_name = 'test_cluster'
self.oc.loadbalancer_create.return_value = lb_obj
self.oc.listener_create.return_value = listener_obj
self.oc.pool_create.return_value = pool_obj
self.oc.healthmonitor_create.return_value = hm_obj
self.nc.subnet_get.return_value = subnet_obj
self.lb_driver._wait_for_lb_ready = mock.Mock()
self.lb_driver._wait_for_lb_ready.return_value = True
temp_pool = copy.deepcopy(self.pool)
temp_pool['session_persistence'] = {}
status, res = self.lb_driver.lb_create(self.vip, temp_pool,
cluster_name, self.hm,
self.availability_zone,
self.flavor_id)
self.assertTrue(status)
lb_name = 'senlin-lb-%s' % cluster_name
self.oc.loadbalancer_create.assert_called_once_with(
'SUBNET_ID', None, self.vip['address'], self.vip['admin_state_up'],
name=lb_name, availability_zone=self.availability_zone,
flavor_id=self.flavor_id)
self.assertEqual('LB_ID', res['loadbalancer'])
self.assertEqual('192.168.1.100', res['vip_address'])
listener_name = 'senlin-listener-%s' % cluster_name
self.oc.listener_create.assert_called_once_with(
'LB_ID', self.vip['protocol'], self.vip['protocol_port'],
self.vip['connection_limit'], self.vip['admin_state_up'],
name=listener_name)
self.assertEqual('LISTENER_ID', res['listener'])
pool_name = 'senlin-pool-%s' % cluster_name
self.oc.pool_create.assert_called_once_with(
temp_pool['lb_method'], 'LISTENER_ID', temp_pool['protocol'],
temp_pool['session_persistence'], temp_pool['admin_state_up'],
name=pool_name)
self.assertEqual('POOL_ID', res['pool'])
self.oc.healthmonitor_create.assert_called_once_with(
self.hm['type'], self.hm['delay'], self.hm['timeout'],
self.hm['max_retries'], 'POOL_ID', self.hm['admin_state_up'],
self.hm['http_method'], self.hm['url_path'],
self.hm['expected_codes'])
self.assertEqual('HEALTHMONITOR_ID', res['healthmonitor'])
self.lb_driver._wait_for_lb_ready.assert_called_with('LB_ID')
calls = [mock.call('LB_ID') for i in range(1, 5)]
self.lb_driver._wait_for_lb_ready.assert_has_calls(
calls, any_order=False)
def test_lb_create_succeeded_subnet(self):
lb_obj = mock.Mock()
listener_obj = mock.Mock()