openstack/octavia
Code Issues Proposed changes

Merge "Fixed sessionpersistence and healthmonitor refs"

Browse Source
This commit is contained in:
Jenkins 2015-04-13 19:26:23 +00:00 committed by Gerrit Code Review
commit 5bd04f8471
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
octavia/amphorae/drivers/haproxy/jinja/jinja_cfg.py
View File

@ -191,13 +191,13 @@ class JinjaTemplater(object):
members = [self._transform_member(x)
for x in pool.members if self._include_member(x)]
ret_value['members'] = members
if pool.healthmonitor:
if pool.health_monitor:
ret_value['health_monitor'] = self._transform_health_monitor(
pool.healthmonitor)
if pool.sessionpersistence:
pool.health_monitor)
if pool.session_persistence:
ret_value[
'session_persistence'] = self._transform_session_persistence(
pool.sessionpersistence)
pool.session_persistence)
return ret_value
def _transform_session_persistence(self, persistence):

8
octavia/tests/unit/common/sample_configs/sample_configs.py
View File

@ -218,8 +218,8 @@ def sample_pool_tuple(proto=None, monitor=True, persistence=True,
persistence_type=None):
proto = 'HTTP' if proto is None else proto
in_pool = collections.namedtuple(
'pool', 'id, protocol, lb_algorithm, members, healthmonitor,'
'sessionpersistence, enabled, operating_status')
'pool', 'id, protocol, lb_algorithm, members, health_monitor,'
'session_persistence, enabled, operating_status')
mon = sample_health_monitor_tuple(proto=proto) if monitor is True else None
persis = sample_session_persistence_tuple(
persistence_type=persistence_type) if persistence is True else None
@ -229,8 +229,8 @@ def sample_pool_tuple(proto=None, monitor=True, persistence=True,
lb_algorithm='ROUND_ROBIN',
members=[sample_member_tuple('sample_member_id_1', '10.0.0.99'),
sample_member_tuple('sample_member_id_2', '10.0.0.98')],
healthmonitor=mon,
sessionpersistence=persis,
health_monitor=mon,
session_persistence=persis,
enabled=True,
operating_status='ACTIVE')